Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull x86 cleanup patches from Ingo Molnar:
 "Misc smaller cleanups"

* 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: ptrace.c only needs export.h and not the full module.h
  x86, apb_timer: remove unused variable percpu_timer
  um: don't compare a pointer to 0
  arch/x86/platform/uv: use ARRAY_SIZE where possible

diff --git a/arch/x86/kernel/apb_timer.c b/arch/x86/kernel/apb_timer.c
index afdc3f756dea0d0a1e4f460e1c3fad7eb782577b..cc74fd0c90f24e319f1a35421ab91b314eb28ebd 100644 (file)
--- a/arch/x86/kernel/apb_timer.c
+++ b/arch/x86/kernel/apb_timer.c
@@ -311,7 +311,6 @@ void __init apbt_time_init(void)
 #ifdef CONFIG_SMP
        int i;
        struct sfi_timer_table_entry *p_mtmr;
-       unsigned int percpu_timer;
        struct apbt_dev *adev;
 #endif
 
@@ -346,13 +345,10 @@ void __init apbt_time_init(void)
                return;
        }
        pr_debug("%s: %d CPUs online\n", __func__, num_online_cpus());
-       if (num_possible_cpus() <= sfi_mtimer_num) {
-               percpu_timer = 1;
+       if (num_possible_cpus() <= sfi_mtimer_num)
                apbt_num_timers_used = num_possible_cpus();
-       } else {
-               percpu_timer = 0;
+       else
                apbt_num_timers_used = 1;
-       }
        pr_debug("%s: %d APB timers used\n", __func__, apbt_num_timers_used);
 
        /* here we set up per CPU timer data structure */

diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
index b629bbe0d9bdeee5a416a8a6390167e595cf6036..29a8120e6fe88a88012490a51130be8b89ea2193 100644 (file)
--- a/arch/x86/kernel/ptrace.c
+++ b/arch/x86/kernel/ptrace.c
@@ -22,7 +22,7 @@
 #include <linux/perf_event.h>
 #include <linux/hw_breakpoint.h>
 #include <linux/rcupdate.h>
-#include <linux/module.h>
+#include <linux/export.h>
 #include <linux/context_tracking.h>
 
 #include <asm/uaccess.h>

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index dbbdca5f508c45bdfb34395aeeb42e500e9f1f1f..0f92173a12b6ee1a1d5512c867585cd1ee07fc12 100644 (file)
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1467,7 +1467,7 @@ static ssize_t ptc_proc_write(struct file *file, const char __user *user,
        }
 
        if (input_arg == 0) {
-               elements = sizeof(stat_description)/sizeof(*stat_description);
+               elements = ARRAY_SIZE(stat_description);
                printk(KERN_DEBUG "# cpu:      cpu number\n");
                printk(KERN_DEBUG "Sender statistics:\n");
                for (i = 0; i < elements; i++)
@@ -1508,7 +1508,7 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
        char *q;
        int cnt = 0;
        int val;
-       int e = sizeof(tunables) / sizeof(*tunables);
+       int e = ARRAY_SIZE(tunables);
 
        p = instr + strspn(instr, WHITESPACE);
        q = p;

diff --git a/arch/x86/um/fault.c b/arch/x86/um/fault.c
index 8784ab30d91b5504932701ca31cdbbd0476135f6..84ac7f7b0257d6f1398cd41a7043fad25b73dc76 100644 (file)
--- a/arch/x86/um/fault.c
+++ b/arch/x86/um/fault.c
@@ -20,7 +20,7 @@ int arch_fixup(unsigned long address, struct uml_pt_regs *regs)
        const struct exception_table_entry *fixup;
 
        fixup = search_exception_tables(address);
-       if (fixup != 0) {
+       if (fixup) {
                UPT_IP(regs) = fixup->fixup;
                return 1;
        }