gru: bug fixes for GRU exception handling

Bug fixes for GRU exception handling.  Additional fields from the CBR must
be returned to the user to allow the user to correctly diagnose GRU
exceptions.

Handle endcase in TFH TLB miss handling.  Verify that TFH actually
indicates a pending exception.

Signed-off-by: Jack Steiner <steiner@sgi.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 3 insertions, 2 deletions

diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c
index ee74821b171c..c46c1c5f0c73 100644
--- a/drivers/misc/sgi-gru/gruprocfs.c
+++ b/drivers/misc/sgi-gru/gruprocfs.c
@@ -84,6 +84,8 @@ static int statistics_show(struct seq_file *s, void *p)
         printstat(s, tlb_dropin_fail_range_active);
         printstat(s, tlb_dropin_fail_idle);
         printstat(s, tlb_dropin_fail_fmm);
+        printstat(s, tlb_dropin_fail_no_exception);
+        printstat(s, tlb_dropin_fail_no_exception_war);
         printstat(s, mmu_invalidate_range);
         printstat(s, mmu_invalidate_page);
         printstat(s, mmu_clear_flush_young);
@@ -158,8 +160,7 @@ static ssize_t options_write(struct file *file, const char __user *userbuf,
         unsigned long val;
         char buf[80];
 
-        if (copy_from_user
-            (buf, userbuf, count < sizeof(buf) ? count : sizeof(buf)))
+        if (strncpy_from_user(buf, userbuf, sizeof(buf) - 1) < 0)
                 return -EFAULT;
         buf[count - 1] = '\0';
         if (!strict_strtoul(buf, 10, &val))