Merge branches 'x86-platform-for-linus' and 'x86-uv-for-linus' of git://git.kernel...

Pull x86 platform changes from Ingo Molnar:
 "A handful of numachip APIC driver updates/fixes, and two small SGI/UV
  fixes"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: numachip: APIC driver cleanups
  x86: numachip: Elide self-IPI ICR polling
  x86: numachip: Fix 16-bit APIC ID truncation

* 'x86-uv-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86: UV BAU: Increase maximum CPUs per socket/hub
  x86: UV BAU: Avoid NULL pointer reference in ptc_seq_show

diff --combined arch/x86/platform/uv/tlb_uv.c
index ab4062c5953c7e99cb8d4a8ebc67f9d8361cfa4d,3968d67d366bc714231e2f4b2ba864eada762fe6,570b1b14375b1c1482a7467def3e3bbda0a679f3..994798548b1ad57288e4b51c01422d3dad70ff7f
--- 1/arch/x86/platform/uv/tlb_uv.c
--- 2/arch/x86/platform/uv/tlb_uv.c
--- 3/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@@@ -1367,21 -1367,23 -1367,27 +1367,25 @@@@ static int ptc_seq_show(struct seq_fil
   
        cpu = *(loff_t *)data;
        if (!cpu) {
 --             seq_printf(file,
 --              "# cpu bauoff sent stime self locals remotes ncpus localhub ");
 --             seq_printf(file,
 --                     "remotehub numuvhubs numuvhubs16 numuvhubs8 ");
 --             seq_printf(file,
 --                     "numuvhubs4 numuvhubs2 numuvhubs1 dto snacks retries ");
 --             seq_printf(file,
 --                     "rok resetp resett giveup sto bz throt disable ");
 --             seq_printf(file,
 --                     "enable wars warshw warwaits enters ipidis plugged ");
 --             seq_printf(file,
 --                     "ipiover glim cong swack recv rtime all one mult ");
 --             seq_printf(file,
 --                     "none retry canc nocan reset rcan\n");
 ++             seq_puts(file,
 ++                      "# cpu bauoff sent stime self locals remotes ncpus localhub ");
 ++             seq_puts(file, "remotehub numuvhubs numuvhubs16 numuvhubs8 ");
 ++             seq_puts(file,
 ++                      "numuvhubs4 numuvhubs2 numuvhubs1 dto snacks retries ");
 ++             seq_puts(file,
 ++                      "rok resetp resett giveup sto bz throt disable ");
 ++             seq_puts(file,
 ++                      "enable wars warshw warwaits enters ipidis plugged ");
 ++             seq_puts(file,
 ++                      "ipiover glim cong swack recv rtime all one mult ");
 ++             seq_puts(file, "none retry canc nocan reset rcan\n");
        }
        if (cpu < num_possible_cpus() && cpu_online(cpu)) {
                bcp = &per_cpu(bau_control, cpu);
++              if (bcp->nobau) {
++                      seq_printf(file, "cpu %d bau disabled\n", cpu);
++                      return 0;
++              }
                stat = bcp->statp;
                /* source side statistics */
                seq_printf(file,