PPC32: add support for restarting syscalls with ERESTART_RESTARTBLOCK

diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index 61699032a866707eea8ab92a0f38b5544913fd85..3338c4ddee761a50677e13aff33713971d1c8536 100644 (file)
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -1056,7 +1056,7 @@ SYSCALL(waitpid)
        .data
        .align 4
 _GLOBAL(sys_call_table)
-       .long sys_ni_syscall    /* 0  -  old "setup()" system call */
+       .long sys_restart_syscall /* 0 */
        .long sys_exit
        .long ppc_fork
        .long sys_read

diff --git a/arch/ppc/kernel/signal.c b/arch/ppc/kernel/signal.c
index cd4d110bc3157a5883a297f2b10bab203092f688..fddae70728fdd5264c7f601f4fd0374500b5fce0 100644 (file)
--- a/arch/ppc/kernel/signal.c
+++ b/arch/ppc/kernel/signal.c
@@ -393,8 +393,12 @@ handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
 
        if (TRAP(regs) == 0x0C00 /* System Call! */
            && ((int)regs->result == -ERESTARTNOHAND ||
+               (int)regs->result == -ERESTART_RESTARTBLOCK ||
                ((int)regs->result == -ERESTARTSYS &&
                 !(ka->sa.sa_flags & SA_RESTART)))) {
+               if ((int)regs->result == -ERESTART_RESTARTBLOCK)
+                       current_thread_info()->restart_block.fn
+                               = do_no_restart_syscall;
                regs->result = -EINTR;
                regs->gpr[3] = EINTR;
                regs->ccr |= 0x10000000;
@@ -494,13 +498,18 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
                handle_signal(signr, &info, oldset, regs, &newsp, frame);
        }
 
-       if (TRAP(regs) == 0x0C00 /* System Call! */ &&
-           ((int)regs->result == -ERESTARTNOHAND ||
-            (int)regs->result == -ERESTARTSYS ||
-            (int)regs->result == -ERESTARTNOINTR)) {
-               regs->gpr[3] = regs->orig_gpr3;
-               regs->nip -= 4;         /* Back up & retry system call */
-               regs->result = 0;
+       if (TRAP(regs) == 0x0C00) {     /* System Call! */
+               if ((int)regs->result == -ERESTARTNOHAND ||
+                   (int)regs->result == -ERESTARTSYS ||
+                   (int)regs->result == -ERESTARTNOINTR) {
+                       regs->gpr[3] = regs->orig_gpr3;
+                       regs->nip -= 4; /* Back up & retry system call */
+                       regs->result = 0;
+               } else if ((int)regs->result == -ERESTART_RESTARTBLOCK) {
+                       regs->gpr[0] = __NR_restart_syscall;
+                       regs->nip -= 4;
+                       regs->result = 0;
+               }
        }
 
        if (newsp == frame)

diff --git a/include/asm-ppc/errno.h b/include/asm-ppc/errno.h
index f328ba4705f872ace704e2812b4cbf91f61fe7fb..19f20bd41ae6184e4851fbf638f05c25de19a612 100644 (file)
--- a/include/asm-ppc/errno.h
+++ b/include/asm-ppc/errno.h
@@ -6,12 +6,6 @@
 #undef EDEADLOCK
 #define        EDEADLOCK       58      /* File locking deadlock error */
 
-/* Should never be seen by user programs */
-#define ERESTARTSYS    512
-#define ERESTARTNOINTR 513
-#define ERESTARTNOHAND 514     /* restart if no handler.. */
-#define ENOIOCTLCMD    515     /* No ioctl command */
-
-#define _LAST_ERRNO    515
+#define _LAST_ERRNO    516
 
 #endif

diff --git a/include/asm-ppc/thread_info.h b/include/asm-ppc/thread_info.h
index a89f707e903cbb17d248dd4df16c0883bf96de6f..5ee1cf139c9e8b2ce72f0747f1623fd54db06c90 100644 (file)
--- a/include/asm-ppc/thread_info.h
+++ b/include/asm-ppc/thread_info.h
@@ -23,6 +23,7 @@ struct thread_info {
        unsigned long           flags;          /* low level flags */
        int                     cpu;            /* cpu we're on */
        int                     preempt_count;
+       struct restart_block    restart_block;
 };
 
 #define INIT_THREAD_INFO(tsk)                  \
@@ -31,7 +32,10 @@ struct thread_info {
        .exec_domain =  &default_exec_domain,   \
        .flags =        0,                      \
        .cpu =          0,                      \
-       .preempt_count = 1                      \
+       .preempt_count = 1,                     \
+       .restart_block = {                      \
+               .fn = do_no_restart_syscall,    \
+       },                                      \
 }
 
 #define init_thread_info       (init_thread_union.thread_info)
@@ -70,8 +74,6 @@ static inline struct thread_info *current_thread_info(void)
 #define TI_FLAGS       8
 #define TI_CPU         12
 #define TI_PREEMPT     16
-#define TI_SOFTIRQ     20
-#define TI_HARDIRQ     24
 
 #define PREEMPT_ACTIVE         0x4000000
 

diff --git a/include/asm-ppc/unistd.h b/include/asm-ppc/unistd.h
index ae7ad3cc1dbe9d3e24c35c151f054b3c118c5b6d..fc7c0db368076bbf45750ad59d4ba664dd043382 100644 (file)
--- a/include/asm-ppc/unistd.h
+++ b/include/asm-ppc/unistd.h
@@ -4,7 +4,7 @@
 /*
  * This file contains the system call numbers.
  */
-
+#define __NR_restart_syscall     0
 #define __NR_exit                1
 #define __NR_fork                2
 #define __NR_read                3