Merge commit 'v2.6.30-rc5' into kmemcheck

Conflicts:
	arch/x86/mm/init.c
	kernel/sysctl.c

Merge reason: refresh the branch to .30-rc5 and resolve conflicts.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc MAINTAINERS
index b86ad83b8049379b42b017220d819e32db3d2cac,2b349ba4add49640a52d55a66203fba46cf748e0..5f0157125e2343191c9e875c08a2e7126d254151
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -2658,15 -3327,12 +3327,20 @@@ P:   Jason Wesse
  M:    jason.wessel@windriver.com
  L:    kgdb-bugreport@lists.sourceforge.net
  S:    Maintained
+ F:    Documentation/DocBook/kgdb.tmpl
+ F:    drivers/misc/kgdbts.c
+ F:    drivers/serial/kgdboc.c
+ F:    include/linux/kgdb.h
+ F:    kernel/kgdb.c
  
 +KMEMCHECK
 +P:    Vegard Nossum
 +M:    vegardno@ifi.uio.no
 +P     Pekka Enberg
 +M:    penberg@cs.helsinki.fi
 +L:    linux-kernel@vger.kernel.org
 +S:    Maintained
 +
  KMEMTRACE
  P:    Eduard - Gabriel Munteanu
  M:    eduard.munteanu@linux360.ro

diff --cc arch/x86/Kconfig
Simple merge

diff --cc arch/x86/Makefile
Simple merge

diff --cc arch/x86/include/asm/dma-mapping.h
Simple merge

diff --cc arch/x86/mm/init.c
index 51ae5eaa41351f62e86414abf28da87c3b32c81e,ae4f7b5d71040566f7b30af16e6c00f20c82c098..3f51498abf60c0373ce3565ed40dba79ab30a590
--- 1/arch/x86/mm/init.c
--- 2/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@@ -304,8 -305,23 +305,23 @@@ unsigned long __init_refok init_memory_
  #endif
  
  #ifdef CONFIG_X86_64
-       if (bootmem_state == BEFORE_BOOTMEM)
 -      if (!after_bootmem && !start) {
++      if (bootmem_state == BEFORE_BOOTMEM && !start) {
+               pud_t *pud;
+               pmd_t *pmd;
+ 
                mmu_cr4_features = read_cr4();
+ 
+               /*
+                * _brk_end cannot change anymore, but it and _end may be
+                * located on different 2M pages. cleanup_highmap(), however,
+                * can only consider _end when it runs, so destroy any
+                * mappings beyond _brk_end here.
+                */
+               pud = pud_offset(pgd_offset_k(_brk_end), _brk_end);
+               pmd = pmd_offset(pud, _brk_end - 1);
+               while (++pmd <= pmd_offset(pud, (unsigned long)_end - 1))
+                       pmd_clear(pmd);
+       }
  #endif
        __flush_tlb_all();
  

diff --cc arch/x86/mm/pageattr.c
Simple merge

diff --cc arch/x86/mm/pgtable.c
Simple merge

diff --cc include/linux/interrupt.h
Simple merge

diff --cc init/main.c
Simple merge

diff --cc kernel/fork.c
Simple merge

diff --cc kernel/softirq.c
Simple merge

diff --cc kernel/sysctl.c
index a40c9484a5b4192bb82c3a15a2a7de6f67cf3942,ea78fa101ad6a4325209f6bd9b3c350298d1e4e2..e087589f3408f3c3157febf840ebb265e3e2f15b
--- 1/kernel/sysctl.c
--- 2/kernel/sysctl.c
+++ b/kernel/sysctl.c
@@@ -1277,6 -1295,16 +1296,26 @@@ static struct ctl_table vm_table[] = 
                .extra2         = &one,
        },
  #endif
++#ifdef CONFIG_KMEMCHECK
++      {
++              .ctl_name       = CTL_UNNUMBERED,
++              .procname       = "kmemcheck",
++              .data           = &kmemcheck_enabled,
++              .maxlen         = sizeof(int),
++              .mode           = 0644,
++              .proc_handler   = &proc_dointvec,
++      },
++#endif
+ #ifdef CONFIG_UNEVICTABLE_LRU
+       {
+               .ctl_name       = CTL_UNNUMBERED,
+               .procname       = "scan_unevictable_pages",
+               .data           = &scan_unevictable_pages,
+               .maxlen         = sizeof(scan_unevictable_pages),
+               .mode           = 0644,
+               .proc_handler   = &scan_unevictable_handler,
+       },
+ #endif
  /*
   * NOTE: do not add new entries to this table unless you have read
   * Documentation/sysctl/ctl_unnumbered.txt

diff --cc lib/Kconfig.debug
Simple merge

diff --cc mm/page_alloc.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge