diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /arch/s390/kernel/compat_linux.c | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'arch/s390/kernel/compat_linux.c')
| -rw-r--r-- | arch/s390/kernel/compat_linux.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/s390/kernel/compat_linux.c b/arch/s390/kernel/compat_linux.c index d7f22226fc4e..98e246dc0233 100644 --- a/arch/s390/kernel/compat_linux.c +++ b/arch/s390/kernel/compat_linux.c | |||
| @@ -608,14 +608,6 @@ asmlinkage long sys32_settimeofday(struct compat_timeval __user *tv, struct time | |||
| 608 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); | 608 | return do_sys_settimeofday(tv ? &kts : NULL, tz ? &ktz : NULL); |
| 609 | } | 609 | } |
| 610 | 610 | ||
| 611 | /* These are here just in case some old sparc32 binary calls it. */ | ||
| 612 | asmlinkage long sys32_pause(void) | ||
| 613 | { | ||
| 614 | current->state = TASK_INTERRUPTIBLE; | ||
| 615 | schedule(); | ||
| 616 | return -ERESTARTNOHAND; | ||
| 617 | } | ||
| 618 | |||
| 619 | asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf, | 611 | asmlinkage long sys32_pread64(unsigned int fd, char __user *ubuf, |
| 620 | size_t count, u32 poshi, u32 poslo) | 612 | size_t count, u32 poshi, u32 poslo) |
| 621 | { | 613 | { |