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

Commit 57592224 authored by Rakib Mullick's avatar Rakib Mullick Committed by Ingo Molnar
Browse files

x86: Fix section mismatches in mpparse 



Impact: fix section mismatch

In arch/x86/kernel/mpparse.c, smp_reserve_bootmem() has been called
and also refers to a function which is in .init section. Thus causes
the first warning. And check_irq_src() also requires an __init,
because it refers to an .init section.

Signed-off-by: default avatarRakib Mullick <rakib.mullick@gmail.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
LKML-Reference: <b9df5fa10904102004g51265d9axc8d07278bfdb6ba0@mail.gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 9b987aeb

arch/x86/kernel/mpparse.c

+4 −3
Original line number Diff line number Diff line
@@ -679,7 +679,7 @@ void __init get_smp_config(void) 
	__get_smp_config(0);

}



static void smp_reserve_bootmem(struct mpf_intel *mpf)

static void __init smp_reserve_bootmem(struct mpf_intel *mpf)

{

	unsigned long size = get_mpc_size(mpf->physptr);

#ifdef CONFIG_X86_32
@@ -838,7 +838,7 @@ static int __init get_MP_intsrc_index(struct mpc_intsrc *m) 


static struct mpc_intsrc __initdata *m_spare[SPARE_SLOT_NUM];



static void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)

static void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare)

{

	int i;
@@ -866,7 +866,8 @@ static void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) 
	}

}

#else /* CONFIG_X86_IO_APIC */

static inline void check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}

static

inline void __init check_irq_src(struct mpc_intsrc *m, int *nr_m_spare) {}

#endif /* CONFIG_X86_IO_APIC */



static int check_slot(unsigned long mpc_new_phys, unsigned long mpc_new_length,