x86, apic: unify phys_pkg_id()

- unify the call signature of 64-bit to that of 32-bit

 - clean up the types all around

 - clean up namespace contamination

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 1 insertions, 5 deletions

diff --git a/arch/x86/include/asm/genapic.h b/arch/x86/include/asm/genapic.h
index f292fd02ebab..14b19de8cd09 100644
--- a/arch/x86/include/asm/genapic.h
+++ b/arch/x86/include/asm/genapic.h
@@ -48,11 +48,7 @@ struct genapic {
         void (*setup_portio_remap)(void);
         int (*check_phys_apicid_present)(int boot_cpu_physical_apicid);
         void (*enable_apic_mode)(void);
-#ifdef CONFIG_X86_32
-        u32 (*phys_pkg_id)(u32 cpuid_apic, int index_msb);
-#else
-        unsigned int (*phys_pkg_id)(int index_msb);
-#endif
+        int (*phys_pkg_id)(int cpuid_apic, int index_msb);
 
         /*
          * When one of the next two hooks returns 1 the genapic