iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sections: fix section conflicts in arch/x86

Browse Source 
Signed-off-by: Andi Kleen <ak@linux.intel.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Andi Kleen 2012-10-04 17:11:42 -07:00 committed by Linus Torvalds
parent 666e81fdca
commit 75fdd155ea
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/x86/include/asm/apic.h
View File

@ -409,7 +409,7 @@ extern struct apic *apic;
* to enforce the order with in them. * to enforce the order with in them.
*/ */
#define apic_driver(sym) \ #define apic_driver(sym) \
static struct apic *__apicdrivers_##sym __used \ static const struct apic *__apicdrivers_##sym __used \
__aligned(sizeof(struct apic *)) \ __aligned(sizeof(struct apic *)) \
__section(.apicdrivers) = { &sym } __section(.apicdrivers) = { &sym }

4
arch/x86/kernel/apic/apic_numachip.c
View File

@ -30,7 +30,7 @@
static int numachip_system __read_mostly; static int numachip_system __read_mostly;
static struct apic apic_numachip __read_mostly; static const struct apic apic_numachip __read_mostly;
static unsigned int get_apic_id(unsigned long x) static unsigned int get_apic_id(unsigned long x)
{ {
@ -199,7 +199,7 @@ static int numachip_acpi_madt_oem_check(char *oem_id, char *oem_table_id)
return 0; return 0;
} }
static struct apic apic_numachip __refconst = { static const struct apic apic_numachip __refconst = {
.name = "NumaConnect system", .name = "NumaConnect system",
.probe = numachip_probe, .probe = numachip_probe,

2
arch/x86/kernel/rtc.c
View File

@ -225,7 +225,7 @@ static struct platform_device rtc_device = {
static __init int add_rtc_cmos(void) static __init int add_rtc_cmos(void)
{ {
#ifdef CONFIG_PNP #ifdef CONFIG_PNP
static const char *ids[] __initconst = static const char * const const ids[] __initconst =
{ "PNP0b00", "PNP0b01", "PNP0b02", }; { "PNP0b00", "PNP0b01", "PNP0b02", };
struct pnp_dev *dev; struct pnp_dev *dev;
struct pnp_id *id; struct pnp_id *id;