Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755733AbZGAOBT (ORCPT ); Wed, 1 Jul 2009 10:01:19 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754087AbZGAOBJ (ORCPT ); Wed, 1 Jul 2009 10:01:09 -0400 Received: from hera.kernel.org ([140.211.167.34]:43278 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752720AbZGAOBI (ORCPT ); Wed, 1 Jul 2009 10:01:08 -0400 Date: Wed, 1 Jul 2009 14:00:40 GMT From: tip-bot for Jaswinder Singh Rajput To: linux-tip-commits@vger.kernel.org Cc: linux-kernel@vger.kernel.org, hpa@zytor.com, mingo@redhat.com, jaswinder@kernel.org, tglx@linutronix.de, mingo@elte.hu, jaswinderrajput@gmail.com Reply-To: mingo@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, jaswinder@kernel.org, tglx@linutronix.de, jaswinderrajput@gmail.com, mingo@elte.hu In-Reply-To: <1246450778.6940.8.camel@hpdv5.satnam> References: <1246450778.6940.8.camel@hpdv5.satnam> Subject: [tip:x86/urgent] x86: Remove double declaration of MSR_P6_EVNTSEL0 and MSR_P6_EVNTSEL1 Message-ID: Git-Commit-ID: 44973998a111dfda09b952aa0f27cad326a97793 X-Mailer: tip-git-log-daemon MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.0 (hera.kernel.org [127.0.0.1]); Wed, 01 Jul 2009 14:00:41 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1501 Lines: 40 Commit-ID: 44973998a111dfda09b952aa0f27cad326a97793 Gitweb: http://git.kernel.org/tip/44973998a111dfda09b952aa0f27cad326a97793 Author: Jaswinder Singh Rajput AuthorDate: Wed, 1 Jul 2009 17:49:38 +0530 Committer: Ingo Molnar 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 LKML-Reference: <1246450778.6940.8.camel@hpdv5.satnam> Signed-off-by: Ingo Molnar --- 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@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/