Attachment #517832 for bug #646632

Lines 49-55 Link Here

(-)./arch/alpha/lib/ev67-strcat.S.orig (-1 / +1 lines)
49	addq $16, $3, $16 # E :	49	addq $16, $3, $16 # E :
50	/* Now do the append. */	50	/* Now do the append. */
51	mov $26, $23 # E :	51	mov $26, $23 # E :
52	br __stxcpy # L0 :	52	jmp $31, __stxcpy # L0 :
53		53
54	.end strcat	54	.end strcat
55	EXPORT_SYMBOL(strcat)	55	EXPORT_SYMBOL(strcat)

Lines 54-60 Link Here

(-)./arch/alpha/lib/ev67-strncat.S.orig (-1 / +1 lines)
54	$found: cttz $2, $3 # U0 :	54	$found: cttz $2, $3 # U0 :
55	addq $16, $3, $16 # E :	55	addq $16, $3, $16 # E :
56	nop # E :	56	nop # E :
57	bsr $23, __stxncpy # L0 :/* Now do the append. */	57	jsr $23, __stxncpy # L0 :/* Now do the append. */
58		58
59	/* Worry about the null termination. */	59	/* Worry about the null termination. */
60		60

Lines 48-54 Link Here

(-)./arch/alpha/lib/strcat.S.orig (-1 / +1 lines)
48	/* Now do the append. */	48	/* Now do the append. */
49		49
50	mov $26, $23	50	mov $26, $23
51	br __stxcpy	51	jmp $31, __stxcpy
52		52
53	.end strcat	53	.end strcat
54	EXPORT_SYMBOL(strcat);	54	EXPORT_SYMBOL(strcat);

Lines 18-24 Link Here

(-)./arch/alpha/lib/strcpy.S.orig (-1 / +1 lines)
18	mov $16, $0 # set up return value	18	mov $16, $0 # set up return value
19	mov $26, $23 # set up return address	19	mov $26, $23 # set up return address
20	unop	20	unop
21	br __stxcpy # do the copy	21	jmp $31, __stxcpy # do the copy
22		22
23	.end strcpy	23	.end strcpy
24	EXPORT_SYMBOL(strcpy)	24	EXPORT_SYMBOL(strcpy)

Lines 8-14 Link Here

(-)./arch/alpha/lib/strncpy.S.orig (-2 / +2 lines)
8	*	8	*
9	* Or, rather, if the kernel cared about that weird ANSI quirk. This	9	* Or, rather, if the kernel cared about that weird ANSI quirk. This
10	* version has cropped that bit o' nastiness as well as assuming that	10	* version has cropped that bit o' nastiness as well as assuming that
11	* __stxncpy is in range of a branch.	11	* __stxncpy is in range of a branch. Sometimes it is not so use jump.
12	*/	12	*/
13	#include <asm/export.h>	13	#include <asm/export.h>
14	.set noat	14	.set noat
Lines 26-32 Link Here
26	mov $16, $0 # set return value now	26	mov $16, $0 # set return value now
27	beq $18, $zerolen	27	beq $18, $zerolen
28	unop	28	unop
29	bsr $23, __stxncpy # do the work of the copy	29	jsr $23, __stxncpy # do the work of the copy
30		30
31	unop	31	unop
32	bne $18, $multiword # do we have full words left?	32	bne $18, $multiword # do we have full words left?




/* This little bit of silliness is to get the GP loaded for a function
   that ordinarily wouldn't.  Otherwise we could have it done by the macro
   directly, which can be optimized the linker.  */

#define __module_address(sym)		"r"(sym),
#define __module_call(ra, arg, sym)	"jsr $" #ra ",(%" #arg ")," #sym
#else
#define __module_address(sym)
#define __module_call(ra, arg, sym)	"bsr $" #ra "," #sym " !samegp"
#endif

extern void __copy_user(void);


Return to bug 646632

Lines 344-356 Link Here

(-)./arch/alpha/include/asm/uaccess.h.orig (-5 / +1 lines)
344	/* This little bit of silliness is to get the GP loaded for a function	344	/* This little bit of silliness is to get the GP loaded for a function
345	that ordinarily wouldn't. Otherwise we could have it done by the macro	345	that ordinarily wouldn't. Otherwise we could have it done by the macro
346	directly, which can be optimized the linker. */	346	directly, which can be optimized the linker. */
347	#ifdef MODULE	347
348	#define __module_address(sym) "r"(sym),	348	#define __module_address(sym) "r"(sym),
349	#define __module_call(ra, arg, sym) "jsr $" #ra ",(%" #arg ")," #sym	349	#define __module_call(ra, arg, sym) "jsr $" #ra ",(%" #arg ")," #sym
350	#else
351	#define __module_address(sym)
352	#define __module_call(ra, arg, sym) "bsr $" #ra "," #sym " !samegp"
353	#endif
354		350
355	extern void __copy_user(void);	351	extern void __copy_user(void);
356		352