diff options
Diffstat (limited to 'arch/x86/machine/boot.c')
| -rw-r--r-- | arch/x86/machine/boot.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/x86/machine/boot.c b/arch/x86/machine/boot.c index 76fbcb40..7ce7b85d 100644 --- a/arch/x86/machine/boot.c +++ b/arch/x86/machine/boot.c @@ -42,6 +42,7 @@ * to "enabling paging" do not refer to this initial identity mapping. */ +#include <stdalign.h> #include <stdbool.h> #include <stddef.h> #include <stdint.h> @@ -77,14 +78,14 @@ #include <vm/vm_kmem.h> #include <vm/vm_setup.h> -char boot_stack[BOOT_STACK_SIZE] __aligned(CPU_DATA_ALIGN) __bootdata; -char boot_ap_stack[BOOT_STACK_SIZE] __aligned(CPU_DATA_ALIGN) __bootdata; +alignas(CPU_DATA_ALIGN) char boot_stack[BOOT_STACK_SIZE] __bootdata; +alignas(CPU_DATA_ALIGN) char boot_ap_stack[BOOT_STACK_SIZE] __bootdata; unsigned int boot_ap_id __bootdata; #ifdef __LP64__ -pmap_pte_t boot_pml4[PMAP_L3_PTES_PER_PT] __aligned(PAGE_SIZE) __bootdata; -pmap_pte_t boot_pdpt[PMAP_L2_PTES_PER_PT] __aligned(PAGE_SIZE) __bootdata; -pmap_pte_t boot_pdir[4 * PMAP_L1_PTES_PER_PT] __aligned(PAGE_SIZE) __bootdata; +alignas(PAGE_SIZE) pmap_pte_t boot_pml4[PMAP_L3_PTES_PER_PT] __bootdata; +alignas(PAGE_SIZE) pmap_pte_t boot_pdpt[PMAP_L2_PTES_PER_PT] __bootdata; +alignas(PAGE_SIZE) pmap_pte_t boot_pdir[4 * PMAP_L1_PTES_PER_PT] __bootdata; char boot_panic_long_mode_msg[] __bootdata = "boot: processor doesn't support long mode"; #endif /* __LP64__ */ |