Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86 ACPI: fix breakage of resume on 64-bit UP systems with SMP kernel
  Introduce is_vmalloc_or_module_addr() and use with DEBUG_VIRTUAL

2 files changed, 19 insertions, 2 deletions

diff --git a/arch/x86/kernel/acpi/sleep.c b/arch/x86/kernel/acpi/sleep.c
index 426e5d91b63a..c44cd6dbfa14 100644
--- a/arch/x86/kernel/acpi/sleep.c
+++ b/arch/x86/kernel/acpi/sleep.c
@@ -10,6 +10,7 @@
 #include <linux/dmi.h>
 #include <linux/cpumask.h>
 #include <asm/segment.h>
+#include <asm/desc.h>
 
 #include "realmode/wakeup.h"
 #include "sleep.h"
@@ -98,6 +99,8 @@ int acpi_save_state_mem(void)
         header->trampoline_segment = setup_trampoline() >> 4;
 #ifdef CONFIG_SMP
         stack_start.sp = temp_stack + 4096;
+        early_gdt_descr.address =
+                        (unsigned long)get_cpu_gdt_table(smp_processor_id());
 #endif
         initial_code = (unsigned long)wakeup_long64;
         saved_magic = 0x123456789abcdef0;
diff --git a/mm/vmalloc.c b/mm/vmalloc.c
index 712ae47af0bf..0797589d51f8 100644
--- a/mm/vmalloc.c
+++ b/mm/vmalloc.c
@@ -175,6 +175,21 @@ static int vmap_page_range(unsigned long addr, unsigned long end,
         return nr;
 }
 
+static inline int is_vmalloc_or_module_addr(const void *x)
+{
+        /*
+         * x86-64 and sparc64 put modules in a special place,
+         * and fall back on vmalloc() if that fails. Others
+         * just put it in the vmalloc space.
+         */
+#if defined(CONFIG_MODULES) && defined(MODULES_VADDR)
+        unsigned long addr = (unsigned long)x;
+        if (addr >= MODULES_VADDR && addr < MODULES_END)
+                return 1;
+#endif
+        return is_vmalloc_addr(x);
+}
+
 /*
  * Walk a vmap address to the struct page it maps.
  */
@@ -188,8 +203,7 @@ struct page *vmalloc_to_page(const void *vmalloc_addr)
          * XXX we might need to change this if we add VIRTUAL_BUG_ON for
          * architectures that do not vmalloc module space
          */
-        VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) &&
-                        !is_module_address(addr));
+        VIRTUAL_BUG_ON(!is_vmalloc_or_module_addr(vmalloc_addr));
 
         if (!pgd_none(*pgd)) {
                 pud_t *pud = pud_offset(pgd, addr);