summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:08:31 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-03-26 15:08:31 -0700
commit8128f55a0bc60cf3779135a1f837c4323e77c582 (patch)
treea6f23d18496049651617f5c5cbe21648fa521f4e /mm
parent50da56706b989b99edb20f9c03172df193240c78 (diff)
parentc26f91a3df1999ec1b3298372d73f90cbab81106 (diff)
downloadlinux-3.10-8128f55a0bc60cf3779135a1f837c4323e77c582.tar.gz
linux-3.10-8128f55a0bc60cf3779135a1f837c4323e77c582.tar.bz2
linux-3.10-8128f55a0bc60cf3779135a1f837c4323e77c582.zip
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Remove excessive early_res debug output softlockup: Stop spurious softlockup messages due to overflow rcu: Fix local_irq_disable() CONFIG_PROVE_RCU=y false positives rcu: Fix tracepoints & lockdep false positive rcu: Make rcu_read_lock_bh_held() allow for disabled BH
Diffstat (limited to 'mm')
-rw-r--r--mm/bootmem.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/mm/bootmem.c b/mm/bootmem.c
index d7c791ef003..9b134460b01 100644
--- a/mm/bootmem.c
+++ b/mm/bootmem.c
@@ -180,19 +180,12 @@ static void __init __free_pages_memory(unsigned long start, unsigned long end)
end_aligned = end & ~(BITS_PER_LONG - 1);
if (end_aligned <= start_aligned) {
-#if 1
- printk(KERN_DEBUG " %lx - %lx\n", start, end);
-#endif
for (i = start; i < end; i++)
__free_pages_bootmem(pfn_to_page(i), 0);
return;
}
-#if 1
- printk(KERN_DEBUG " %lx %lx - %lx %lx\n",
- start, start_aligned, end_aligned, end);
-#endif
for (i = start; i < start_aligned; i++)
__free_pages_bootmem(pfn_to_page(i), 0);
@@ -428,9 +421,6 @@ void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
{
#ifdef CONFIG_NO_BOOTMEM
free_early(physaddr, physaddr + size);
-#if 0
- printk(KERN_DEBUG "free %lx %lx\n", physaddr, size);
-#endif
#else
unsigned long start, end;
@@ -456,9 +446,6 @@ void __init free_bootmem(unsigned long addr, unsigned long size)
{
#ifdef CONFIG_NO_BOOTMEM
free_early(addr, addr + size);
-#if 0
- printk(KERN_DEBUG "free %lx %lx\n", addr, size);
-#endif
#else
unsigned long start, end;