From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 20 Nov 2008 08:03:38 +0000 (+0100)
Subject: Merge branch 'linus' into x86/memory-corruption-check
X-Git-Tag: v2.6.29-rc1~587^2~4^15~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=90accd6fabf9b2fa2705945a4c601877a75d43bf;p=linux-2.6-omap-h63xx.git

Merge branch 'linus' into x86/memory-corruption-check
---

90accd6fabf9b2fa2705945a4c601877a75d43bf
diff --cc arch/x86/mm/init_64.c
index d6ef1589b95,9db01db6e3c..9f7a0d24d42
--- a/arch/x86/mm/init_64.c
+++ b/arch/x86/mm/init_64.c
@@@ -878,7 -900,10 +900,8 @@@ static struct kcore_list kcore_mem, kco
  void __init mem_init(void)
  {
  	long codesize, reservedpages, datasize, initsize;
+ 	unsigned long absent_pages;
  
 -	start_periodic_check_for_corruption();
 -
  	pci_iommu_alloc();
  
  	/* clear_bss() already clear the empty_zero_page */