Commit c94f0718 authored by Thomas Gleixner's avatar Thomas Gleixner
Browse files

x86/apic: Consolidate the apic local headers 



Now there are three small local headers. Some contain functions which are
only used in one source file.

Move all the inlines and declarations into a single local header and the
inlines which are only used in one source file into that.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarPeter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lkml.kernel.org/r/20190722105219.618612624@linutronix.de
parent ba77b2a0

arch/x86/kernel/apic/apic_flat_64.c

+1 −2
Original line number Diff line number Diff line
@@ -15,8 +15,7 @@ 
#include <asm/jailhouse_para.h>

#include <asm/apic.h>



#include "apic_flat_64.h"

#include "ipi.h"

#include "local.h"



static struct apic apic_physflat;

static struct apic apic_flat;

arch/x86/kernel/apic/apic_flat_64.h

deleted100644 → 0
+0 −8
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef _ASM_X86_APIC_FLAT_64_H

#define _ASM_X86_APIC_FLAT_64_H



extern void flat_init_apic_ldr(void);



#endif

arch/x86/kernel/apic/apic_numachip.c

+1 −2
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 


#include <asm/pgtable.h>



#include "apic_flat_64.h"

#include "ipi.h"

#include "local.h"



u8 numachip_system __read_mostly;

static const struct apic apic_numachip1;

arch/x86/kernel/apic/bigsmp_32.c

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 


#include <asm/apic.h>



#include "ipi.h"

#include "local.h"



static unsigned bigsmp_get_apic_id(unsigned long x)

{

arch/x86/kernel/apic/ipi.c

+12 −2
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0



#include <linux/cpumask.h>

#include <linux/smp.h>



#include <asm/apic.h>

#include "local.h"



#include "ipi.h"

static inline int __prepare_ICR2(unsigned int mask)

{

	return SET_APIC_DEST_FIELD(mask);

}



static inline void __xapic_wait_icr_idle(void)

{

	while (native_apic_mem_read(APIC_ICR) & APIC_ICR_BUSY)

		cpu_relax();

}



void __default_send_IPI_shortcut(unsigned int shortcut, int vector, unsigned int dest)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE