Changeset 48d4231 in mainline for kernel/arch/ia64/src/asm.S

Timestamp:

2011-03-30T19:44:49Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

ecb107b

Parents:

f62468c (diff), 27bdfa5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge development/ changes

File:

• kernel/arch/ia64/src/asm.S (modified) (4 diffs)

kernel/arch/ia64/src/asm.S

@@ -30 +30 @@
 
 .text
-.global memcpy
 .global memcpy_from_uspace
 .global memcpy_to_uspace
@@ -39 +38 @@
  *
  * This memcpy() has been taken from the assembler output of
- * the generic _memcpy() and modified to have the failover part.
+ * a plain C implementation of memcpy() modified to have the
+ * failover part.
  *
  * @param in0 Destination address.
@@ -46 +46 @@
  *
  */
-memcpy:
 memcpy_from_uspace:
 memcpy_to_uspace:
@@ -141 +140 @@
         br.ret.sptk.many rp
 
-.global memsetb
-memsetb:
-        br _memsetb
-
-.global memsetw
-memsetw:
-        br _memsetw
-
 .global cpu_halt
 cpu_halt: