MN10300: vmlinux.lds.S cleanup - use PAGE_SIZE, PERCPU macros

Include the linux/page.h header into the MN10300 kernel linker script thus
allowing us to use PAGE_SIZE macro instead of a numeric constant.

Also use the PERCPU macro instead of an explicit section definition.

Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: David Howells <dhowells@redhat.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

authored by Cyrill Gorcunov and committed by Linus Torvalds cb32898c 4e6f2ba9

+10 -12
+10 -12
arch/mn10300/kernel/vmlinux.lds.S
··· 11 11 #define __VMLINUX_LDS__ 12 12 #include <asm-generic/vmlinux.lds.h> 13 13 #include <asm/thread_info.h> 14 + #include <asm/page.h> 14 15 15 16 OUTPUT_FORMAT("elf32-am33lin", "elf32-am33lin", "elf32-am33lin") 16 17 OUTPUT_ARCH(mn10300) ··· 56 55 CONSTRUCTORS 57 56 } 58 57 59 - . = ALIGN(4096); 58 + . = ALIGN(PAGE_SIZE); 60 59 __nosave_begin = .; 61 60 .data_nosave : { *(.data.nosave) } 62 - . = ALIGN(4096); 61 + . = ALIGN(PAGE_SIZE); 63 62 __nosave_end = .; 64 63 65 - . = ALIGN(4096); 64 + . = ALIGN(PAGE_SIZE); 66 65 .data.page_aligned : { *(.data.idt) } 67 66 68 67 . = ALIGN(32); ··· 79 78 .data.init_task : { *(.data.init_task) } 80 79 81 80 /* might get freed after init */ 82 - . = ALIGN(4096); 81 + . = ALIGN(PAGE_SIZE); 83 82 .smp_locks : AT(ADDR(.smp_locks) - LOAD_OFFSET) { 84 83 __smp_locks = .; 85 84 *(.smp_locks) ··· 87 86 } 88 87 89 88 /* will be freed after init */ 90 - . = ALIGN(4096); /* Init code and data */ 89 + . = ALIGN(PAGE_SIZE); /* Init code and data */ 91 90 __init_begin = .; 92 91 .init.text : { 93 92 _sinittext = .; ··· 121 120 .exit.data : { *(.exit.data) } 122 121 123 122 #ifdef CONFIG_BLK_DEV_INITRD 124 - . = ALIGN(4096); 123 + . = ALIGN(PAGE_SIZE); 125 124 __initramfs_start = .; 126 125 .init.ramfs : { *(.init.ramfs) } 127 126 __initramfs_end = .; 128 127 #endif 129 128 130 - . = ALIGN(32); 131 - __per_cpu_start = .; 132 - .data.percpu : { *(.data.percpu) } 133 - __per_cpu_end = .; 134 - . = ALIGN(4096); 129 + PERCPU(32) 130 + . = ALIGN(PAGE_SIZE); 135 131 __init_end = .; 136 132 /* freed after init ends here */ 137 133 ··· 143 145 _end = . ; 144 146 145 147 /* This is where the kernel creates the early boot page tables */ 146 - . = ALIGN(4096); 148 + . = ALIGN(PAGE_SIZE); 147 149 pg0 = .; 148 150 149 151 /* Sections to be discarded */