Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] remove asm-ia64/bitops.h self-inclusion
[IA64] strcpy returns NULL pointer and not destination pointer

+6 -4
+6 -3
arch/ia64/lib/memcpy_mck.S
··· 6 6 * in1: source address 7 7 * in2: number of bytes to copy 8 8 * Output: 9 - * 0 if success, or number of byte NOT copied if error occurred. 9 + * for memcpy: return dest 10 + * for copy_user: return 0 if success, 11 + * or number of byte NOT copied if error occurred. 10 12 * 11 13 * Copyright (C) 2002 Intel Corp. 12 14 * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com> ··· 75 73 and r28=0x7,in0 76 74 and r29=0x7,in1 77 75 mov f6=f0 76 + mov retval=in0 78 77 br.cond.sptk .common_code 79 78 ;; 80 79 END(memcpy) ··· 87 84 mov f6=f1 88 85 mov saved_in0=in0 // save dest pointer 89 86 mov saved_in1=in1 // save src pointer 90 - mov saved_in2=in2 // save len 87 + mov retval=r0 // initialize return value 91 88 ;; 92 89 .common_code: 93 90 cmp.gt p15,p0=8,in2 // check for small size ··· 95 92 cmp.ne p14,p0=0,r29 // check src alignment 96 93 add src0=0,in1 97 94 sub r30=8,r28 // for .align_dest 98 - mov retval=r0 // initialize return value 95 + mov saved_in2=in2 // save len 99 96 ;; 100 97 add dst0=0,in0 101 98 add dst1=1,in0 // dest odd index
-1
include/asm-ia64/bitops.h
··· 11 11 12 12 #include <linux/compiler.h> 13 13 #include <linux/types.h> 14 - #include <asm/bitops.h> 15 14 #include <asm/intrinsics.h> 16 15 17 16 /**