Commit c8d46cf0 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86: rename 'genapic' to 'apic' 



Rename genapic-> to apic-> references because in a future chagne we'll
open-code all the indirect calls (instead of obscuring them via macros),
so we want this reference to be as short as possible.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6781d948

arch/x86/include/asm/genapic.h

+1 −1
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ struct genapic { 
	void (*inquire_remote_apic)(int apicid);

};



extern struct genapic *genapic;

extern struct genapic *apic;



#ifdef CONFIG_X86_32

arch/x86/include/asm/mach-default/mach_apic.h

+11 −11
Original line number Diff line number Diff line
@@ -22,18 +22,18 @@ static inline const struct cpumask *target_cpus(void) 


#ifdef CONFIG_X86_64

#include <asm/genapic.h>

#define INT_DELIVERY_MODE (genapic->int_delivery_mode)

#define INT_DEST_MODE (genapic->int_dest_mode)

#define TARGET_CPUS	  (genapic->target_cpus())

#define apic_id_registered (genapic->apic_id_registered)

#define init_apic_ldr (genapic->init_apic_ldr)

#define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and)

#define phys_pkg_id	(genapic->phys_pkg_id)

#define vector_allocation_domain    (genapic->vector_allocation_domain)

#define INT_DELIVERY_MODE (apic->int_delivery_mode)

#define INT_DEST_MODE (apic->int_dest_mode)

#define TARGET_CPUS	  (apic->target_cpus())

#define apic_id_registered (apic->apic_id_registered)

#define init_apic_ldr (apic->init_apic_ldr)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define phys_pkg_id	(apic->phys_pkg_id)

#define vector_allocation_domain    (apic->vector_allocation_domain)

#define read_apic_id()  (GET_APIC_ID(apic_read(APIC_ID)))

#define send_IPI_self (genapic->send_IPI_self)

#define wakeup_secondary_cpu (genapic->wakeup_cpu)

#define send_IPI_self (apic->send_IPI_self)

#define wakeup_secondary_cpu (apic->wakeup_cpu)

extern void setup_apic_routing(void);

#else

#define INT_DELIVERY_MODE dest_LowestPrio

arch/x86/include/asm/mach-default/mach_apicdef.h

+3 −3
Original line number Diff line number Diff line
@@ -4,9 +4,9 @@ 
#include <asm/apic.h>



#ifdef CONFIG_X86_64

#define	APIC_ID_MASK		(genapic->apic_id_mask)

#define GET_APIC_ID(x)		(genapic->get_apic_id(x))

#define	SET_APIC_ID(x)		(genapic->set_apic_id(x))

#define	APIC_ID_MASK		(apic->apic_id_mask)

#define GET_APIC_ID(x)		(apic->get_apic_id(x))

#define	SET_APIC_ID(x)		(apic->set_apic_id(x))

#else

#define		APIC_ID_MASK		(0xF<<24)

static inline unsigned get_apic_id(unsigned long x)

arch/x86/include/asm/mach-default/mach_ipi.h

+4 −4
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ extern int no_broadcast; 


#ifdef CONFIG_X86_64

#include <asm/genapic.h>

#define send_IPI_mask (genapic->send_IPI_mask)

#define send_IPI_mask_allbutself (genapic->send_IPI_mask_allbutself)

#define send_IPI_mask (apic->send_IPI_mask)

#define send_IPI_mask_allbutself (apic->send_IPI_mask_allbutself)

#else

static inline void send_IPI_mask(const struct cpumask *mask, int vector)

{
@@ -39,8 +39,8 @@ static inline void __local_send_IPI_all(int vector) 
}



#ifdef CONFIG_X86_64

#define send_IPI_allbutself (genapic->send_IPI_allbutself)

#define send_IPI_all (genapic->send_IPI_all)

#define send_IPI_allbutself (apic->send_IPI_allbutself)

#define send_IPI_all (apic->send_IPI_all)

#else

static inline void send_IPI_allbutself(int vector)

{

arch/x86/include/asm/mach-generic/mach_apic.h

+25 −25
Original line number Diff line number Diff line
@@ -3,32 +3,32 @@ 


#include <asm/genapic.h>



#define esr_disable (genapic->ESR_DISABLE)

#define NO_BALANCE_IRQ (genapic->no_balance_irq)

#define INT_DELIVERY_MODE (genapic->int_delivery_mode)

#define INT_DEST_MODE (genapic->int_dest_mode)

#define esr_disable (apic->ESR_DISABLE)

#define NO_BALANCE_IRQ (apic->no_balance_irq)

#define INT_DELIVERY_MODE (apic->int_delivery_mode)

#define INT_DEST_MODE (apic->int_dest_mode)

#undef APIC_DEST_LOGICAL

#define APIC_DEST_LOGICAL (genapic->apic_destination_logical)

#define TARGET_CPUS	  (genapic->target_cpus())

#define apic_id_registered (genapic->apic_id_registered)

#define init_apic_ldr (genapic->init_apic_ldr)

#define ioapic_phys_id_map (genapic->ioapic_phys_id_map)

#define setup_apic_routing (genapic->setup_apic_routing)

#define multi_timer_check (genapic->multi_timer_check)

#define apicid_to_node (genapic->apicid_to_node)

#define cpu_to_logical_apicid (genapic->cpu_to_logical_apicid) 

#define cpu_present_to_apicid (genapic->cpu_present_to_apicid)

#define apicid_to_cpu_present (genapic->apicid_to_cpu_present)

#define setup_portio_remap (genapic->setup_portio_remap)

#define check_apicid_present (genapic->check_apicid_present)

#define check_phys_apicid_present (genapic->check_phys_apicid_present)

#define check_apicid_used (genapic->check_apicid_used)

#define cpu_mask_to_apicid (genapic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (genapic->cpu_mask_to_apicid_and)

#define vector_allocation_domain (genapic->vector_allocation_domain)

#define enable_apic_mode (genapic->enable_apic_mode)

#define phys_pkg_id (genapic->phys_pkg_id)

#define wakeup_secondary_cpu (genapic->wakeup_cpu)

#define APIC_DEST_LOGICAL (apic->apic_destination_logical)

#define TARGET_CPUS	  (apic->target_cpus())

#define apic_id_registered (apic->apic_id_registered)

#define init_apic_ldr (apic->init_apic_ldr)

#define ioapic_phys_id_map (apic->ioapic_phys_id_map)

#define setup_apic_routing (apic->setup_apic_routing)

#define multi_timer_check (apic->multi_timer_check)

#define apicid_to_node (apic->apicid_to_node)

#define cpu_to_logical_apicid (apic->cpu_to_logical_apicid) 

#define cpu_present_to_apicid (apic->cpu_present_to_apicid)

#define apicid_to_cpu_present (apic->apicid_to_cpu_present)

#define setup_portio_remap (apic->setup_portio_remap)

#define check_apicid_present (apic->check_apicid_present)

#define check_phys_apicid_present (apic->check_phys_apicid_present)

#define check_apicid_used (apic->check_apicid_used)

#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define vector_allocation_domain (apic->vector_allocation_domain)

#define enable_apic_mode (apic->enable_apic_mode)

#define phys_pkg_id (apic->phys_pkg_id)

#define wakeup_secondary_cpu (apic->wakeup_cpu)



extern void generic_bigsmp_probe(void);

CRA Git | Maintained and supported by SUSTech CRA and CCSE