diff options
| author | Thomas Gleixner | 2012-05-08 14:07:48 +0200 |
|---|---|---|
| committer | Thomas Gleixner | 2012-05-08 14:07:48 +0200 |
| commit | 67ba5293f705eb1d1b98710e5ccb0f615936a6fc (patch) | |
| tree | cdb4cfd94033b5c0f42eeb4de368802049880a12 /arch/xtensa/kernel | |
| parent | sh: Remove cpu_idle_wait() (diff) | |
| parent | tile: Use common threadinfo allocator (diff) | |
| download | kernel-qcow2-linux-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.tar.gz kernel-qcow2-linux-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.tar.xz kernel-qcow2-linux-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.zip | |
Merge branch 'smp/threadalloc' into smp/hotplug
Reason: Pull in the separate branch which was created so arch/tile can
base further work on it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/xtensa/kernel')
| -rw-r--r-- | arch/xtensa/kernel/signal.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/xtensa/kernel/signal.c b/arch/xtensa/kernel/signal.c index b69b000349fc..d78869a00b11 100644 --- a/arch/xtensa/kernel/signal.c +++ b/arch/xtensa/kernel/signal.c @@ -496,6 +496,7 @@ int do_signal(struct pt_regs *regs, sigset_t *oldset) signr = get_signal_to_deliver(&info, &ka, regs, NULL); if (signr > 0) { + int ret; /* Are we from a system call? */ |