diff options
Diffstat (limited to 'arch/x86/mm/mmio-mod.c')
| -rw-r--r-- | arch/x86/mm/mmio-mod.c | 11 | 
1 files changed, 4 insertions, 7 deletions
diff --git a/arch/x86/mm/mmio-mod.c b/arch/x86/mm/mmio-mod.c index 3adff7dcc14..0057a7accfb 100644 --- a/arch/x86/mm/mmio-mod.c +++ b/arch/x86/mm/mmio-mod.c @@ -29,12 +29,11 @@  #include <linux/slab.h>  #include <linux/uaccess.h>  #include <linux/io.h> -#include <linux/version.h>  #include <linux/kallsyms.h>  #include <asm/pgtable.h>  #include <linux/mmiotrace.h>  #include <asm/e820.h> /* for ISA_START_ADDRESS */ -#include <asm/atomic.h> +#include <linux/atomic.h>  #include <linux/percpu.h>  #include <linux/cpu.h> @@ -76,8 +75,8 @@ static LIST_HEAD(trace_list);		/* struct remap_trace */  /* module parameters */  static unsigned long	filter_offset; -static int		nommiotrace; -static int		trace_pc; +static bool		nommiotrace; +static bool		trace_pc;  module_param(filter_offset, ulong, 0);  module_param(nommiotrace, bool, 0); @@ -411,9 +410,7 @@ out:  		pr_warning("multiple CPUs still online, may miss events.\n");  } -/* __ref because leave_uniprocessor calls cpu_up which is __cpuinit, -   but this whole function is ifdefed CONFIG_HOTPLUG_CPU */ -static void __ref leave_uniprocessor(void) +static void leave_uniprocessor(void)  {  	int cpu;  	int err;  | 
