diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-28 07:31:22 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-28 17:20:26 -0500 |
| commit | d4c9a9f3d416cfa1f5ffbe09d864d069467fe693 (patch) | |
| tree | 647f78d7d845734fdab95c8a05a20b0a80015709 /arch/x86/kernel/genx2apic_phys.c | |
| parent | b0b20e5a3a6615ae750804523aeedd32911bb9d6 (diff) | |
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/kernel/genx2apic_phys.c')
| -rw-r--r-- | arch/x86/kernel/genx2apic_phys.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/genx2apic_phys.c b/arch/x86/kernel/genx2apic_phys.c index 7177a1110f0d..2cb6f49e4c50 100644 --- a/arch/x86/kernel/genx2apic_phys.c +++ b/arch/x86/kernel/genx2apic_phys.c | |||
| @@ -156,7 +156,7 @@ static unsigned long set_apic_id(unsigned int id) | |||
| 156 | return x; | 156 | return x; |
| 157 | } | 157 | } |
| 158 | 158 | ||
| 159 | static unsigned int phys_pkg_id(int index_msb) | 159 | static int x2apic_phys_pkg_id(int initial_apicid, int index_msb) |
| 160 | { | 160 | { |
| 161 | return current_cpu_data.initial_apicid >> index_msb; | 161 | return current_cpu_data.initial_apicid >> index_msb; |
| 162 | } | 162 | } |
| @@ -200,7 +200,7 @@ struct genapic apic_x2apic_phys = { | |||
| 200 | .setup_portio_remap = NULL, | 200 | .setup_portio_remap = NULL, |
| 201 | .check_phys_apicid_present = default_check_phys_apicid_present, | 201 | .check_phys_apicid_present = default_check_phys_apicid_present, |
| 202 | .enable_apic_mode = NULL, | 202 | .enable_apic_mode = NULL, |
| 203 | .phys_pkg_id = phys_pkg_id, | 203 | .phys_pkg_id = x2apic_phys_pkg_id, |
| 204 | .mps_oem_check = NULL, | 204 | .mps_oem_check = NULL, |
| 205 | 205 | ||
| 206 | .get_apic_id = get_apic_id, | 206 | .get_apic_id = get_apic_id, |