From 498266eb5fd2af5bed995ed5cf30266eebe7926b Mon Sep 17 00:00:00 2001 From: Andrew Cooper Date: Mon, 8 Jun 2015 14:14:38 +0200 Subject: [PATCH] x86: use existing __section() macro instead of opencoding it No functional change Signed-off-by: Andrew Cooper --- xen/arch/x86/hvm/hvm.c | 2 +- xen/arch/x86/mm.c | 3 +-- xen/arch/x86/setup.c | 2 +- xen/arch/x86/x86_64/mm.c | 6 ++---- 4 files changed, 5 insertions(+), 8 deletions(-) diff --git a/xen/arch/x86/hvm/hvm.c b/xen/arch/x86/hvm/hvm.c index b1023bb894..f354cb7a76 100644 --- a/xen/arch/x86/hvm/hvm.c +++ b/xen/arch/x86/hvm/hvm.c @@ -82,7 +82,7 @@ struct hvm_function_table hvm_funcs __read_mostly; * the hardware domain which needs a more permissive one. */ #define HVM_IOBITMAP_SIZE (3 * PAGE_SIZE) -unsigned long __attribute__ ((__section__ (".bss.page_aligned"))) +unsigned long __section(".bss.page_aligned") hvm_io_bitmap[HVM_IOBITMAP_SIZE / BYTES_PER_LONG]; /* Xen command-line option to enable HAP */ diff --git a/xen/arch/x86/mm.c b/xen/arch/x86/mm.c index 1c0783f507..c1a38bc308 100644 --- a/xen/arch/x86/mm.c +++ b/xen/arch/x86/mm.c @@ -126,8 +126,7 @@ #include /* Mapping of the fixmap space needed early. */ -l1_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l1_fixmap[L1_PAGETABLE_ENTRIES]; +l1_pgentry_t __section(".bss.page_aligned") l1_fixmap[L1_PAGETABLE_ENTRIES]; #define MEM_LOG(_f, _a...) gdprintk(XENLOG_WARNING , _f "\n" , ## _a) diff --git a/xen/arch/x86/setup.c b/xen/arch/x86/setup.c index 8e21859bf2..d118decd74 100644 --- a/xen/arch/x86/setup.c +++ b/xen/arch/x86/setup.c @@ -101,7 +101,7 @@ unsigned long __read_mostly xen_virt_end; DEFINE_PER_CPU(struct tss_struct, init_tss); -char __attribute__ ((__section__(".bss.stack_aligned"))) cpu0_stack[STACK_SIZE]; +char __section(".bss.stack_aligned") cpu0_stack[STACK_SIZE]; struct cpuinfo_x86 __read_mostly boot_cpu_data = { 0, 0, 0, 0, -1 }; diff --git a/xen/arch/x86/x86_64/mm.c b/xen/arch/x86/x86_64/mm.c index e58de58bec..3ef46187c6 100644 --- a/xen/arch/x86/x86_64/mm.c +++ b/xen/arch/x86/x86_64/mm.c @@ -43,10 +43,8 @@ unsigned int __read_mostly m2p_compat_vstart = __HYPERVISOR_COMPAT_VIRT_START; /* Enough page directories to map into the bottom 1GB. */ -l3_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l3_bootmap[L3_PAGETABLE_ENTRIES]; -l2_pgentry_t __attribute__ ((__section__ (".bss.page_aligned"))) - l2_bootmap[L2_PAGETABLE_ENTRIES]; +l3_pgentry_t __section(".bss.page_aligned") l3_bootmap[L3_PAGETABLE_ENTRIES]; +l2_pgentry_t __section(".bss.page_aligned") l2_bootmap[L2_PAGETABLE_ENTRIES]; l2_pgentry_t *compat_idle_pg_table_l2; -- 2.39.5