diff options
| -rw-r--r-- | arch/x86/mm/kmmio.c | 4 | ||||
| -rw-r--r-- | arch/x86/mm/mmio-mod.c | 7 | ||||
| -rw-r--r-- | arch/x86/mm/testmmiotrace.c | 2 | ||||
| -rw-r--r-- | include/linux/mmiotrace.h | 6 |
4 files changed, 7 insertions, 12 deletions
diff --git a/arch/x86/mm/kmmio.c b/arch/x86/mm/kmmio.c index 3ad27b8504a..6a92d9111b6 100644 --- a/arch/x86/mm/kmmio.c +++ b/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/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 1f77d853203..a8d2a0019da 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/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/arch/x86/mm/testmmiotrace.c b/arch/x86/mm/testmmiotrace.c index cfa60b227c8..d877c5b423e 100644 --- a/arch/x86/mm/testmmiotrace.c +++ b/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/include/linux/mmiotrace.h b/include/linux/mmiotrace.h index dd6b64b160f..de8e91258da 100644 --- a/include/linux/mmiotrace.h +++ b/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 */ |