From: Cyrill Gorcunov <gorcunov@gmail.com>
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>,
Thomas Gleixner <tglx@linutronix.de>
Cc: LKML <linux-kernel@vger.kernel.org>,
Harvey Harrison <harvey.harrison@gmail.com>,
Sam Ravnborg <sam@ravnborg.org>,
Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
Subject: [PATCH -tip] x86: headers - include linux/types.h instead of asm/types.h
Date: Tue, 13 Jan 2009 15:09:05 +0300 [thread overview]
Message-ID: <20090113120905.GB7682@localhost> (raw)
Impact: cleanup
'make headers_check' warns that linux/types.h is
preferred over asm/types.h. So be it.
Signed-off-by: Cyrill Gorcunov <gorcunov@openvz.org>
CC: Jaswinder Singh Rajput <jaswinderrajput@gmail.com>
CC: Sam Ravnborg <sam@ravnborg.org>
CC: Harvey Harrison <harvey.harrison@gmail.com>
---
arch/x86/include/asm/e820.h | 2 ++
arch/x86/include/asm/kvm.h | 2 +-
arch/x86/include/asm/mce.h | 2 +-
arch/x86/include/asm/mtrr.h | 1 +
arch/x86/include/asm/ptrace-abi.h | 2 +-
arch/x86/include/asm/sigcontext.h | 2 +-
arch/x86/include/asm/swab.h | 2 +-
7 files changed, 8 insertions(+), 5 deletions(-)
Index: linux-2.6.git/arch/x86/include/asm/e820.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/e820.h
+++ linux-2.6.git/arch/x86/include/asm/e820.h
@@ -1,5 +1,6 @@
#ifndef _ASM_X86_E820_H
#define _ASM_X86_E820_H
+
#define E820MAP 0x2d0 /* our map */
#define E820MAX 128 /* number of entries in E820MAP */
@@ -49,6 +50,7 @@
#define E820_RESERVED_KERN 128
#ifndef __ASSEMBLY__
+#include <linux/types.h>
struct e820entry {
__u64 addr; /* start of memory segment */
__u64 size; /* size of memory segment */
Index: linux-2.6.git/arch/x86/include/asm/kvm.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/kvm.h
+++ linux-2.6.git/arch/x86/include/asm/kvm.h
@@ -6,7 +6,7 @@
*
*/
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/ioctl.h>
/* Architectural interrupt line count. */
Index: linux-2.6.git/arch/x86/include/asm/mce.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/mce.h
+++ linux-2.6.git/arch/x86/include/asm/mce.h
@@ -4,7 +4,7 @@
#ifdef __x86_64__
#include <asm/ioctls.h>
-#include <asm/types.h>
+#include <linux/types.h>
/*
* Machine Check support for x86
Index: linux-2.6.git/arch/x86/include/asm/mtrr.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/mtrr.h
+++ linux-2.6.git/arch/x86/include/asm/mtrr.h
@@ -23,6 +23,7 @@
#ifndef _ASM_X86_MTRR_H
#define _ASM_X86_MTRR_H
+#include <linux/types.h>
#include <linux/ioctl.h>
#include <linux/errno.h>
Index: linux-2.6.git/arch/x86/include/asm/ptrace-abi.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/ptrace-abi.h
+++ linux-2.6.git/arch/x86/include/asm/ptrace-abi.h
@@ -83,7 +83,7 @@
#ifdef CONFIG_X86_PTRACE_BTS
#ifndef __ASSEMBLY__
-#include <asm/types.h>
+#include <linux/types.h>
/* configuration/status structure used in PTRACE_BTS_CONFIG and
PTRACE_BTS_STATUS commands.
Index: linux-2.6.git/arch/x86/include/asm/sigcontext.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/sigcontext.h
+++ linux-2.6.git/arch/x86/include/asm/sigcontext.h
@@ -2,7 +2,7 @@
#define _ASM_X86_SIGCONTEXT_H
#include <linux/compiler.h>
-#include <asm/types.h>
+#include <linux/types.h>
#define FP_XSTATE_MAGIC1 0x46505853U
#define FP_XSTATE_MAGIC2 0x46505845U
Index: linux-2.6.git/arch/x86/include/asm/swab.h
===================================================================
--- linux-2.6.git.orig/arch/x86/include/asm/swab.h
+++ linux-2.6.git/arch/x86/include/asm/swab.h
@@ -1,7 +1,7 @@
#ifndef _ASM_X86_SWAB_H
#define _ASM_X86_SWAB_H
-#include <asm/types.h>
+#include <linux/types.h>
#include <linux/compiler.h>
static inline __attribute_const__ __u32 __arch_swab32(__u32 val)
next reply other threads:[~2009-01-13 12:09 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-13 12:09 Cyrill Gorcunov [this message]
2009-01-13 12:57 ` [PATCH -tip] x86: headers - include linux/types.h instead of asm/types.h Cyrill Gorcunov
2009-01-13 12:59 ` Ingo Molnar
2009-01-13 13:10 ` Cyrill Gorcunov
2009-01-13 13:25 ` Cyrill Gorcunov
2009-01-13 14:45 ` Ingo Molnar
2009-01-13 14:49 ` Cyrill Gorcunov
2009-01-13 15:06 ` Cyrill Gorcunov
2009-01-13 13:08 ` Jaswinder Singh Rajput
2009-01-13 13:12 ` Cyrill Gorcunov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090113120905.GB7682@localhost \
--to=gorcunov@gmail.com \
--cc=harvey.harrison@gmail.com \
--cc=hpa@zytor.com \
--cc=jaswinderrajput@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@elte.hu \
--cc=sam@ravnborg.org \
--cc=tglx@linutronix.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox