lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[POWERPC] Less ifdef's in signal.c/signal.h

Browse Source 
This patch moves things around a little bit in the new common signal.c
and signal.h files to remove the last #ifdef in the middle of the
common do_signal().

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
Benjamin Herrenschmidt
2007-06-04 15:15:56 +10:00
committed by Paul Mackerras
parent 0edc4ffd0e
commit 2f97cd3912
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
arch/powerpc/kernel/signal.c
View File

@@ -16,19 +16,6 @@
#include "signal.h" #include "signal.h"
#ifdef CONFIG_PPC64
static inline int is_32bit_task(void)
{
return test_thread_flag(TIF_32BIT);
}
#else
static inline int is_32bit_task(void)
{
return 1;
}
#endif
/* /*
* Allocate space for the signal frame * Allocate space for the signal frame
*/ */
@@ -161,10 +148,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
else else
ret = handle_signal32(signr, &ka, &info, oldset, ret = handle_signal32(signr, &ka, &info, oldset,
regs); regs);
#ifdef CONFIG_PPC64
} else { } else {
ret = handle_rt_signal64(signr, &ka, &info, oldset, regs); ret = handle_rt_signal64(signr, &ka, &info, oldset, regs);
#endif
} }
if (ret) { if (ret) {

24
arch/powerpc/kernel/signal.h
View File

@@ -24,8 +24,32 @@ extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
siginfo_t *info, sigset_t *oldset, siginfo_t *info, sigset_t *oldset,
struct pt_regs *regs); struct pt_regs *regs);
#ifdef CONFIG_PPC64
static inline int is_32bit_task(void)
{
return test_thread_flag(TIF_32BIT);
}
extern int handle_rt_signal64(int signr, struct k_sigaction *ka, extern int handle_rt_signal64(int signr, struct k_sigaction *ka,
siginfo_t *info, sigset_t *set, siginfo_t *info, sigset_t *set,
struct pt_regs *regs); struct pt_regs *regs);
#else /* CONFIG_PPC64 */
static inline int is_32bit_task(void)
{
return 1;
}
static inline int handle_rt_signal64(int signr, struct k_sigaction *ka,
siginfo_t *info, sigset_t *set,
struct pt_regs *regs)
{
return -EFAULT;
}
#endif /* !defined(CONFIG_PPC64) */
#endif /* _POWERPC_ARCH_SIGNAL_H */ #endif /* _POWERPC_ARCH_SIGNAL_H */