Changeset 3375bd4 in mainline for uspace/lib/c/arch/ia32/src/syscall.S

Timestamp:

2011-05-17T07:44:17Z (14 years ago)

Author:

Vojtech Horky <vojtechhorky@…>

Branches:

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

Children:

04c418d, 2586860, 5e6e50b

Parents:

72cd53d (diff), 0d8a304 (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

Conflicts:
kernel/generic/src/console/console.c

size of klog, taken upstream

uspace/app/klog/klog.c

taken upstream (upstream fixed the broken output on huge load)

uspace/app/tester/Makefile
uspace/app/tester/tester.c
uspace/app/tester/tester.h

merged without problems

uspace/lib/c/include/as.h

merged without problems (upstream use bare declarations)

Also needed to fix some missing includes.

File:

• uspace/lib/c/arch/ia32/src/syscall.S (modified) (3 diffs)

uspace/lib/c/arch/ia32/src/syscall.S

@@ -32 +32 @@
 __syscall_fast_func:
         .long __syscall_slow
+        .size __syscall_fast_func, . - __syscall_fast_func
 
 .text
@@ -71 +72 @@
  */
 .global __syscall_fast
+        .type __syscall_fast, @function
+
 __syscall_fast:
         pushl %ebx
@@ -95 +98 @@
         popl %ebx
         ret
+
+        .size __syscall_fast, . - __syscall_fast