git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'origin/master' into next
[pandora-kernel.git]
/
arch
/
avr32
/
kernel
/
signal.c
diff --git
a/arch/avr32/kernel/signal.c
b/arch/avr32/kernel/signal.c
index
803d7be
..
2722756
100644
(file)
--- a/
arch/avr32/kernel/signal.c
+++ b/
arch/avr32/kernel/signal.c
@@
-212,7
+212,7
@@
out:
return err;
}
return err;
}
-static inline void
restart_syscall
(struct pt_regs *regs)
+static inline void
setup_syscall_restart
(struct pt_regs *regs)
{
if (regs->r12 == -ERESTART_RESTARTBLOCK)
regs->r8 = __NR_restart_syscall;
{
if (regs->r12 == -ERESTART_RESTARTBLOCK)
regs->r8 = __NR_restart_syscall;
@@
-296,7
+296,7
@@
int do_signal(struct pt_regs *regs, sigset_t *oldset, int syscall)
}
/* fall through */
case -ERESTARTNOINTR:
}
/* fall through */
case -ERESTARTNOINTR:
-
restart_syscall
(regs);
+
setup_syscall_restart
(regs);
}
}
}
}