aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@cs.washington.edu>2006-12-06 20:14:11 -0500
committerAndi Kleen <andi@basil.nowhere.org>2006-12-06 20:14:11 -0500
commit86bd58bf4c383fde4e99b83ce917b091a072040d (patch)
tree804c479579771d0b01d38cd1b286a64db8d70d43
parent6df0532eef0187c293d3ab1d4c158f92e8f24f8a (diff)
[PATCH] x86-64: Remove unused GET_APIC_VERSION call from clear_local_APIC
Remove unused GET_APIC_VERSION call from clear_local_APIC() and __setup_APIC_LVTT(). Reported by D Binderman <dcb314@hotmail.com>. Cc: Andi Kleen <ak@suse.de> Cc: Ingo Molnar <mingo@redhat.com> Signed-off-by: David Rientjes <rientjes@cs.washington.edu> Signed-off-by: Andi Kleen <ak@suse.de>
-rw-r--r--arch/x86_64/kernel/apic.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index f0b00d8731cb..124b2d27b4ac 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -140,7 +140,6 @@ void clear_local_APIC(void)
140 apic_write(APIC_LVTERR, APIC_LVT_MASKED); 140 apic_write(APIC_LVTERR, APIC_LVT_MASKED);
141 if (maxlvt >= 4) 141 if (maxlvt >= 4)
142 apic_write(APIC_LVTPC, APIC_LVT_MASKED); 142 apic_write(APIC_LVTPC, APIC_LVT_MASKED);
143 v = GET_APIC_VERSION(apic_read(APIC_LVR));
144 apic_write(APIC_ESR, 0); 143 apic_write(APIC_ESR, 0);
145 apic_read(APIC_ESR); 144 apic_read(APIC_ESR);
146} 145}
@@ -736,10 +735,9 @@ void __init init_apic_mappings(void)
736 735
737static void __setup_APIC_LVTT(unsigned int clocks) 736static void __setup_APIC_LVTT(unsigned int clocks)
738{ 737{
739 unsigned int lvtt_value, tmp_value, ver; 738 unsigned int lvtt_value, tmp_value;
740 int cpu = smp_processor_id(); 739 int cpu = smp_processor_id();
741 740
742 ver = GET_APIC_VERSION(apic_read(APIC_LVR));
743 lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR; 741 lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR;
744 742
745 if (cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask)) 743 if (cpu_isset(cpu, timer_interrupt_broadcast_ipi_mask))