* [PATCH -tip RESEND] x86: msr-index.h remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1
@ 2009-07-01 12:19 Jaswinder Singh Rajput
2009-07-01 14:00 ` [tip:x86/urgent] x86: Remove " tip-bot for Jaswinder Singh Rajput
0 siblings, 1 reply; 2+ messages in thread
From: Jaswinder Singh Rajput @ 2009-07-01 12:19 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, x86 maintainers, LKML
MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1 is already declared in msr-index.h.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
---
arch/x86/include/asm/msr-index.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 4d58d04..35ec37a 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -239,10 +239,6 @@
#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << 38)
#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << 39)
-/* Intel Model 6 */
-#define MSR_P6_EVNTSEL0 0x00000186
-#define MSR_P6_EVNTSEL1 0x00000187
-
/* P4/Xeon+ specific */
#define MSR_IA32_MCG_EAX 0x00000180
#define MSR_IA32_MCG_EBX 0x00000181
--
1.6.0.6
^ permalink raw reply [flat|nested] 2+ messages in thread
* [tip:x86/urgent] x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1
2009-07-01 12:19 [PATCH -tip RESEND] x86: msr-index.h remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1 Jaswinder Singh Rajput
@ 2009-07-01 14:00 ` tip-bot for Jaswinder Singh Rajput
0 siblings, 0 replies; 2+ messages in thread
From: tip-bot for Jaswinder Singh Rajput @ 2009-07-01 14:00 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, jaswinder, tglx, mingo, jaswinderrajput
Commit-ID: 44973998a111dfda09b952aa0f27cad326a97793
Gitweb: http://git.kernel.org/tip/44973998a111dfda09b952aa0f27cad326a97793
Author: Jaswinder Singh Rajput <jaswinder@kernel.org>
AuthorDate: Wed, 1 Jul 2009 17:49:38 +0530
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Wed, 1 Jul 2009 15:23:43 +0200
x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1
MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1 is already declared in msr-index.h.
Signed-off-by: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
LKML-Reference: <1246450778.6940.8.camel@hpdv5.satnam>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/include/asm/msr-index.h | 4 ----
1 files changed, 0 insertions(+), 4 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 1692fb5..6be7fc2 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -246,10 +246,6 @@
#define MSR_IA32_MISC_ENABLE_TURBO_DISABLE (1ULL << 38)
#define MSR_IA32_MISC_ENABLE_IP_PREF_DISABLE (1ULL << 39)
-/* Intel Model 6 */
-#define MSR_P6_EVNTSEL0 0x00000186
-#define MSR_P6_EVNTSEL1 0x00000187
-
/* P4/Xeon+ specific */
#define MSR_IA32_MCG_EAX 0x00000180
#define MSR_IA32_MCG_EBX 0x00000181
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-07-01 14:01 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-07-01 12:19 [PATCH -tip RESEND] x86: msr-index.h remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1 Jaswinder Singh Rajput
2009-07-01 14:00 ` [tip:x86/urgent] x86: Remove " tip-bot for Jaswinder Singh Rajput
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®