Skip to contentSkip to conversation

Kill unused crap in putuser.S

PATCH Pavel Machek 1 participant 1 message Jun 29, 2001

lore
Share & tools
lore
#0 lore raw

Hi!

Yup. Whole putuser.S is unused. Either it should be killed [as my patch suggests], or ... well ... it should be used.

Please either apply or say how you'd like this to be fixed.
Pavel
PS: Tested on i386, both make and make modules works ok.

arch/i386/lib/putuser.S +0 -71
@@ -1,71 +0,0 @@
-/*
- * __put_user functions.
- *
- * (C) Copyright 1998 Linus Torvalds
- *
- * These functions have a non-standard call interface
- * to make them more efficient.
- */
-
-/*
- * __put_user_X
- *
- * Inputs:	%eax contains the address
- *		%edx contains the value
- *
- * Outputs:	%eax is error code (0 or -EFAULT)
- *		%ecx is corrupted (will contain "current_task").
- *
- * These functions should not modify any other registers,
- * as they get called from within inline assembly.
- */
-
-addr_limit = 12
-
-.text
-.align 4
-.globl __put_user_1
-__put_user_1:
-	movl %esp,%ecx
-	andl $0xffffe000,%ecx
-	cmpl addr_limit(%ecx),%eax
-	jae bad_put_user
-1:	movb %dl,(%eax)
-	xorl %eax,%eax
-	ret
-
-.align 4
-.globl __put_user_2
-__put_user_2:
-	addl $1,%eax
-	movl %esp,%ecx
-	jc bad_put_user
-	andl $0xffffe000,%ecx
-	cmpl addr_limit(%ecx),%eax
-	jae bad_put_user
-2:	movw %dx,-1(%eax)
-	xorl %eax,%eax
-	ret
-
-.align 4
-.globl __put_user_4
-__put_user_4:
-	addl $3,%eax
-	movl %esp,%ecx
-	jc bad_put_user
-	andl $0xffffe000,%ecx
-	cmpl addr_limit(%ecx),%eax
-	jae bad_put_user
-3:	movl %edx,-3(%eax)
-	xorl %eax,%eax
-	ret
-
-bad_put_user:
-	movl $-14,%eax
-	ret
-
-.section __ex_table,"a"
-	.long 1b,bad_put_user
-	.long 2b,bad_put_user
-	.long 3b,bad_put_user
-.previous
arch/i386/kernel/i386_ksyms.c +0 -3
@@ -90,9 +90,6 @@
 EXPORT_SYMBOL_NOVERS(__get_user_1);
 EXPORT_SYMBOL_NOVERS(__get_user_2);
 EXPORT_SYMBOL_NOVERS(__get_user_4);
-EXPORT_SYMBOL_NOVERS(__put_user_1);
-EXPORT_SYMBOL_NOVERS(__put_user_2);
-EXPORT_SYMBOL_NOVERS(__put_user_4);
 
 EXPORT_SYMBOL(strtok);
 EXPORT_SYMBOL(strpbrk);
include/asm-i386/uaccess.h +0 -6
@@ -129,12 +129,6 @@
 
 extern void __put_user_bad(void);
 
-#define __put_user_x(size,ret,x,ptr)					\
-	__asm__ __volatile__("call __put_user_" #size			\
-		:"=a" (ret)						\
-		:"0" (ptr),"d" (x)					\
-		:"cx")
-
 #define put_user(x,ptr)							\
   __put_user_check((__typeof__(*(ptr)))(x),(ptr),sizeof(*(ptr)))
 
Signature · 2 lines
I'm [email protected]. "In my country we have almost anarchy and I don't care."
Panos Katsaloulis describing me w.r.t. patents at [email protected]