diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-16 15:21:55 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-08-17 08:41:50 -0400 |
commit | cf9768d7514d59b3179a886c4a47908d72e6cf76 (patch) | |
tree | cfb927d5dfc7db6cddf09cbfbf2f741cc8174be9 /arch/x86/kernel/apic_64.c | |
parent | 9c803869f5f5e3d7ad94b2926474b2882e30073b (diff) |
x86: apic - unify xapic_icr_read
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_64.c')
-rw-r--r-- | arch/x86/kernel/apic_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c index 18c0b8cd2376..5e0738131e58 100644 --- a/arch/x86/kernel/apic_64.c +++ b/arch/x86/kernel/apic_64.c | |||
@@ -174,7 +174,7 @@ u64 xapic_icr_read(void) | |||
174 | icr2 = apic_read(APIC_ICR2); | 174 | icr2 = apic_read(APIC_ICR2); |
175 | icr1 = apic_read(APIC_ICR); | 175 | icr1 = apic_read(APIC_ICR); |
176 | 176 | ||
177 | return (icr1 | ((u64)icr2 << 32)); | 177 | return icr1 | ((u64)icr2 << 32); |
178 | } | 178 | } |
179 | 179 | ||
180 | static struct apic_ops xapic_ops = { | 180 | static struct apic_ops xapic_ops = { |