This is the bare set of fixes needed to get the memory class stuff to compile. Signed-off-by: Dave Hansen --- memhotplug-dave/drivers/base/memory.c | 8 ++++---- memhotplug-dave/mm/page_alloc.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff -puN drivers/base/memory.c~M-sysfs-memory-class-barefix drivers/base/memory.c --- memhotplug/drivers/base/memory.c~M-sysfs-memory-class-barefix Thu Aug 5 09:41:17 2004 +++ memhotplug-dave/drivers/base/memory.c Thu Aug 5 09:41:17 2004 @@ -23,7 +23,7 @@ EXPORT_SYMBOL(memory_sysdev_class); */ static int memory_hotplug_filter(struct kset *kset, struct kobject *kobj) { - struct kobj_type *ktype = get_ktype(kobj); +/* struct kobj_type *ktype = get_ktype(kobj); */ printk("Hit %s\n", __func__); return 1; } @@ -31,7 +31,7 @@ static int memory_hotplug_filter(struct static char *memory_hotplug_name(struct kset *kset, struct kobject *kobj) { printk("Hit %s\n", __func__); - return "-no_name_implemented"; + return "-no_name_implemented"; } static int memory_hotplug(struct kset *kset, struct kobject *kobj, char **envp, @@ -212,13 +212,13 @@ int add_memory_block(unsigned long node_ return 0; } -#define update_memdevice(...) (1) +#define update_memdevice(...) do {} while(0) +#define online_section(...) do {} while(0) static ssize_t online_store(struct class *class, const char *buf, size_t count) { unsigned int section = simple_strtoul(buf, NULL, 10); - int i; if (!capable(CAP_SYS_ADMIN)) return -EACCES; diff -puN mm/memory_hotplug.c~M-sysfs-memory-class-barefix mm/memory_hotplug.c diff -puN mm/page_alloc.c~M-sysfs-memory-class-barefix mm/page_alloc.c --- memhotplug/mm/page_alloc.c~M-sysfs-memory-class-barefix Thu Aug 5 09:41:17 2004 +++ memhotplug-dave/mm/page_alloc.c Thu Aug 5 09:41:17 2004 @@ -1386,7 +1386,7 @@ static void __init calculate_zone_totalp * up by free_all_bootmem() once the early boot process is * done. Non-atomic initialization, single-pass. */ -void __init memmap_init_zone(unsigned long size, int nid, unsigned long zone, +void __devinit memmap_init_zone(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn) { struct page *start = pfn_to_page(start_pfn); _