korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2024-12-13 14:04:05 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
* '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
This commit is contained in:
Linus Torvalds 2006-05-08 09:28:35 -07:00
commit abfd305718
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/ia64/lib/memcpy_mck.S
View File

@ -6,7 +6,9 @@
* in1: source address * in1: source address
* in2: number of bytes to copy * in2: number of bytes to copy
* Output: * Output:
* 0 if success, or number of byte NOT copied if error occurred. * for memcpy: return dest
* for copy_user: return 0 if success,
* or number of byte NOT copied if error occurred.
* *
* Copyright (C) 2002 Intel Corp. * Copyright (C) 2002 Intel Corp.
* Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com> * Copyright (C) 2002 Ken Chen <kenneth.w.chen@intel.com>
@ -73,6 +75,7 @@ GLOBAL_ENTRY(memcpy)
and r28=0x7,in0 and r28=0x7,in0
and r29=0x7,in1 and r29=0x7,in1
mov f6=f0 mov f6=f0
mov retval=in0
br.cond.sptk .common_code br.cond.sptk .common_code
;; ;;
END(memcpy) END(memcpy)
@ -84,7 +87,7 @@ GLOBAL_ENTRY(__copy_user)
mov f6=f1 mov f6=f1
mov saved_in0=in0 // save dest pointer mov saved_in0=in0 // save dest pointer
mov saved_in1=in1 // save src pointer mov saved_in1=in1 // save src pointer
mov saved_in2=in2 // save len mov retval=r0 // initialize return value
;; ;;
.common_code: .common_code:
cmp.gt p15,p0=8,in2 // check for small size cmp.gt p15,p0=8,in2 // check for small size
@ -92,7 +95,7 @@ GLOBAL_ENTRY(__copy_user)
cmp.ne p14,p0=0,r29 // check src alignment cmp.ne p14,p0=0,r29 // check src alignment
add src0=0,in1 add src0=0,in1
sub r30=8,r28 // for .align_dest sub r30=8,r28 // for .align_dest
mov retval=r0 // initialize return value mov saved_in2=in2 // save len
;; ;;
add dst0=0,in0 add dst0=0,in0
add dst1=1,in0 // dest odd index add dst1=1,in0 // dest odd index

1
include/asm-ia64/bitops.h
View File

@ -11,7 +11,6 @@
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/types.h> #include <linux/types.h>
#include <asm/bitops.h>
#include <asm/intrinsics.h> #include <asm/intrinsics.h>
/** /**