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

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

x86: refactor ->enable_apic_mode() subarch methods 



Only ES7000 has a real ->enable_apic_mode() method, the other
subarchitectures define it but keep it empty.

So mark the vector as NULL, extend the generic code to handle
NULL -setup_portio_remap() entries and remove all the empty
handlers.

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

arch/x86/include/asm/bigsmp/apic.h

+0 −4
Original line number Diff line number Diff line
@@ -104,10 +104,6 @@ static inline int bigsmp_check_phys_apicid_present(int boot_cpu_physical_apicid) 
	return 1;

}



static inline void enable_apic_mode(void)

{

}



/* As we are using single CPU as destination, pick only one CPU here */

static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)

{

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

+0 −3
Original line number Diff line number Diff line
@@ -145,8 +145,5 @@ static inline physid_mask_t default_apicid_to_cpu_present(int phys_apicid) 
	return physid_mask_of_physid(phys_apicid);

}



static inline void enable_apic_mode(void)

{

}

#endif /* CONFIG_X86_LOCAL_APIC */

#endif /* _ASM_X86_MACH_DEFAULT_MACH_APIC_H */

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

+0 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 


#define cpu_mask_to_apicid (apic->cpu_mask_to_apicid)

#define cpu_mask_to_apicid_and (apic->cpu_mask_to_apicid_and)

#define enable_apic_mode (apic->enable_apic_mode)

#define phys_pkg_id (apic->phys_pkg_id)

#define wakeup_secondary_cpu (apic->wakeup_cpu)

arch/x86/include/asm/numaq/apic.h

+0 −4
Original line number Diff line number Diff line
@@ -97,10 +97,6 @@ static inline int numaq_check_phys_apicid_present(int boot_cpu_physical_apicid) 
	return 1;

}



static inline void enable_apic_mode(void)

{

}



/*

 * We use physical apicids here, not logical, so just return the default

 * physical broadcast to stop people from breaking us

arch/x86/include/asm/summit/apic.h

+0 −4
Original line number Diff line number Diff line
@@ -125,10 +125,6 @@ static inline int summit_check_phys_apicid_present(int boot_cpu_physical_apicid) 
	return 1;

}



static inline void enable_apic_mode(void)

{

}



static inline unsigned int cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	int num_bits_set;