From cf82372f8e2caa664ba210e183f8d0f019e53868 Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Fri, 30 Sep 2005 01:51:21 +0100
Subject: [PATCH] --- yaml --- r: 11239 b: refs/heads/master c:
 b288f135872b651ebf6cd1565d0709a5e31997f7 h: refs/heads/master i:   11237:
 447951f6033de0fdad198b8749fcd1466b3355d5   11235:
 b9d7bd438aaa76b827610e9d0b94871e2eb46377   11231:
 8f18da4f713b90b187c00dd0a8d1fe0e41d35c1f v: v3

---
 [refs]                                         |  2 +-
 trunk/arch/mips/kernel/ioctl32.c               |  6 ------
 trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c | 13 ++++++++-----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index f2decfe5758d..e2ddab61468f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ea3d710fe572f0af4d242701973f7363b2146429
+refs/heads/master: b288f135872b651ebf6cd1565d0709a5e31997f7
diff --git a/trunk/arch/mips/kernel/ioctl32.c b/trunk/arch/mips/kernel/ioctl32.c
index c069719ff0d8..ed9b2da510be 100644
--- a/trunk/arch/mips/kernel/ioctl32.c
+++ b/trunk/arch/mips/kernel/ioctl32.c
@@ -41,12 +41,6 @@ IOCTL_TABLE_START
 #define DECLARES
 #include "compat_ioctl.c"
 
-#ifdef CONFIG_SIBYTE_TBPROF
-COMPATIBLE_IOCTL(SBPROF_ZBSTART)
-COMPATIBLE_IOCTL(SBPROF_ZBSTOP)
-COMPATIBLE_IOCTL(SBPROF_ZBWAITFULL)
-#endif /* CONFIG_SIBYTE_TBPROF */
-
 /*HANDLE_IOCTL(RTC_IRQP_READ, w_long)
 COMPATIBLE_IOCTL(RTC_IRQP_SET)
 HANDLE_IOCTL(RTC_EPOCH_READ, w_long)
diff --git a/trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c b/trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c
index e4dfeb52dcec..992e0d8dbb67 100644
--- a/trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c
+++ b/trunk/arch/mips/sibyte/sb1250/bcm1250_tbprof.c
@@ -28,6 +28,7 @@
 #include <linux/fs.h>
 #include <linux/errno.h>
 #include <linux/reboot.h>
+#include <linux/smp_lock.h>
 #include <linux/wait.h>
 #include <asm/uaccess.h>
 #include <asm/io.h>
@@ -343,13 +344,13 @@ static ssize_t sbprof_tb_read(struct file *filp, char *buf,
 	return count;
 }
 
-static int sbprof_tb_ioctl(struct inode *inode,
-			   struct file *filp,
-			   unsigned int command,
-			   unsigned long arg)
+static long sbprof_tb_ioctl(struct file *filp,
+			    unsigned int command,
+			    unsigned long arg)
 {
 	int error = 0;
 
+	lock_kernel();
 	switch (command) {
 	case SBPROF_ZBSTART:
 		error = sbprof_zbprof_start(filp);
@@ -368,6 +369,7 @@ static int sbprof_tb_ioctl(struct inode *inode,
 		error = -EINVAL;
 		break;
 	}
+	unlock_kernel();
 
 	return error;
 }
@@ -377,7 +379,8 @@ static struct file_operations sbprof_tb_fops = {
 	.open		= sbprof_tb_open,
 	.release	= sbprof_tb_release,
 	.read		= sbprof_tb_read,
-	.ioctl		= sbprof_tb_ioctl,
+	.unlocked_ioctl	= sbprof_tb_ioctl,
+	.compat_ioctl	= sbprof_tb_ioctl,
 	.mmap		= NULL,
 };