summaryrefslogtreecommitdiff
path: root/arch/x86/include/asm/genapic.h
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2009-01-28 15:31:22 +0300
committerIngo Molnar <mingo@elte.hu>2009-01-29 01:20:26 +0300
commitd4c9a9f3d416cfa1f5ffbe09d864d069467fe693 (patch)
tree647f78d7d845734fdab95c8a05a20b0a80015709 /arch/x86/include/asm/genapic.h
parentb0b20e5a3a6615ae750804523aeedd32911bb9d6 (diff)
downloadlinux-d4c9a9f3d416cfa1f5ffbe09d864d069467fe693.tar.xz
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>
Diffstat (limited to 'arch/x86/include/asm/genapic.h')
-rw-r--r--arch/x86/include/asm/genapic.h6
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