diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2007-10-18 03:04:34 -0400 |
---|---|---|
committer | Kyle McMartin <kyle@shortfin.cabal.ca> | 2007-10-18 03:59:15 -0400 |
commit | 1c593571093ae0f259d3bd7a66988a7a8eb5c7bc (patch) | |
tree | 0ce48386ab6e2752145dba8fa81bc5440eda0118 /arch/parisc/kernel/vmlinux.lds.S | |
parent | be1b3d8cb141c0705d61af2e2372d72ff16c7d04 (diff) |
[PARISC] Kill off ASM_PAGE_SIZE use
We have the macro _AC() generally available now
so the calculation of PAGE_SIZE can be made
assembler compatible.
Introduce use of _AC() and kill all users of
ASM_PAGE_SIZE.
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Signed-off-by: Kyle McMartin <kyle@mcmartin.ca>
Diffstat (limited to 'arch/parisc/kernel/vmlinux.lds.S')
-rw-r--r-- | arch/parisc/kernel/vmlinux.lds.S | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/arch/parisc/kernel/vmlinux.lds.S b/arch/parisc/kernel/vmlinux.lds.S index d6951bb5a9c9..d6dbcbcdcc2e 100644 --- a/arch/parisc/kernel/vmlinux.lds.S +++ b/arch/parisc/kernel/vmlinux.lds.S | |||
@@ -73,7 +73,7 @@ SECTIONS | |||
73 | * that we can properly leave these | 73 | * that we can properly leave these |
74 | * as writable | 74 | * as writable |
75 | */ | 75 | */ |
76 | . = ALIGN(ASM_PAGE_SIZE); | 76 | . = ALIGN(PAGE_SIZE); |
77 | data_start = .; | 77 | data_start = .; |
78 | . = ALIGN(16); | 78 | . = ALIGN(16); |
79 | /* Exception table */ | 79 | /* Exception table */ |
@@ -119,12 +119,12 @@ SECTIONS | |||
119 | /* nosave data is really only used for software suspend...it's here | 119 | /* nosave data is really only used for software suspend...it's here |
120 | * just in case we ever implement it | 120 | * just in case we ever implement it |
121 | */ | 121 | */ |
122 | . = ALIGN(ASM_PAGE_SIZE); | 122 | . = ALIGN(PAGE_SIZE); |
123 | __nosave_begin = .; | 123 | __nosave_begin = .; |
124 | .data_nosave : { | 124 | .data_nosave : { |
125 | *(.data.nosave) | 125 | *(.data.nosave) |
126 | } | 126 | } |
127 | . = ALIGN(ASM_PAGE_SIZE); | 127 | . = ALIGN(PAGE_SIZE); |
128 | __nosave_end = .; | 128 | __nosave_end = .; |
129 | 129 | ||
130 | /* End of data section */ | 130 | /* End of data section */ |
@@ -133,7 +133,7 @@ SECTIONS | |||
133 | /* BSS */ | 133 | /* BSS */ |
134 | __bss_start = .; | 134 | __bss_start = .; |
135 | /* page table entries need to be PAGE_SIZE aligned */ | 135 | /* page table entries need to be PAGE_SIZE aligned */ |
136 | . = ALIGN(ASM_PAGE_SIZE); | 136 | . = ALIGN(PAGE_SIZE); |
137 | .data.vmpages : { | 137 | .data.vmpages : { |
138 | *(.data.vm0.pmd) | 138 | *(.data.vm0.pmd) |
139 | *(.data.vm0.pgd) | 139 | *(.data.vm0.pgd) |
@@ -229,7 +229,7 @@ SECTIONS | |||
229 | *(.exit.data) | 229 | *(.exit.data) |
230 | } | 230 | } |
231 | #ifdef CONFIG_BLK_DEV_INITRD | 231 | #ifdef CONFIG_BLK_DEV_INITRD |
232 | . = ALIGN(ASM_PAGE_SIZE); | 232 | . = ALIGN(PAGE_SIZE); |
233 | .init.ramfs : { | 233 | .init.ramfs : { |
234 | __initramfs_start = .; | 234 | __initramfs_start = .; |
235 | *(.init.ramfs) | 235 | *(.init.ramfs) |
@@ -237,8 +237,8 @@ SECTIONS | |||
237 | } | 237 | } |
238 | #endif | 238 | #endif |
239 | 239 | ||
240 | PERCPU(ASM_PAGE_SIZE) | 240 | PERCPU(PAGE_SIZE) |
241 | . = ALIGN(ASM_PAGE_SIZE); | 241 | . = ALIGN(PAGE_SIZE); |
242 | __init_end = .; | 242 | __init_end = .; |
243 | /* freed after init ends here */ | 243 | /* freed after init ends here */ |
244 | _end = . ; | 244 | _end = . ; |