linux-kernel - [tip:x86/urgent] x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <tip-44973998a111dfda09b952aa0f27cad326a97793@git.kernel.org>
Date:	Wed, 1 Jul 2009 14:00:40 GMT
From:	tip-bot for Jaswinder Singh Rajput <jaswinder@...nel.org>
To:	linux-tip-commits@...r.kernel.org
Cc:	linux-kernel@...r.kernel.org, hpa@...or.com, mingo@...hat.com,
	jaswinder@...nel.org, tglx@...utronix.de, mingo@...e.hu,
	jaswinderrajput@...il.com
Subject: [tip:x86/urgent] x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1

Commit-ID:  44973998a111dfda09b952aa0f27cad326a97793
Gitweb:     http://git.kernel.org/tip/44973998a111dfda09b952aa0f27cad326a97793
Author:     Jaswinder Singh Rajput <jaswinder@...nel.org>
AuthorDate: Wed, 1 Jul 2009 17:49:38 +0530
Committer:  Ingo Molnar <mingo@...e.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@...il.com>
LKML-Reference: <1246450778.6940.8.camel@...v5.satnam>
Signed-off-by: Ingo Molnar <mingo@...e.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
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/