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

Commit b5f26d05 authored by Jiri Slaby's avatar Jiri Slaby Committed by Ingo Molnar
Browse files

x86_32: summit_32, de-inline functions 



The ones which go only into struct genapic are de-inlined
by compiler anyway, so remove the inline specifier from them.

Afterwards, remove summit_setup_portio_remap completely as it
is unused.

Remove inline also from summit_cpu_mask_to_apicid, since it's
not worth it (it is used in struct genapic too).

Signed-off-by: default avatarJiri Slaby <jirislaby@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 10b614ea

arch/x86/kernel/apic/summit_32.c

+20 −27
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 
#include <linux/gfp.h>

#include <linux/smp.h>



static inline unsigned summit_get_apic_id(unsigned long x)

static unsigned summit_get_apic_id(unsigned long x)

{

	return (x >> 24) & 0xFF;

}
@@ -58,7 +58,7 @@ static inline void summit_send_IPI_mask(const cpumask_t *mask, int vector) 
	default_send_IPI_mask_sequence_logical(mask, vector);

}



static inline void summit_send_IPI_allbutself(int vector)

static void summit_send_IPI_allbutself(int vector)

{

	cpumask_t mask = cpu_online_map;

	cpu_clear(smp_processor_id(), mask);
@@ -67,7 +67,7 @@ static inline void summit_send_IPI_allbutself(int vector) 
		summit_send_IPI_mask(&mask, vector);

}



static inline void summit_send_IPI_all(int vector)

static void summit_send_IPI_all(int vector)

{

	summit_send_IPI_mask(&cpu_online_map, vector);

}
@@ -82,8 +82,8 @@ extern void setup_summit(void); 
#define setup_summit()	{}

#endif



static inline int

summit_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid)

static int summit_mps_oem_check(struct mpc_table *mpc, char *oem,

		char *productid)

{

	if (!strncmp(oem, "IBM ENSW", 8) &&

			(!strncmp(productid, "VIGIL SMP", 9)
@@ -98,7 +98,7 @@ summit_mps_oem_check(struct mpc_table *mpc, char *oem, char *productid) 
}



/* Hook from generic ACPI tables.c */

static inline int summit_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

static int summit_acpi_madt_oem_check(char *oem_id, char *oem_table_id)

{

	if (!strncmp(oem_id, "IBM", 3) &&

	    (!strncmp(oem_table_id, "SERVIGIL", 8)
@@ -186,7 +186,7 @@ static inline int is_WPEG(struct rio_detail *rio){ 


#define SUMMIT_APIC_DFR_VALUE	(APIC_DFR_CLUSTER)



static inline const cpumask_t *summit_target_cpus(void)

static const cpumask_t *summit_target_cpus(void)

{

	/* CPU_MASK_ALL (0xff) has undefined behaviour with

	 * dest_LowestPrio mode logical clustered apic interrupt routing
@@ -195,19 +195,18 @@ static inline const cpumask_t *summit_target_cpus(void) 
	return &cpumask_of_cpu(0);

}



static inline unsigned long

summit_check_apicid_used(physid_mask_t bitmap, int apicid)

static unsigned long summit_check_apicid_used(physid_mask_t bitmap, int apicid)

{

	return 0;

}



/* we don't use the phys_cpu_present_map to indicate apicid presence */

static inline unsigned long summit_check_apicid_present(int bit)

static unsigned long summit_check_apicid_present(int bit)

{

	return 1;

}



static inline void summit_init_apic_ldr(void)

static void summit_init_apic_ldr(void)

{

	unsigned long val, id;

	int count = 0;
@@ -234,18 +233,18 @@ static inline void summit_init_apic_ldr(void) 
	apic_write(APIC_LDR, val);

}



static inline int summit_apic_id_registered(void)

static int summit_apic_id_registered(void)

{

	return 1;

}



static inline void summit_setup_apic_routing(void)

static void summit_setup_apic_routing(void)

{

	printk("Enabling APIC mode:  Summit.  Using %d I/O APICs\n",

						nr_ioapics);

}



static inline int summit_apicid_to_node(int logical_apicid)

static int summit_apicid_to_node(int logical_apicid)

{

#ifdef CONFIG_SMP

	return apicid_2_node[hard_smp_processor_id()];
@@ -266,7 +265,7 @@ static inline int summit_cpu_to_logical_apicid(int cpu) 
#endif

}



static inline int summit_cpu_present_to_apicid(int mps_cpu)

static int summit_cpu_present_to_apicid(int mps_cpu)

{

	if (mps_cpu < nr_cpu_ids)

		return (int)per_cpu(x86_bios_cpu_apicid, mps_cpu);
@@ -274,28 +273,23 @@ static inline int summit_cpu_present_to_apicid(int mps_cpu) 
		return BAD_APICID;

}



static inline physid_mask_t

summit_ioapic_phys_id_map(physid_mask_t phys_id_map)

static physid_mask_t summit_ioapic_phys_id_map(physid_mask_t phys_id_map)

{

	/* For clustered we don't have a good way to do this yet - hack */

	return physids_promote(0x0F);

}



static inline physid_mask_t summit_apicid_to_cpu_present(int apicid)

static physid_mask_t summit_apicid_to_cpu_present(int apicid)

{

	return physid_mask_of_physid(0);

}



static inline void summit_setup_portio_remap(void)

{

}



static inline int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)

static int summit_check_phys_apicid_present(int boot_cpu_physical_apicid)

{

	return 1;

}



static inline unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)

static unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask)

{

	int cpus_found = 0;

	int num_bits_set;
@@ -328,8 +322,7 @@ static inline unsigned int summit_cpu_mask_to_apicid(const cpumask_t *cpumask) 
	return apicid;

}



static inline unsigned int

summit_cpu_mask_to_apicid_and(const struct cpumask *inmask,

static unsigned int summit_cpu_mask_to_apicid_and(const struct cpumask *inmask,

			      const struct cpumask *andmask)

{

	int apicid = summit_cpu_to_logical_apicid(0);
@@ -354,7 +347,7 @@ summit_cpu_mask_to_apicid_and(const struct cpumask *inmask, 
 *

 * See Intel's IA-32 SW Dev's Manual Vol2 under CPUID.

 */

static inline int summit_phys_pkg_id(int cpuid_apic, int index_msb)

static int summit_phys_pkg_id(int cpuid_apic, int index_msb)

{

	return hard_smp_processor_id() >> index_msb;

}