From ad2e69eaca9956b27960cc1a20123206b9b919af Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pq@iki.fi>
Date: Mon, 12 May 2008 21:21:03 +0200
Subject: [PATCH] --- yaml --- r: 100614 b: refs/heads/master c:
 970e6fa03885f32cc43e42cb08c73a5f54cd8bd9 h: refs/heads/master v: v3

---
 [refs]                            | 2 +-
 trunk/arch/x86/mm/kmmio.c         | 4 ++--
 trunk/arch/x86/mm/mmio-mod.c      | 7 +++----
 trunk/arch/x86/mm/testmmiotrace.c | 2 +-
 trunk/include/linux/mmiotrace.h   | 6 +-----
 5 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/[refs] b/[refs]
index 27a426d05ab7..a2e94a8ec0fe 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6f6f394d9ca61fcc73ecfd2f2bf58e92dc1ab269
+refs/heads/master: 970e6fa03885f32cc43e42cb08c73a5f54cd8bd9
diff --git a/trunk/arch/x86/mm/kmmio.c b/trunk/arch/x86/mm/kmmio.c
index 3ad27b8504a5..6a92d9111b64 100644
--- a/trunk/arch/x86/mm/kmmio.c
+++ b/trunk/arch/x86/mm/kmmio.c
@@ -17,10 +17,10 @@
 #include <linux/percpu.h>
 #include <linux/kdebug.h>
 #include <linux/mutex.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <asm/cacheflush.h>
 #include <asm/tlbflush.h>
-#include <asm/errno.h>
+#include <linux/errno.h>
 #include <asm/debugreg.h>
 #include <linux/mmiotrace.h>
 
diff --git a/trunk/arch/x86/mm/mmio-mod.c b/trunk/arch/x86/mm/mmio-mod.c
index 1f77d8532037..a8d2a0019da4 100644
--- a/trunk/arch/x86/mm/mmio-mod.c
+++ b/trunk/arch/x86/mm/mmio-mod.c
@@ -24,7 +24,7 @@
 #include <linux/module.h>
 #include <linux/debugfs.h>
 #include <linux/uaccess.h>
-#include <asm/io.h>
+#include <linux/io.h>
 #include <linux/version.h>
 #include <linux/kallsyms.h>
 #include <asm/pgtable.h>
@@ -418,11 +418,10 @@ static void enter_uniprocessor(void)
 
 	for_each_cpu_mask(cpu, downed_cpus) {
 		err = cpu_down(cpu);
-		if (!err) {
+		if (!err)
 			pr_info(NAME "CPU%d is down.\n", cpu);
-		} else {
+		else
 			pr_err(NAME "Error taking CPU%d down: %d\n", cpu, err);
-		}
 	}
 	if (num_online_cpus() > 1)
 		pr_warning(NAME "multiple CPUs still online, "
diff --git a/trunk/arch/x86/mm/testmmiotrace.c b/trunk/arch/x86/mm/testmmiotrace.c
index cfa60b227c8d..d877c5b423ef 100644
--- a/trunk/arch/x86/mm/testmmiotrace.c
+++ b/trunk/arch/x86/mm/testmmiotrace.c
@@ -2,7 +2,7 @@
  * Written by Pekka Paalanen, 2008 <pq@iki.fi>
  */
 #include <linux/module.h>
-#include <asm/io.h>
+#include <linux/io.h>
 
 #define MODULE_NAME "testmmiotrace"
 
diff --git a/trunk/include/linux/mmiotrace.h b/trunk/include/linux/mmiotrace.h
index dd6b64b160fc..de8e91258da7 100644
--- a/trunk/include/linux/mmiotrace.h
+++ b/trunk/include/linux/mmiotrace.h
@@ -1,9 +1,7 @@
 #ifndef MMIOTRACE_H
 #define MMIOTRACE_H
 
-#include <asm/types.h>
-
-#ifdef __KERNEL__
+#include <linux/types.h>
 
 #include <linux/list.h>
 
@@ -84,6 +82,4 @@ extern void disable_mmiotrace(void);
 extern void mmio_trace_rw(struct mmiotrace_rw *rw);
 extern void mmio_trace_mapping(struct mmiotrace_map *map);
 
-#endif /* __KERNEL__ */
-
 #endif /* MMIOTRACE_H */