From ccc98ce7ac11c537ad308ccd4805b522edf5e25a Mon Sep 17 00:00:00 2001
From: Joe Perches <joe@perches.com>
Date: Sun, 9 Mar 2008 12:35:00 -0700
Subject: [PATCH] --- yaml --- r: 88760 b: refs/heads/master c:
 e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9 h: refs/heads/master v: v3

---
 [refs]                              | 2 +-
 trunk/arch/x86/kernel/reboot.c      | 1 -
 trunk/include/asm-x86/elf.h         | 5 ++---
 trunk/include/asm-x86/posix_types.h | 8 +-------
 trunk/include/asm-x86/processor.h   | 3 +--
 trunk/include/asm-x86/unistd.h      | 8 +-------
 6 files changed, 6 insertions(+), 21 deletions(-)

diff --git a/[refs] b/[refs]
index fa77cb5615ec..31ebc7a8b3dc 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 537d916066f66de18dbca79adf82933cd12d2a36
+refs/heads/master: e40c0fe6b0b5dd16aec3c0dad311d36b19d78fd9
diff --git a/trunk/arch/x86/kernel/reboot.c b/trunk/arch/x86/kernel/reboot.c
index 484c4a80d38a..66cd4afc1e57 100644
--- a/trunk/arch/x86/kernel/reboot.c
+++ b/trunk/arch/x86/kernel/reboot.c
@@ -1,5 +1,4 @@
 #include <linux/module.h>
-#include <linux/init.h>
 #include <linux/reboot.h>
 #include <linux/init.h>
 #include <linux/pm.h>
diff --git a/trunk/include/asm-x86/elf.h b/trunk/include/asm-x86/elf.h
index fb62f9941e38..77325646e2f4 100644
--- a/trunk/include/asm-x86/elf.h
+++ b/trunk/include/asm-x86/elf.h
@@ -82,8 +82,9 @@ extern unsigned int vdso_enabled;
 #define elf_check_arch_ia32(x) \
 	(((x)->e_machine == EM_386) || ((x)->e_machine == EM_486))
 
-#ifdef CONFIG_X86_32
 #include <asm/processor.h>
+
+#ifdef CONFIG_X86_32
 #include <asm/system.h>		/* for savesegment */
 #include <asm/desc.h>
 
@@ -135,8 +136,6 @@ extern unsigned int vdso_enabled;
 
 #else /* CONFIG_X86_32 */
 
-#include <asm/processor.h>
-
 /*
  * This is used to ensure we don't load something for the wrong architecture.
  */
diff --git a/trunk/include/asm-x86/posix_types.h b/trunk/include/asm-x86/posix_types.h
index bb7133dc155d..fe312a5ba204 100644
--- a/trunk/include/asm-x86/posix_types.h
+++ b/trunk/include/asm-x86/posix_types.h
@@ -1,11 +1,5 @@
 #ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "posix_types_32.h"
-# else
-#  include "posix_types_64.h"
-# endif
-#else
-# ifdef __i386__
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "posix_types_32.h"
 # else
 #  include "posix_types_64.h"
diff --git a/trunk/include/asm-x86/processor.h b/trunk/include/asm-x86/processor.h
index d590da88c0df..cc0268395ea2 100644
--- a/trunk/include/asm-x86/processor.h
+++ b/trunk/include/asm-x86/processor.h
@@ -3,8 +3,7 @@
 
 #include <asm/processor-flags.h>
 
-/* migration helpers, for KVM - will be removed in 2.6.25: */
-#include <asm/vm86.h>
+/* migration helper, for KVM - will be removed in 2.6.25: */
 #define Xgt_desc_struct	desc_ptr
 
 /* Forward declaration, a strange C thing */
diff --git a/trunk/include/asm-x86/unistd.h b/trunk/include/asm-x86/unistd.h
index 2a58ed3e51d8..effc7ad8e12f 100644
--- a/trunk/include/asm-x86/unistd.h
+++ b/trunk/include/asm-x86/unistd.h
@@ -1,11 +1,5 @@
 #ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "unistd_32.h"
-# else
-#  include "unistd_64.h"
-# endif
-#else
-# ifdef __i386__
+# if defined(CONFIG_X86_32) || defined(__i386__)
 #  include "unistd_32.h"
 # else
 #  include "unistd_64.h"