From 06e09d8656bdaafe75c52f3d13310f25360b40ea Mon Sep 17 00:00:00 2001
From: Ralf Baechle <ralf@linux-mips.org>
Date: Wed, 3 May 2006 02:27:40 +0100
Subject: [PATCH] --- yaml --- r: 27059 b: refs/heads/master c:
 235a9d3eee9a9588c17d39efff8373d0513549b5 h: refs/heads/master i:   27057:
 72b632549fb76c40ce1156df838e9aaa7fccbee4   27055:
 b66b89c5ce8d75367a14ac30dc4e4758f331b149 v: v3

---
 [refs]                           |  2 +-
 trunk/arch/mips/kernel/syscall.c | 24 ------------------------
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/[refs] b/[refs]
index 9ad8fa7b715d..926c67a0368e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: c620953c32d301c2a7bc73f9f780301e110b7d7c
+refs/heads/master: 235a9d3eee9a9588c17d39efff8373d0513549b5
diff --git a/trunk/arch/mips/kernel/syscall.c b/trunk/arch/mips/kernel/syscall.c
index 2aeaa2fd4b32..8f4fdd94dbd0 100644
--- a/trunk/arch/mips/kernel/syscall.c
+++ b/trunk/arch/mips/kernel/syscall.c
@@ -280,27 +280,6 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
 	char	__user *name;
 
 	switch(cmd) {
-	case SETNAME: {
-		char nodename[__NEW_UTS_LEN + 1];
-
-		if (!capable(CAP_SYS_ADMIN))
-			return -EPERM;
-
-		name = (char __user *) arg1;
-
-		len = strncpy_from_user(nodename, name, __NEW_UTS_LEN);
-		if (len < 0)
-			return -EFAULT;
-
-		down_write(&uts_sem);
-		strncpy(system_utsname.nodename, nodename, len);
-		nodename[__NEW_UTS_LEN] = '\0';
-		strlcpy(system_utsname.nodename, nodename,
-		        sizeof(system_utsname.nodename));
-		up_write(&uts_sem);
-		return 0;
-	}
-
 	case MIPS_ATOMIC_SET:
 		printk(KERN_CRIT "How did I get here?\n");
 		return -EINVAL;
@@ -313,9 +292,6 @@ asmlinkage int _sys_sysmips(int cmd, long arg1, int arg2, int arg3)
 	case FLUSH_CACHE:
 		__flush_cache_all();
 		return 0;
-
-	case MIPS_RDNVRAM:
-		return -EIO;
 	}
 
 	return -EINVAL;