diff options
| author | Shaohua Li <shaohua.li@intel.com> | 2006-06-23 09:04:49 (GMT) |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 14:43:00 (GMT) |
| commit | 55b2355eefc2f160246226d4d69fed431173a4d5 (patch) | |
| tree | b5ed6dbf3d045443a12de412f9937a6b8dc20840 /arch/i386/mm | |
| parent | 968808b8956e332e556b1eae9b4f7df77518f53b (diff) | |
| download | linux-55b2355eefc2f160246226d4d69fed431173a4d5.tar.xz | |
[PATCH] don't use flush_tlb_all in suspend time
flush_tlb_all uses on_each_cpu, which will disable/enable interrupt.
In suspend/resume time, this will make interrupt wrongly enabled.
Signed-off-by: Shaohua Li <shaohua.li@intel.com>
Cc: Pavel Machek <pavel@ucw.cz>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/i386/mm')
| -rw-r--r-- | arch/i386/mm/init.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c index 3df1371..bf19513 100644 --- a/arch/i386/mm/init.c +++ b/arch/i386/mm/init.c @@ -29,6 +29,7 @@ #include <linux/efi.h> #include <linux/memory_hotplug.h> #include <linux/initrd.h> +#include <linux/cpumask.h> #include <asm/processor.h> #include <asm/system.h> @@ -384,7 +385,7 @@ static void __init pagetable_init (void) #endif } -#ifdef CONFIG_SOFTWARE_SUSPEND +#if defined(CONFIG_SOFTWARE_SUSPEND) || defined(CONFIG_ACPI_SLEEP) /* * Swap suspend & friends need this for resume because things like the intel-agp * driver might have split up a kernel 4MB mapping. |