diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-03-03 12:27:25 +0100 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-03-03 12:27:25 +0100 |
| commit | c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a (patch) | |
| tree | 99b48ef0f5217fddc0aa897d9e60d95ace7da6ff /arch/s390/kernel/compat_wrapper.S | |
| parent | [CIFS] Upate cifs change log (diff) | |
| parent | [PATCH] reiserfs: do not check if unsigned < 0 (diff) | |
| download | linux-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.tar.xz linux-c6ee60b7c8bbc78e3b1776b2820a7e7f95f8996a.zip | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'arch/s390/kernel/compat_wrapper.S')
| -rw-r--r-- | arch/s390/kernel/compat_wrapper.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/kernel/compat_wrapper.S b/arch/s390/kernel/compat_wrapper.S index 615964cca15f..50e80138e7ad 100644 --- a/arch/s390/kernel/compat_wrapper.S +++ b/arch/s390/kernel/compat_wrapper.S @@ -1552,6 +1552,7 @@ sys_linkat_wrapper: llgtr %r3,%r3 # const char * lgfr %r4,%r4 # int llgtr %r5,%r5 # const char * + lgfr %r6,%r6 # int jg sys_linkat .globl sys_symlinkat_wrapper |