patch-2.4.0-test6 linux/arch/sparc64/solaris/ioctl.c

• Lines: 52
• Date: Fri Aug 4 18:16:11 2000
• Orig file: v2.4.0-test5/linux/arch/sparc64/solaris/ioctl.c
• Orig date: Wed Dec 29 13:13:15 1999

diff -u --recursive --new-file v2.4.0-test5/linux/arch/sparc64/solaris/ioctl.c linux/arch/sparc64/solaris/ioctl.c
@@ -1,4 +1,4 @@
-/* $Id: ioctl.c,v 1.14 1999/09/22 09:28:50 davem Exp $
+/* $Id: ioctl.c,v 1.15 2000/07/28 12:15:02 davem Exp $
  * ioctl.c: Solaris ioctl emulation.
  *
  * Copyright (C) 1997 Jakub Jelinek (jj@sunsite.mff.cuni.cz)
@@ -31,9 +31,6 @@
 #include "conv.h"
 #include "socksys.h"
 
-extern char *getname32(u32 filename);
-#define putname32 putname
-
 extern asmlinkage int sys_ioctl(unsigned int fd, unsigned int cmd, 
 	unsigned long arg);
 extern asmlinkage int sys32_ioctl(unsigned int fd, unsigned int cmd,
@@ -486,7 +483,7 @@
 		return -ENOSYS;
 	case 2: /* I_PUSH */
         {
-		p = getname32 (arg);
+		p = getname ((char *)A(arg));
 		if (IS_ERR (p))
 			return PTR_ERR(p);
                 ret = -EINVAL;
@@ -503,7 +500,7 @@
                                 break;
                         }
                 }
-		putname32 (p);
+		putname (p);
 		return ret;
         }
 	case 3: /* I_POP */
@@ -546,7 +543,7 @@
 	case 11: /* I_FIND */
         {
                 int i;
-		p = getname32 (arg);
+		p = getname ((char *)A(arg));
 		if (IS_ERR (p))
 			return PTR_ERR(p);
                 ret = 0;
@@ -557,7 +554,7 @@
                                 break;
                         } 
                 }
-		putname32 (p);
+		putname (p);
 		return ret;
         }
 	case 19: /* I_SWROPT */