From f2846200d36d8a5cdd1d9593193df980a800c50f Mon Sep 17 00:00:00 2001
From: Jacob Shin <jacob.w.shin@gmail.com>
Date: Mon, 26 Jun 2006 13:58:47 +0200
Subject: [PATCH] --- yaml --- r: 30502 b: refs/heads/master c:
 17fc14ff1bdbc393e1cf4f6fd1e1e53d72ab9fe5 h: refs/heads/master v: v3

---
 [refs]                          |  2 +-
 trunk/arch/x86_64/kernel/apic.c | 10 ++++------
 trunk/include/asm-x86_64/apic.h | 11 ++++++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 181d2fbc8498..f8bec9e276c3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c38bfdc85aae0c6d1458269c0e063c2f4a116711
+refs/heads/master: 17fc14ff1bdbc393e1cf4f6fd1e1e53d72ab9fe5
diff --git a/trunk/arch/x86_64/kernel/apic.c b/trunk/arch/x86_64/kernel/apic.c
index 53fc17d894e8..396e125cb212 100644
--- a/trunk/arch/x86_64/kernel/apic.c
+++ b/trunk/arch/x86_64/kernel/apic.c
@@ -909,15 +909,13 @@ int setup_profiling_timer(unsigned int multiplier)
 	return -EINVAL;
 }
 
-#ifdef CONFIG_X86_MCE_AMD
-void setup_threshold_lvt(unsigned long lvt_off)
+void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
+			    unsigned char msg_type, unsigned char mask)
 {
-	unsigned int v = 0;
-	unsigned long reg = (lvt_off << 4) + 0x500;
-	v |= THRESHOLD_APIC_VECTOR;
+	unsigned long reg = (lvt_off << 4) + K8_APIC_EXT_LVT_BASE;
+	unsigned int  v   = (mask << 16) | (msg_type << 8) | vector;
 	apic_write(reg, v);
 }
-#endif /* CONFIG_X86_MCE_AMD */
 
 #undef APIC_DIVISOR
 
diff --git a/trunk/include/asm-x86_64/apic.h b/trunk/include/asm-x86_64/apic.h
index c9e6c2501a48..9d43ac8519bf 100644
--- a/trunk/include/asm-x86_64/apic.h
+++ b/trunk/include/asm-x86_64/apic.h
@@ -84,9 +84,18 @@ extern void disable_APIC_timer(void);
 extern void enable_APIC_timer(void);
 extern void clustered_apic_check(void);
 
+extern void setup_APIC_extened_lvt(unsigned char lvt_off, unsigned char vector,
+				   unsigned char msg_type, unsigned char mask);
+
+#define K8_APIC_EXT_LVT_BASE    0x500
+#define K8_APIC_EXT_INT_MSG_FIX 0x0
+#define K8_APIC_EXT_INT_MSG_SMI 0x2
+#define K8_APIC_EXT_INT_MSG_NMI 0x4
+#define K8_APIC_EXT_INT_MSG_EXT 0x7
+#define K8_APIC_EXT_LVT_ENTRY_THRESHOLD    0
+
 extern int disable_timer_pin_1;
 
-extern void setup_threshold_lvt(unsigned long lvt_off);
 
 void smp_send_timer_broadcast_ipi(void);
 void switch_APIC_timer_to_ipi(void *cpumask);