Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6

Conflicts:

	include/asm-x86/statfs.h

1 files changed, 11 insertions, 2 deletions

diff --git a/arch/mips/kernel/proc.c b/arch/mips/kernel/proc.c
index 36f065398243..75bb1300dd7a 100644
--- a/arch/mips/kernel/proc.c
+++ b/arch/mips/kernel/proc.c
@@ -23,6 +23,7 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         unsigned int version = cpu_data[n].processor_id;
         unsigned int fp_vers = cpu_data[n].fpu_id;
         char fmt [64];
+        int i;
 
 #ifdef CONFIG_SMP
         if (!cpu_isset(n, cpu_online_map))
@@ -50,8 +51,16 @@ static int show_cpuinfo(struct seq_file *m, void *v)
         seq_printf(m, "tlb_entries\t\t: %d\n", cpu_data[n].tlbsize);
         seq_printf(m, "extra interrupt vector\t: %s\n",
                       cpu_has_divec ? "yes" : "no");
-        seq_printf(m, "hardware watchpoint\t: %s\n",
-                      cpu_has_watch ? "yes" : "no");
+        seq_printf(m, "hardware watchpoint\t: %s",
+                   cpu_has_watch ? "yes, " : "no\n");
+        if (cpu_has_watch) {
+                seq_printf(m, "count: %d, address/irw mask: [",
+                           cpu_data[n].watch_reg_count);
+                for (i = 0; i < cpu_data[n].watch_reg_count; i++)
+                        seq_printf(m, "%s0x%04x", i ? ", " : "" ,
+                                   cpu_data[n].watch_reg_masks[i]);
+                seq_printf(m, "]\n");
+        }
         seq_printf(m, "ASEs implemented\t:%s%s%s%s%s%s\n",
                       cpu_has_mips16 ? " mips16" : "",
                       cpu_has_mdmx ? " mdmx" : "",