Techwizz/kernel-fxtec-pro1x
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2008-10-20 13:27:05 -07:00
commit b9d7ccf56b
2 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/x86/kernel/acpi/sleep.c
View file

@ -10,6 +10,7 @@
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/cpumask.h> #include <linux/cpumask.h>
#include <asm/segment.h> #include <asm/segment.h>
#include <asm/desc.h>
#include "realmode/wakeup.h" #include "realmode/wakeup.h"
#include "sleep.h" #include "sleep.h"
@ -98,6 +99,8 @@ int acpi_save_state_mem(void)
header->trampoline_segment = setup_trampoline() >> 4; header->trampoline_segment = setup_trampoline() >> 4;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
stack_start.sp = temp_stack + 4096; stack_start.sp = temp_stack + 4096;
early_gdt_descr.address =
(unsigned long)get_cpu_gdt_table(smp_processor_id());
#endif #endif
initial_code = (unsigned long)wakeup_long64; initial_code = (unsigned long)wakeup_long64;
saved_magic = 0x123456789abcdef0; saved_magic = 0x123456789abcdef0;

18
mm/vmalloc.c
View file

@ -175,6 +175,21 @@ static int vmap_page_range(unsigned long addr, unsigned long end,
return nr; 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. * 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 * XXX we might need to change this if we add VIRTUAL_BUG_ON for
* architectures that do not vmalloc module space * architectures that do not vmalloc module space
*/ */
VIRTUAL_BUG_ON(!is_vmalloc_addr(vmalloc_addr) && VIRTUAL_BUG_ON(!is_vmalloc_or_module_addr(vmalloc_addr));
!is_module_address(addr));
if (!pgd_none(*pgd)) { if (!pgd_none(*pgd)) {
pud_t *pud = pud_offset(pgd, addr); pud_t *pud = pud_offset(pgd, addr);