mirror of
https://github.com/torvalds/linux
synced 2024-11-05 18:23:50 +00:00
[SPARC64]: Remove DEBUG_BOOTMEM.
We'll replace it in the future with better logging facilities that can be enabled at run time. Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
David S. Miller
parent
b83ebf566b
commit
0f78e7542e
3 changed files with 1 additions and 47 deletions
|
|
@ -23,10 +23,6 @@ config STACK_DEBUG
|
|||
depends on DEBUG_KERNEL
|
||||
bool "Stack Overflow Detection Support"
|
||||
|
||||
config DEBUG_BOOTMEM
|
||||
depends on DEBUG_KERNEL
|
||||
bool "Debug BOOTMEM initialization"
|
||||
|
||||
config DEBUG_PAGEALLOC
|
||||
bool "Debug page memory allocations"
|
||||
depends on DEBUG_KERNEL && !HIBERNATION
|
||||
|
|
|
|||
|
|
@ -1396,7 +1396,6 @@ CONFIG_FORCED_INLINING=y
|
|||
# CONFIG_DEBUG_STACK_USAGE is not set
|
||||
# CONFIG_DEBUG_DCFLUSH is not set
|
||||
# CONFIG_STACK_DEBUG is not set
|
||||
# CONFIG_DEBUG_BOOTMEM is not set
|
||||
# CONFIG_DEBUG_PAGEALLOC is not set
|
||||
|
||||
#
|
||||
|
|
|
|||
|
|
@ -739,11 +739,6 @@ static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn,
|
|||
avoid_end = PAGE_ALIGN(initrd_end);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("choose_bootmap_pfn: kern[%lx:%lx] avoid[%lx:%lx]\n",
|
||||
kern_base, PAGE_ALIGN(kern_base + kern_size),
|
||||
avoid_start, avoid_end);
|
||||
#endif
|
||||
for (i = 0; i < pavail_ents; i++) {
|
||||
unsigned long start, end;
|
||||
|
||||
|
|
@ -777,10 +772,6 @@ static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn,
|
|||
}
|
||||
|
||||
/* OK, it doesn't overlap anything, use it. */
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("choose_bootmap_pfn: Using %lx [%lx]\n",
|
||||
start >> PAGE_SHIFT, start);
|
||||
#endif
|
||||
return start >> PAGE_SHIFT;
|
||||
}
|
||||
}
|
||||
|
|
@ -920,10 +911,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||
unsigned long bootmap_pfn, bytes_avail, size;
|
||||
int i;
|
||||
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("bootmem_init: Scan pavail, ");
|
||||
#endif
|
||||
|
||||
bytes_avail = 0UL;
|
||||
for (i = 0; i < pavail_ents; i++) {
|
||||
end_of_phys_memory = pavail[i].phys_addr +
|
||||
|
|
@ -970,33 +957,20 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||
|
||||
bootmap_pfn = choose_bootmap_pfn(min_low_pfn, end_pfn);
|
||||
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("init_bootmem(min[%lx], bootmap[%lx], max[%lx])\n",
|
||||
min_low_pfn, bootmap_pfn, max_low_pfn);
|
||||
#endif
|
||||
bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn,
|
||||
min_low_pfn, end_pfn);
|
||||
|
||||
/* Now register the available physical memory with the
|
||||
* allocator.
|
||||
*/
|
||||
for (i = 0; i < pavail_ents; i++) {
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("free_bootmem(pavail:%d): base[%lx] size[%lx]\n",
|
||||
i, pavail[i].phys_addr, pavail[i].reg_size);
|
||||
#endif
|
||||
for (i = 0; i < pavail_ents; i++)
|
||||
free_bootmem(pavail[i].phys_addr, pavail[i].reg_size);
|
||||
}
|
||||
|
||||
#ifdef CONFIG_BLK_DEV_INITRD
|
||||
if (initrd_start) {
|
||||
size = initrd_end - initrd_start;
|
||||
|
||||
/* Reserve the initrd image area. */
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("reserve_bootmem(initrd): base[%llx] size[%lx]\n",
|
||||
initrd_start, initrd_end);
|
||||
#endif
|
||||
reserve_bootmem(initrd_start, size, BOOTMEM_DEFAULT);
|
||||
|
||||
initrd_start += PAGE_OFFSET;
|
||||
|
|
@ -1004,9 +978,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||
}
|
||||
#endif
|
||||
/* Reserve the kernel text/data/bss. */
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("reserve_bootmem(kernel): base[%lx] size[%lx]\n", kern_base, kern_size);
|
||||
#endif
|
||||
reserve_bootmem(kern_base, kern_size, BOOTMEM_DEFAULT);
|
||||
*pages_avail -= PAGE_ALIGN(kern_size) >> PAGE_SHIFT;
|
||||
|
||||
|
|
@ -1020,10 +991,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||
* in free_all_bootmem.
|
||||
*/
|
||||
size = bootmap_size;
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("reserve_bootmem(bootmap): base[%lx] size[%lx]\n",
|
||||
(bootmap_pfn << PAGE_SHIFT), size);
|
||||
#endif
|
||||
reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size, BOOTMEM_DEFAULT);
|
||||
|
||||
for (i = 0; i < pavail_ents; i++) {
|
||||
|
|
@ -1031,10 +998,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail,
|
|||
|
||||
start_pfn = pavail[i].phys_addr >> PAGE_SHIFT;
|
||||
end_pfn = (start_pfn + (pavail[i].reg_size >> PAGE_SHIFT));
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("memory_present(0, %lx, %lx)\n",
|
||||
start_pfn, end_pfn);
|
||||
#endif
|
||||
memory_present(0, start_pfn, end_pfn);
|
||||
}
|
||||
|
||||
|
|
@ -1549,10 +1512,6 @@ void __init mem_init(void)
|
|||
|
||||
high_memory = __va(last_valid_pfn << PAGE_SHIFT);
|
||||
|
||||
#ifdef CONFIG_DEBUG_BOOTMEM
|
||||
prom_printf("mem_init: Calling free_all_bootmem().\n");
|
||||
#endif
|
||||
|
||||
/* We subtract one to account for the mem_map_zero page
|
||||
* allocated below.
|
||||
*/
|
||||
|
|
|
|||
Loading…
Reference in a new issue