Merge tag 'x86_microcode_for_v6.7_rc1' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / arch / x86 / include / asm / apic.h

diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h
index 17f2f28a495ec6f9e7bc54d659fba260ea30d96d..d21f48f1c242e06ba9139be346f1af40d4c1084d 100644 (file)
--- a/arch/x86/include/asm/apic.h
+++ b/arch/x86/include/asm/apic.h
@@ -54,7 +54,7 @@ extern int local_apic_timer_c2_ok;
 extern bool apic_is_disabled;
 extern unsigned int lapic_timer_period;
 
-extern int cpuid_to_apicid[];
+extern u32 cpuid_to_apicid[];
 
 extern enum apic_intr_mode_id apic_intr_mode;
 enum apic_intr_mode_id {
@@ -293,19 +293,19 @@ struct apic {
        int     (*acpi_madt_oem_check)(char *oem_id, char *oem_table_id);
        bool    (*apic_id_registered)(void);
 
-       bool    (*check_apicid_used)(physid_mask_t *map, int apicid);
+       bool    (*check_apicid_used)(physid_mask_t *map, u32 apicid);
        void    (*init_apic_ldr)(void);
        void    (*ioapic_phys_id_map)(physid_mask_t *phys_map, physid_mask_t *retmap);
-       int     (*cpu_present_to_apicid)(int mps_cpu);
-       int     (*phys_pkg_id)(int cpuid_apic, int index_msb);
+       u32     (*cpu_present_to_apicid)(int mps_cpu);
+       u32     (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
 
-       u32     (*get_apic_id)(unsigned long x);
-       u32     (*set_apic_id)(unsigned int id);
+       u32     (*get_apic_id)(u32 id);
+       u32     (*set_apic_id)(u32 apicid);
 
        /* wakeup_secondary_cpu */
-       int     (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
+       int     (*wakeup_secondary_cpu)(u32 apicid, unsigned long start_eip);
        /* wakeup secondary CPU using 64-bit wakeup point */
-       int     (*wakeup_secondary_cpu_64)(int apicid, unsigned long start_eip);
+       int     (*wakeup_secondary_cpu_64)(u32 apicid, unsigned long start_eip);
 
        char    *name;
 };
@@ -323,8 +323,8 @@ struct apic_override {
        void    (*send_IPI_self)(int vector);
        u64     (*icr_read)(void);
        void    (*icr_write)(u32 low, u32 high);
-       int     (*wakeup_secondary_cpu)(int apicid, unsigned long start_eip);
-       int     (*wakeup_secondary_cpu_64)(int apicid, unsigned long start_eip);
+       int     (*wakeup_secondary_cpu)(u32 apicid, unsigned long start_eip);
+       int     (*wakeup_secondary_cpu_64)(u32 apicid, unsigned long start_eip);
 };
 
 /*
@@ -494,16 +494,6 @@ static inline bool lapic_vector_set_in_irr(unsigned int vector)
        return !!(irr & (1U << (vector % 32)));
 }
 
-static inline unsigned default_get_apic_id(unsigned long x)
-{
-       unsigned int ver = GET_APIC_VERSION(apic_read(APIC_LVR));
-
-       if (APIC_XAPIC(ver) || boot_cpu_has(X86_FEATURE_EXTD_APICID))
-               return (x >> 24) & 0xFF;
-       else
-               return (x >> 24) & 0x0F;
-}
-
 /*
  * Warm reset vector position:
  */
@@ -518,9 +508,9 @@ extern void generic_bigsmp_probe(void);
 
 extern struct apic apic_noop;
 
-static inline unsigned int read_apic_id(void)
+static inline u32 read_apic_id(void)
 {
-       unsigned int reg = apic_read(APIC_ID);
+       u32 reg = apic_read(APIC_ID);
 
        return apic->get_apic_id(reg);
 }
@@ -539,15 +529,14 @@ extern int default_apic_id_valid(u32 apicid);
 extern u32 apic_default_calc_apicid(unsigned int cpu);
 extern u32 apic_flat_calc_apicid(unsigned int cpu);
 
-extern bool default_check_apicid_used(physid_mask_t *map, int apicid);
 extern void default_ioapic_phys_id_map(physid_mask_t *phys_map, physid_mask_t *retmap);
-extern int default_cpu_present_to_apicid(int mps_cpu);
+extern u32 default_cpu_present_to_apicid(int mps_cpu);
 
 void apic_send_nmi_to_offline_cpu(unsigned int cpu);
 
 #else /* CONFIG_X86_LOCAL_APIC */
 
-static inline unsigned int read_apic_id(void) { return 0; }
+static inline u32 read_apic_id(void) { return 0; }
 
 #endif /* !CONFIG_X86_LOCAL_APIC */