diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2008-05-28 10:02:14 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:48:13 -0400 |
commit | a7bf0bd5e6af7fe69342dabf2a3b721f0163469a (patch) | |
tree | 3f7e08f0df4c5eccf81732dcf95b8cc4efafa203 /arch | |
parent | 1ecd27657b735128a728ebf0c31fce5e1456718a (diff) |
build: add __page_aligned_data and __page_aligned_bss
Making a variable page-aligned by using
__attribute__((section(".data.page_aligned"))) is fragile because if
sizeof(variable) is not also a multiple of page size, it leaves
variables in the remainder of the section unaligned.
This patch introduces two new qualifiers, __page_aligned_data and
__page_aligned_bss to set the section *and* the alignment of
variables. This makes page-aligned variables more robust because the
linker will make sure they're aligned properly. Unfortunately it
requires *all* page-aligned data to use these macros...
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/x86/kernel/setup64.c | 2 | ||||
-rw-r--r-- | arch/x86/mm/ioremap.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86/kernel/setup64.c b/arch/x86/kernel/setup64.c index 631ea6cc01d8..fc1a56da8240 100644 --- a/arch/x86/kernel/setup64.c +++ b/arch/x86/kernel/setup64.c | |||
@@ -40,7 +40,7 @@ EXPORT_SYMBOL(_cpu_pda); | |||
40 | 40 | ||
41 | struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table }; | 41 | struct desc_ptr idt_descr = { 256 * 16 - 1, (unsigned long) idt_table }; |
42 | 42 | ||
43 | char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned"))); | 43 | char boot_cpu_stack[IRQSTACKSIZE] __page_aligned_bss; |
44 | 44 | ||
45 | unsigned long __supported_pte_mask __read_mostly = ~0UL; | 45 | unsigned long __supported_pte_mask __read_mostly = ~0UL; |
46 | EXPORT_SYMBOL_GPL(__supported_pte_mask); | 46 | EXPORT_SYMBOL_GPL(__supported_pte_mask); |
diff --git a/arch/x86/mm/ioremap.c b/arch/x86/mm/ioremap.c index 416ea415f5c2..0561fde56a51 100644 --- a/arch/x86/mm/ioremap.c +++ b/arch/x86/mm/ioremap.c | |||
@@ -394,8 +394,7 @@ static int __init early_ioremap_debug_setup(char *str) | |||
394 | early_param("early_ioremap_debug", early_ioremap_debug_setup); | 394 | early_param("early_ioremap_debug", early_ioremap_debug_setup); |
395 | 395 | ||
396 | static __initdata int after_paging_init; | 396 | static __initdata int after_paging_init; |
397 | static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] | 397 | static pte_t bm_pte[PAGE_SIZE/sizeof(pte_t)] __page_aligned_bss; |
398 | __section(.bss.page_aligned); | ||
399 | 398 | ||
400 | static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) | 399 | static inline pmd_t * __init early_ioremap_pmd(unsigned long addr) |
401 | { | 400 | { |