Messages in this thread Patch in this message | | | Date | Thu, 10 Oct 2002 10:28:13 +0200 | From | Pavel Machek <> | Subject | Make kernel/suspend.c compile with DISCONTIGMEM |
| |
Hi!
This cleans up includes a tiny bit and makes it compile on CONFIG_DISCONTIGMEM. Thanx to BUG_ON(), code is not really changed at all. Pavel
--- clean/kernel/suspend.c 2002-10-08 21:25:38.000000000 +0200 +++ linux-swsusp/kernel/suspend.c 2002-10-08 22:29:36.000000000 +0200 @@ -57,12 +57,13 @@ #include <linux/pm.h> #include <linux/device.h> #include <linux/buffer_head.h> +#include <linux/swapops.h> +#include <linux/bootmem.h> #include <asm/uaccess.h> #include <asm/mmu_context.h> #include <asm/pgtable.h> #include <asm/io.h> -#include <linux/swapops.h> extern void signal_wake_up(struct task_struct *t); extern int sys_sync(void); @@ -474,9 +475,9 @@ #ifdef CONFIG_DISCONTIGMEM panic("Discontingmem not supported"); #else - BUG_ON (max_mapnr != num_physpages); + BUG_ON (max_pfn != num_physpages); #endif - for (pfn = 0; pfn < max_mapnr; pfn++) { + for (pfn = 0; pfn < max_pfn; pfn++) { page = pfn_to_page(pfn); if (PageHighMem(page)) panic("Swsusp not supported on highmem boxes. Send 1GB of RAM to <pavel@ucw.cz> and try again ;-)."); -- Worst form of spam? Adding advertisment signatures ala sourceforge.net. What goes next? Inserting advertisment *into* email? - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |