Merge branch 'linus' into tracing/mmiotrace

2008-07-07 08:07:35 +02:00
parent 790e2a290b 1b40a895df
commit d763d5edf9
1421 changed files with 33481 additions and 14451 deletions
--- a/arch/x86/mm/fault.c
+++ b/arch/x86/mm/fault.c
@ -508,6 +508,11 @@ static int vmalloc_fault(unsigned long address)
 	unsigned long pgd_paddr;
 	pmd_t *pmd_k;
 	pte_t *pte_k;
+
+	/* Make sure we are in vmalloc area */
+	if (!(address >= VMALLOC_START && address < VMALLOC_END))
+		return -1;
+
 	/*
 	 * Synchronize this task's top level page-table
 	 * with the 'reference' page table.