Changeset 8b655705 in mainline for kernel/arch/ia32/src/asm.S

Timestamp:

2011-04-15T19:38:07Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

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

Children:

9dd730d1

Parents:

6b9e85b (diff), b2fb47f (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 mainline changes.

File:

• kernel/arch/ia32/src/asm.S (modified) (3 diffs)

kernel/arch/ia32/src/asm.S

@@ -38 +38 @@
 .global paging_on
 .global enable_l_apic_in_msr
-.global memsetb
-.global memsetw
-.global memcpy
 .global memcpy_from_uspace
 .global memcpy_from_uspace_failover_address
@@ -47 +44 @@
 .global early_putchar
 
-/* Wrapper for generic memsetb */
-memsetb:
-        jmp _memsetb
-
-/* Wrapper for generic memsetw */
-memsetw:
-        jmp _memsetw
-
 #define MEMCPY_DST   4
 #define MEMCPY_SRC   8
@@ -74 +63 @@
  *
  */
-memcpy:
 memcpy_from_uspace:
 memcpy_to_uspace: