diff options
-rw-r--r-- | arch/sparc64/Kconfig.debug | 4 | ||||
-rw-r--r-- | arch/sparc64/defconfig | 1 | ||||
-rw-r--r-- | arch/sparc64/mm/init.c | 43 |
3 files changed, 1 insertions, 47 deletions
diff --git a/arch/sparc64/Kconfig.debug b/arch/sparc64/Kconfig.debug index a5faa3683bd6..6a4d28a4076d 100644 --- a/arch/sparc64/Kconfig.debug +++ b/arch/sparc64/Kconfig.debug | |||
@@ -23,10 +23,6 @@ config STACK_DEBUG | |||
23 | depends on DEBUG_KERNEL | 23 | depends on DEBUG_KERNEL |
24 | bool "Stack Overflow Detection Support" | 24 | bool "Stack Overflow Detection Support" |
25 | 25 | ||
26 | config DEBUG_BOOTMEM | ||
27 | depends on DEBUG_KERNEL | ||
28 | bool "Debug BOOTMEM initialization" | ||
29 | |||
30 | config DEBUG_PAGEALLOC | 26 | config DEBUG_PAGEALLOC |
31 | bool "Debug page memory allocations" | 27 | bool "Debug page memory allocations" |
32 | depends on DEBUG_KERNEL && !HIBERNATION | 28 | depends on DEBUG_KERNEL && !HIBERNATION |
diff --git a/arch/sparc64/defconfig b/arch/sparc64/defconfig index 833d74b2b192..50dc09055783 100644 --- a/arch/sparc64/defconfig +++ b/arch/sparc64/defconfig | |||
@@ -1396,7 +1396,6 @@ CONFIG_FORCED_INLINING=y | |||
1396 | # CONFIG_DEBUG_STACK_USAGE is not set | 1396 | # CONFIG_DEBUG_STACK_USAGE is not set |
1397 | # CONFIG_DEBUG_DCFLUSH is not set | 1397 | # CONFIG_DEBUG_DCFLUSH is not set |
1398 | # CONFIG_STACK_DEBUG is not set | 1398 | # CONFIG_STACK_DEBUG is not set |
1399 | # CONFIG_DEBUG_BOOTMEM is not set | ||
1400 | # CONFIG_DEBUG_PAGEALLOC is not set | 1399 | # CONFIG_DEBUG_PAGEALLOC is not set |
1401 | 1400 | ||
1402 | # | 1401 | # |
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c index e726c45645ff..035c73243adc 100644 --- a/arch/sparc64/mm/init.c +++ b/arch/sparc64/mm/init.c | |||
@@ -739,11 +739,6 @@ static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn, | |||
739 | avoid_end = PAGE_ALIGN(initrd_end); | 739 | avoid_end = PAGE_ALIGN(initrd_end); |
740 | #endif | 740 | #endif |
741 | 741 | ||
742 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
743 | prom_printf("choose_bootmap_pfn: kern[%lx:%lx] avoid[%lx:%lx]\n", | ||
744 | kern_base, PAGE_ALIGN(kern_base + kern_size), | ||
745 | avoid_start, avoid_end); | ||
746 | #endif | ||
747 | for (i = 0; i < pavail_ents; i++) { | 742 | for (i = 0; i < pavail_ents; i++) { |
748 | unsigned long start, end; | 743 | unsigned long start, end; |
749 | 744 | ||
@@ -777,10 +772,6 @@ static unsigned long __init choose_bootmap_pfn(unsigned long start_pfn, | |||
777 | } | 772 | } |
778 | 773 | ||
779 | /* OK, it doesn't overlap anything, use it. */ | 774 | /* OK, it doesn't overlap anything, use it. */ |
780 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
781 | prom_printf("choose_bootmap_pfn: Using %lx [%lx]\n", | ||
782 | start >> PAGE_SHIFT, start); | ||
783 | #endif | ||
784 | return start >> PAGE_SHIFT; | 775 | return start >> PAGE_SHIFT; |
785 | } | 776 | } |
786 | } | 777 | } |
@@ -920,10 +911,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
920 | unsigned long bootmap_pfn, bytes_avail, size; | 911 | unsigned long bootmap_pfn, bytes_avail, size; |
921 | int i; | 912 | int i; |
922 | 913 | ||
923 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
924 | prom_printf("bootmem_init: Scan pavail, "); | ||
925 | #endif | ||
926 | |||
927 | bytes_avail = 0UL; | 914 | bytes_avail = 0UL; |
928 | for (i = 0; i < pavail_ents; i++) { | 915 | for (i = 0; i < pavail_ents; i++) { |
929 | end_of_phys_memory = pavail[i].phys_addr + | 916 | end_of_phys_memory = pavail[i].phys_addr + |
@@ -970,33 +957,20 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
970 | 957 | ||
971 | bootmap_pfn = choose_bootmap_pfn(min_low_pfn, end_pfn); | 958 | bootmap_pfn = choose_bootmap_pfn(min_low_pfn, end_pfn); |
972 | 959 | ||
973 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
974 | prom_printf("init_bootmem(min[%lx], bootmap[%lx], max[%lx])\n", | ||
975 | min_low_pfn, bootmap_pfn, max_low_pfn); | ||
976 | #endif | ||
977 | bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, | 960 | bootmap_size = init_bootmem_node(NODE_DATA(0), bootmap_pfn, |
978 | min_low_pfn, end_pfn); | 961 | min_low_pfn, end_pfn); |
979 | 962 | ||
980 | /* Now register the available physical memory with the | 963 | /* Now register the available physical memory with the |
981 | * allocator. | 964 | * allocator. |
982 | */ | 965 | */ |
983 | for (i = 0; i < pavail_ents; i++) { | 966 | for (i = 0; i < pavail_ents; i++) |
984 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
985 | prom_printf("free_bootmem(pavail:%d): base[%lx] size[%lx]\n", | ||
986 | i, pavail[i].phys_addr, pavail[i].reg_size); | ||
987 | #endif | ||
988 | free_bootmem(pavail[i].phys_addr, pavail[i].reg_size); | 967 | free_bootmem(pavail[i].phys_addr, pavail[i].reg_size); |
989 | } | ||
990 | 968 | ||
991 | #ifdef CONFIG_BLK_DEV_INITRD | 969 | #ifdef CONFIG_BLK_DEV_INITRD |
992 | if (initrd_start) { | 970 | if (initrd_start) { |
993 | size = initrd_end - initrd_start; | 971 | size = initrd_end - initrd_start; |
994 | 972 | ||
995 | /* Reserve the initrd image area. */ | 973 | /* Reserve the initrd image area. */ |
996 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
997 | prom_printf("reserve_bootmem(initrd): base[%llx] size[%lx]\n", | ||
998 | initrd_start, initrd_end); | ||
999 | #endif | ||
1000 | reserve_bootmem(initrd_start, size, BOOTMEM_DEFAULT); | 974 | reserve_bootmem(initrd_start, size, BOOTMEM_DEFAULT); |
1001 | 975 | ||
1002 | initrd_start += PAGE_OFFSET; | 976 | initrd_start += PAGE_OFFSET; |
@@ -1004,9 +978,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
1004 | } | 978 | } |
1005 | #endif | 979 | #endif |
1006 | /* Reserve the kernel text/data/bss. */ | 980 | /* Reserve the kernel text/data/bss. */ |
1007 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
1008 | prom_printf("reserve_bootmem(kernel): base[%lx] size[%lx]\n", kern_base, kern_size); | ||
1009 | #endif | ||
1010 | reserve_bootmem(kern_base, kern_size, BOOTMEM_DEFAULT); | 981 | reserve_bootmem(kern_base, kern_size, BOOTMEM_DEFAULT); |
1011 | *pages_avail -= PAGE_ALIGN(kern_size) >> PAGE_SHIFT; | 982 | *pages_avail -= PAGE_ALIGN(kern_size) >> PAGE_SHIFT; |
1012 | 983 | ||
@@ -1020,10 +991,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
1020 | * in free_all_bootmem. | 991 | * in free_all_bootmem. |
1021 | */ | 992 | */ |
1022 | size = bootmap_size; | 993 | size = bootmap_size; |
1023 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
1024 | prom_printf("reserve_bootmem(bootmap): base[%lx] size[%lx]\n", | ||
1025 | (bootmap_pfn << PAGE_SHIFT), size); | ||
1026 | #endif | ||
1027 | reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size, BOOTMEM_DEFAULT); | 994 | reserve_bootmem((bootmap_pfn << PAGE_SHIFT), size, BOOTMEM_DEFAULT); |
1028 | 995 | ||
1029 | for (i = 0; i < pavail_ents; i++) { | 996 | for (i = 0; i < pavail_ents; i++) { |
@@ -1031,10 +998,6 @@ static unsigned long __init bootmem_init(unsigned long *pages_avail, | |||
1031 | 998 | ||
1032 | start_pfn = pavail[i].phys_addr >> PAGE_SHIFT; | 999 | start_pfn = pavail[i].phys_addr >> PAGE_SHIFT; |
1033 | end_pfn = (start_pfn + (pavail[i].reg_size >> PAGE_SHIFT)); | 1000 | end_pfn = (start_pfn + (pavail[i].reg_size >> PAGE_SHIFT)); |
1034 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
1035 | prom_printf("memory_present(0, %lx, %lx)\n", | ||
1036 | start_pfn, end_pfn); | ||
1037 | #endif | ||
1038 | memory_present(0, start_pfn, end_pfn); | 1001 | memory_present(0, start_pfn, end_pfn); |
1039 | } | 1002 | } |
1040 | 1003 | ||
@@ -1549,10 +1512,6 @@ void __init mem_init(void) | |||
1549 | 1512 | ||
1550 | high_memory = __va(last_valid_pfn << PAGE_SHIFT); | 1513 | high_memory = __va(last_valid_pfn << PAGE_SHIFT); |
1551 | 1514 | ||
1552 | #ifdef CONFIG_DEBUG_BOOTMEM | ||
1553 | prom_printf("mem_init: Calling free_all_bootmem().\n"); | ||
1554 | #endif | ||
1555 | |||
1556 | /* We subtract one to account for the mem_map_zero page | 1515 | /* We subtract one to account for the mem_map_zero page |
1557 | * allocated below. | 1516 | * allocated below. |
1558 | */ | 1517 | */ |