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 --combined arch/x86/platform/uv/tlb_uv.c
index dbbdca5,933bea5..0f92173
--- 1/arch/x86/platform/uv/tlb_uv.c
--- 2/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@@ -1034,8 -1034,7 +1034,8 @@@ static int set_distrib_bits(struct cpum
   * globally purge translation cache of a virtual address or all TLB's
   * @cpumask: mask of all cpu's in which the address is to be removed
   * @mm: mm_struct containing virtual address range
 - * @va: virtual address to be removed (or TLB_FLUSH_ALL for all TLB's on cpu)
 + * @start: start virtual address to be removed from TLB
 + * @end: end virtual address to be remove from TLB
   * @cpu: the current cpu
   *
   * This is the entry point for initiating any UV global TLB shootdown.
@@@ -1057,7 -1056,7 +1057,7 @@@
   */
  const struct cpumask *uv_flush_tlb_others(const struct cpumask *cpumask,
                                struct mm_struct *mm, unsigned long start,
 -                              unsigned end, unsigned int cpu)
 +                              unsigned long end, unsigned int cpu)
  {
        int locals = 0;
        int remotes = 0;
@@@ -1114,10 -1113,7 +1114,10 @@@
  
        record_send_statistics(stat, locals, hubs, remotes, bau_desc);
  
 -      bau_desc->payload.address = start;
 +      if (!end || (end - start) <= PAGE_SIZE)
 +              bau_desc->payload.address = start;
 +      else
 +              bau_desc->payload.address = TLB_FLUSH_ALL;
        bau_desc->payload.sending_cpu = cpu;
        /*
         * uv_flush_send_and_wait returns 0 if all cpu's were messaged,
@@@ -1467,7 -1463,7 +1467,7 @@@ static ssize_t ptc_proc_write(struct fi
        }
  
        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 -1504,7 +1508,7 @@@ static int parse_tunables_write(struct 
        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;