diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:49:27 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-10-12 06:49:27 -0400 |
| commit | 1389ac4b976abdc0555280dfc1aa2c3abcc19641 (patch) | |
| tree | 1ec51aa0b1e33201f6f4f3bebc657f9ec65f8539 /arch/x86/ia32 | |
| parent | 69e13ad56f9e2cd81c4f8bfd6267211c10c14c08 (diff) | |
| parent | fd048088306656824958e7783ffcee27e241b361 (diff) | |
Merge branch 'linus' into x86/signal
Conflicts:
arch/x86/kernel/signal_64.c
Diffstat (limited to 'arch/x86/ia32')
| -rw-r--r-- | arch/x86/ia32/sys_ia32.c | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/arch/x86/ia32/sys_ia32.c b/arch/x86/ia32/sys_ia32.c index d3c64088b981..beda4232ce69 100644 --- a/arch/x86/ia32/sys_ia32.c +++ b/arch/x86/ia32/sys_ia32.c | |||
| @@ -556,15 +556,6 @@ asmlinkage long sys32_rt_sigqueueinfo(int pid, int sig, | |||
| 556 | return ret; | 556 | return ret; |
| 557 | } | 557 | } |
| 558 | 558 | ||
| 559 | /* These are here just in case some old ia32 binary calls it. */ | ||
| 560 | asmlinkage long sys32_pause(void) | ||
| 561 | { | ||
| 562 | current->state = TASK_INTERRUPTIBLE; | ||
| 563 | schedule(); | ||
| 564 | return -ERESTARTNOHAND; | ||
| 565 | } | ||
| 566 | |||
| 567 | |||
| 568 | #ifdef CONFIG_SYSCTL_SYSCALL | 559 | #ifdef CONFIG_SYSCTL_SYSCALL |
| 569 | struct sysctl_ia32 { | 560 | struct sysctl_ia32 { |
| 570 | unsigned int name; | 561 | unsigned int name; |