patch-2.3.40 linux/arch/arm/lib/uaccess.S

• Lines: 66
• Date: Thu Jan 13 13:30:31 2000
• Orig file: v2.3.39/linux/arch/arm/lib/uaccess.S
• Orig date: Fri Oct 22 13:21:44 1999

diff -u --recursive --new-file v2.3.39/linux/arch/arm/lib/uaccess.S linux/arch/arm/lib/uaccess.S
@@ -12,21 +12,13 @@
 #include <asm/errno.h>
 
 		.text
-#ifdef ENTRY
+
 #define USER(x...)					\
 9999:		x;					\
 		.section __ex_table,"a";		\
 		.align	3;				\
 		.long	9999b,9001f;			\
 		.previous
-#else
-#define USER(x...)					\
-		x
-#define ENTRY(x...)					\
-		.globl	_##x;				\
-_##x:
-#define TESTING
-#endif
 
 #define PAGE_SHIFT 12
 
@@ -285,12 +277,10 @@
 USER(		strgtbt	r3, [r0], #1)			@ May fault
 		b	.c2u_finished
 
-#ifndef TESTING
 		.section .fixup,"ax"
 		.align	0
 9001:		LOADREGS(fd,sp!, {r0, r4 - r7, pc})
 		.previous
-#endif
 
 /* Prototype: unsigned long __arch_copy_from_user(void *to,const void *from,unsigned long n);
  * Purpose  : copy a block from user memory to kernel memory
@@ -546,7 +536,6 @@
 		strgtb	r3, [r0], #1
 		b	.cfu_finished
 
-#ifndef TESTING
 		.section .fixup,"ax"
 		.align	0
 		/* We took an exception.  Zero out the buffer and pretend no
@@ -557,7 +546,6 @@
 		blne	SYMBOL_NAME(__memzero)
 		LOADREGS(fd,sp!, {r0, r4 - r7, pc})
 		.previous
-#endif
 
 /* Prototype: int __arch_clear_user(void *addr, size_t sz)
  * Purpose  : clear some user memory
@@ -592,7 +580,6 @@
 		mov	r0, #0
 		LOADREGS(fd,sp!, {r1, pc})
 
-#ifndef TESTING
 		.section .fixup,"ax"
 		.align	0
 9001:		LOADREGS(fd,sp!, {r0, pc})
@@ -656,5 +643,4 @@
 		.previous
 
 		.align
-#endif