diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-09-14 08:19:08 -0400 |
| commit | 905ec87e93bc9e01b15c60035cd6a50c636cbaef (patch) | |
| tree | 46fd7618d6511611ffc19eb0dd4d7bc6b90a41c2 /arch/s390/kernel | |
| parent | 1d6ae775d7a948c9575658eb41184fd2e506c0df (diff) | |
| parent | 2f4ba45a75d6383b4a1201169a808ffea416ffa0 (diff) | |
Merge /spare/repo/linux-2.6/
Diffstat (limited to 'arch/s390/kernel')
| -rw-r--r-- | arch/s390/kernel/compat_linux.c | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/entry.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/entry64.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head.S | 2 | ||||
| -rw-r--r-- | arch/s390/kernel/head64.S | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index 18610cea03a2..ed877d0f27e6 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
| @@ -678,7 +678,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, size | |||
| 678 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); | 678 | ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count); |
| 679 | set_fs(old_fs); | 679 | set_fs(old_fs); |
| 680 | 680 | ||
| 681 | if (!ret && offset && put_user(of, offset)) | 681 | if (offset && put_user(of, offset)) |
| 682 | return -EFAULT; | 682 | return -EFAULT; |
| 683 | 683 | ||
| 684 | return ret; | 684 | return ret; |
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S index cbe7d6a2d02c..58fc7fbcb40e 100644 --- a/arch/s390/kernel/entry.S +++ b/arch/s390/kernel/entry.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <asm/errno.h> | 18 | #include <asm/errno.h> |
| 19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
| 20 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
| 21 | #include <asm/offsets.h> | 21 | #include <asm/asm-offsets.h> |
| 22 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | 24 | ||
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S index fb77b72ab262..d0c9ffaa25db 100644 --- a/arch/s390/kernel/entry64.S +++ b/arch/s390/kernel/entry64.S | |||
| @@ -18,7 +18,7 @@ | |||
| 18 | #include <asm/errno.h> | 18 | #include <asm/errno.h> |
| 19 | #include <asm/ptrace.h> | 19 | #include <asm/ptrace.h> |
| 20 | #include <asm/thread_info.h> | 20 | #include <asm/thread_info.h> |
| 21 | #include <asm/offsets.h> | 21 | #include <asm/asm-offsets.h> |
| 22 | #include <asm/unistd.h> | 22 | #include <asm/unistd.h> |
| 23 | #include <asm/page.h> | 23 | #include <asm/page.h> |
| 24 | 24 | ||
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S index 2710e66fefba..55654b6e16dc 100644 --- a/arch/s390/kernel/head.S +++ b/arch/s390/kernel/head.S | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/config.h> | 30 | #include <linux/config.h> |
| 31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
| 32 | #include <asm/lowcore.h> | 32 | #include <asm/lowcore.h> |
| 33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
| 34 | #include <asm/thread_info.h> | 34 | #include <asm/thread_info.h> |
| 35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
| 36 | 36 | ||
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S index 9a8263a153cb..c9ff0404c875 100644 --- a/arch/s390/kernel/head64.S +++ b/arch/s390/kernel/head64.S | |||
| @@ -30,7 +30,7 @@ | |||
| 30 | #include <linux/config.h> | 30 | #include <linux/config.h> |
| 31 | #include <asm/setup.h> | 31 | #include <asm/setup.h> |
| 32 | #include <asm/lowcore.h> | 32 | #include <asm/lowcore.h> |
| 33 | #include <asm/offsets.h> | 33 | #include <asm/asm-offsets.h> |
| 34 | #include <asm/thread_info.h> | 34 | #include <asm/thread_info.h> |
| 35 | #include <asm/page.h> | 35 | #include <asm/page.h> |
| 36 | 36 | ||