aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/apic_64.c
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-16 23:21:55 +0400
committerIngo Molnar <mingo@elte.hu>2008-08-17 14:41:50 +0200
commitcf9768d7514d59b3179a886c4a47908d72e6cf76 (patch)
treecfb927d5dfc7db6cddf09cbfbf2f741cc8174be9 /arch/x86/kernel/apic_64.c
parentx86: apic - unify lapic_is_integrated (diff)
downloadlinux-dev-cf9768d7514d59b3179a886c4a47908d72e6cf76.tar.xz
linux-dev-cf9768d7514d59b3179a886c4a47908d72e6cf76.zip
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.c2
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)
icr2 = apic_read(APIC_ICR2);
icr1 = apic_read(APIC_ICR);
- return (icr1 | ((u64)icr2 << 32));
+ return icr1 | ((u64)icr2 << 32);
}
static struct apic_ops xapic_ops = {