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

[pandora-kernel.git] / arch / x86 / platform / uv / tlb_uv.c

diff --git a/arch/x86/platform/uv/tlb_uv.c b/arch/x86/platform/uv/tlb_uv.c
index 3968d67..9947985 100644 (file)
--- a/arch/x86/platform/uv/tlb_uv.c
+++ b/arch/x86/platform/uv/tlb_uv.c
@@ -1367,23 +1367,25 @@ static int ptc_seq_show(struct seq_file *file, void *data)
 
        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,