Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1764644AbZFQIlO (ORCPT ); Wed, 17 Jun 2009 04:41:14 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1762387AbZFQIlD (ORCPT ); Wed, 17 Jun 2009 04:41:03 -0400 Received: from hera.kernel.org ([140.211.167.34]:45588 "EHLO hera.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754458AbZFQIlB (ORCPT ); Wed, 17 Jun 2009 04:41:01 -0400 Subject: [PATCH -tip] x86: msr.h linux/types is only required for __KERNEL__ From: Jaswinder Singh Rajput To: "H. Peter Anvin" , Ingo Molnar , x86 maintainers , LKML Content-Type: text/plain Date: Wed, 17 Jun 2009 14:11:10 +0530 Message-Id: <1245228070.2662.1.camel@ht.satnam> Mime-Version: 1.0 X-Mailer: Evolution 2.24.5 (2.24.5-1.fc10) Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1195 Lines: 46 is only required for __KERNEL__ as whole file is covered with it Also fixed some spacing issues for usr/include/asm-x86/msr.h Signed-off-by: Jaswinder Singh Rajput --- arch/x86/include/asm/msr.h | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) diff --git a/arch/x86/include/asm/msr.h b/arch/x86/include/asm/msr.h index 2260376..48ad9d2 100644 --- a/arch/x86/include/asm/msr.h +++ b/arch/x86/include/asm/msr.h @@ -3,13 +3,10 @@ #include -#ifndef __ASSEMBLY__ -# include -#endif - #ifdef __KERNEL__ #ifndef __ASSEMBLY__ +#include #include #include #include @@ -264,6 +261,4 @@ static inline int wrmsr_safe_on_cpu(unsigned int cpu, u32 msr_no, u32 l, u32 h) #endif /* CONFIG_SMP */ #endif /* __ASSEMBLY__ */ #endif /* __KERNEL__ */ - - #endif /* _ASM_X86_MSR_H */ -- 1.6.0.6 -- 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/