diff options
author | Tim Abbott <tabbott@ksplice.com> | 2009-09-20 18:14:14 -0400 |
---|---|---|
committer | Sam Ravnborg <sam@ravnborg.org> | 2009-09-21 00:27:08 -0400 |
commit | 02b7da37f7acd49277dea1481dc0c5c246c09732 (patch) | |
tree | 0544bfe6df222e4a3999116db3b691d6621e1977 /arch | |
parent | d200c922bc2b1ac88b8d33b6cfff2ed837af186a (diff) |
Use macros for .bss.page_aligned section.
This patch changes the remaining direct references to
.bss.page_aligned in C and assembly code to use the macros in
include/linux/linkage.h.
Signed-off-by: Tim Abbott <tabbott@ksplice.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: H. Peter Anvin <hpa@zytor.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Cc: Chris Zankel <chris@zankel.net>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/sh/kernel/irq.c | 6 | ||||
-rw-r--r-- | arch/x86/kernel/head_32.S | 2 | ||||
-rw-r--r-- | arch/x86/kernel/head_64.S | 2 | ||||
-rw-r--r-- | arch/xtensa/kernel/head.S | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/arch/sh/kernel/irq.c b/arch/sh/kernel/irq.c index 60f8af4497c7..7cb933ba4957 100644 --- a/arch/sh/kernel/irq.c +++ b/arch/sh/kernel/irq.c | |||
@@ -165,11 +165,9 @@ asmlinkage int do_IRQ(unsigned int irq, struct pt_regs *regs) | |||
165 | } | 165 | } |
166 | 166 | ||
167 | #ifdef CONFIG_IRQSTACKS | 167 | #ifdef CONFIG_IRQSTACKS |
168 | static char softirq_stack[NR_CPUS * THREAD_SIZE] | 168 | static char softirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss; |
169 | __attribute__((__section__(".bss.page_aligned"))); | ||
170 | 169 | ||
171 | static char hardirq_stack[NR_CPUS * THREAD_SIZE] | 170 | static char hardirq_stack[NR_CPUS * THREAD_SIZE] __page_aligned_bss; |
172 | __attribute__((__section__(".bss.page_aligned"))); | ||
173 | 171 | ||
174 | /* | 172 | /* |
175 | * allocate per-cpu stacks for hardirq and for softirq processing | 173 | * allocate per-cpu stacks for hardirq and for softirq processing |
diff --git a/arch/x86/kernel/head_32.S b/arch/x86/kernel/head_32.S index b766e8c7252d..1dac23958427 100644 --- a/arch/x86/kernel/head_32.S +++ b/arch/x86/kernel/head_32.S | |||
@@ -608,7 +608,7 @@ ENTRY(initial_code) | |||
608 | /* | 608 | /* |
609 | * BSS section | 609 | * BSS section |
610 | */ | 610 | */ |
611 | .section ".bss.page_aligned","wa" | 611 | __PAGE_ALIGNED_BSS |
612 | .align PAGE_SIZE_asm | 612 | .align PAGE_SIZE_asm |
613 | #ifdef CONFIG_X86_PAE | 613 | #ifdef CONFIG_X86_PAE |
614 | swapper_pg_pmd: | 614 | swapper_pg_pmd: |
diff --git a/arch/x86/kernel/head_64.S b/arch/x86/kernel/head_64.S index fa54f78e2a05..d0bc0a13a437 100644 --- a/arch/x86/kernel/head_64.S +++ b/arch/x86/kernel/head_64.S | |||
@@ -418,7 +418,7 @@ ENTRY(phys_base) | |||
418 | ENTRY(idt_table) | 418 | ENTRY(idt_table) |
419 | .skip IDT_ENTRIES * 16 | 419 | .skip IDT_ENTRIES * 16 |
420 | 420 | ||
421 | .section .bss.page_aligned, "aw", @nobits | 421 | __PAGE_ALIGNED_BSS |
422 | .align PAGE_SIZE | 422 | .align PAGE_SIZE |
423 | ENTRY(empty_zero_page) | 423 | ENTRY(empty_zero_page) |
424 | .skip PAGE_SIZE | 424 | .skip PAGE_SIZE |
diff --git a/arch/xtensa/kernel/head.S b/arch/xtensa/kernel/head.S index d9ddc1ba761c..d215adcfd4ea 100644 --- a/arch/xtensa/kernel/head.S +++ b/arch/xtensa/kernel/head.S | |||
@@ -235,7 +235,7 @@ should_never_return: | |||
235 | * BSS section | 235 | * BSS section |
236 | */ | 236 | */ |
237 | 237 | ||
238 | .section ".bss.page_aligned", "w" | 238 | __PAGE_ALIGNED_BSS |
239 | #ifdef CONFIG_MMU | 239 | #ifdef CONFIG_MMU |
240 | ENTRY(swapper_pg_dir) | 240 | ENTRY(swapper_pg_dir) |
241 | .fill PAGE_SIZE, 1, 0 | 241 | .fill PAGE_SIZE, 1, 0 |