Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 75fdd155 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

sections: fix section conflicts in arch/x86 



Signed-off-by: default avatarAndi 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 666e81fd

arch/x86/include/asm/apic.h

+1 −1
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ extern struct apic *apic; 
 * to enforce the order with in them.

 */

#define apic_driver(sym)					\

	static struct apic *__apicdrivers_##sym __used		\

	static const struct apic *__apicdrivers_##sym __used		\

	__aligned(sizeof(struct apic *))			\

	__section(.apicdrivers) = { &sym }

arch/x86/kernel/apic/apic_numachip.c

+2 −2
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 


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)

{
@@ -199,7 +199,7 @@ static int numachip_acpi_madt_oem_check(char *oem_id, char *oem_table_id) 
	return 0;

}



static struct apic apic_numachip __refconst = {

static const struct apic apic_numachip __refconst = {



	.name				= "NumaConnect system",

	.probe				= numachip_probe,

arch/x86/kernel/rtc.c

+1 −1
Original line number Diff line number Diff line
@@ -225,7 +225,7 @@ static struct platform_device rtc_device = { 
static __init int add_rtc_cmos(void)

{

#ifdef CONFIG_PNP

	static const char *ids[] __initconst =

	static const char * const  const ids[] __initconst =

	    { "PNP0b00", "PNP0b01", "PNP0b02", };

	struct pnp_dev *dev;

	struct pnp_id *id;