diff options
author | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
---|---|---|
committer | nbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2006-12-14 16:41:33 +0000 |
commit | c92885c466d11dc3b8e2837a8be1fd3b6b7e2e01 (patch) | |
tree | 1a38200fe1a33cb965650ca687167175938fbedd /target/linux/uml-2.6/patches/01-no_syscallx | |
parent | a8131d463830012d225fa1032222c3a38b168778 (diff) |
Upgrade to Linux 2.6.19
- Includes large parts of the patch from #1021 by dpalffy
- Includes RB532 NAND driver changes by n0-1
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@5789 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/uml-2.6/patches/01-no_syscallx')
-rw-r--r-- | target/linux/uml-2.6/patches/01-no_syscallx | 71 |
1 files changed, 0 insertions, 71 deletions
diff --git a/target/linux/uml-2.6/patches/01-no_syscallx b/target/linux/uml-2.6/patches/01-no_syscallx deleted file mode 100644 index 6b542d0ea..000000000 --- a/target/linux/uml-2.6/patches/01-no_syscallx +++ /dev/null @@ -1,71 +0,0 @@ -# Since the syscallx macros seem to be under threat, this patch stops -# using them, using syscall instead. - -Index: linux-2.6.17/arch/um/os-Linux/process.c -=================================================================== ---- linux-2.6.17.orig/arch/um/os-Linux/process.c 2006-09-20 11:15:08.000000000 -0400 -+++ linux-2.6.17/arch/um/os-Linux/process.c 2006-09-20 13:35:24.000000000 -0400 -@@ -140,11 +140,9 @@ void os_usr1_process(int pid) - * syscalls, and also breaks with clone(), which does not unshare the TLS. - */ - --inline _syscall0(pid_t, getpid) -- - int os_getpid(void) - { -- return(getpid()); -+ return syscall(__NR_getpid); - } - - int os_getpgrp(void) -Index: linux-2.6.17/arch/um/os-Linux/sys-i386/tls.c -=================================================================== ---- linux-2.6.17.orig/arch/um/os-Linux/sys-i386/tls.c 2006-06-18 13:49:35.000000000 -0400 -+++ linux-2.6.17/arch/um/os-Linux/sys-i386/tls.c 2006-09-20 13:37:27.000000000 -0400 -@@ -3,8 +3,6 @@ - #include "sysdep/tls.h" - #include "user_util.h" - --static _syscall1(int, get_thread_area, user_desc_t *, u_info); -- - /* Checks whether host supports TLS, and sets *tls_min according to the value - * valid on the host. - * i386 host have it == 6; x86_64 host have it == 12, for i386 emulation. */ -@@ -17,7 +15,7 @@ void check_host_supports_tls(int *suppor - user_desc_t info; - info.entry_number = val[i]; - -- if (get_thread_area(&info) == 0) { -+ if(syscall(__NR_get_thread_area, &info) == 0){ - *tls_min = val[i]; - *supports_tls = 1; - return; -Index: linux-2.6.17/arch/um/os-Linux/tls.c -=================================================================== ---- linux-2.6.17.orig/arch/um/os-Linux/tls.c 2006-08-15 21:59:56.000000000 -0400 -+++ linux-2.6.17/arch/um/os-Linux/tls.c 2006-09-20 13:37:14.000000000 -0400 -@@ -48,14 +48,11 @@ int os_get_thread_area(user_desc_t *info - #ifdef UML_CONFIG_MODE_TT - #include "linux/unistd.h" - --static _syscall1(int, get_thread_area, user_desc_t *, u_info); --static _syscall1(int, set_thread_area, user_desc_t *, u_info); -- - int do_set_thread_area_tt(user_desc_t *info) - { - int ret; - -- ret = set_thread_area(info); -+ ret = syscall(__NR_set_thread_area, info); - if (ret < 0) { - ret = -errno; - } -@@ -66,7 +63,7 @@ int do_get_thread_area_tt(user_desc_t *i - { - int ret; - -- ret = get_thread_area(info); -+ ret = syscall(__NR_get_thread_area, info); - if (ret < 0) { - ret = -errno; - } |