From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 10 Mar 2009 08:26:38 +0000 (+0100)
Subject: Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86... 
X-Git-Url: http://www.pilppa.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=467c88fee51e2ae862e9485245687da0730e29aa;p=linux-2.6-omap-h63xx.git

Merge branches 'x86/apic', 'x86/asm', 'x86/fixmap', 'x86/memtest', 'x86/mm', 'x86/urgent', 'linus' and 'core/percpu' into x86/core
---

467c88fee51e2ae862e9485245687da0730e29aa
diff --cc arch/x86/mm/ioremap.c
index 62773abdf08,62773abdf08,96786ef2c9a,62773abdf08,62def579573,f45d5e29a72,f45d5e29a72,433f7bd4648..aca924a30ee
--- a/arch/x86/mm/ioremap.c
+++ b/arch/x86/mm/ioremap.c
@@@@@@@@@ -85,8 -85,8 -85,8 -85,8 -85,10 -89,8 -89,8 -89,8 +85,10 @@@@@@@@@ bool __virt_addr_valid(unsigned long x
        {
        	if (x < PAGE_OFFSET)
        		return false;
     ---	if (system_state != SYSTEM_BOOTING && is_vmalloc_addr((void *) x))
     +++	if (__vmalloc_start_set && is_vmalloc_addr((void *) x))
     +++		return false;
++++ +++	if (x >= FIXADDR_START)
++++    		return false;
        	return pfn_valid((x - PAGE_OFFSET) >> PAGE_SHIFT);
        }
        EXPORT_SYMBOL(__virt_addr_valid);