Skip to content

Commit

Permalink
[POWERPC] Less ifdef's in signal.c/signal.h
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Jun 14, 2007
1 parent 0edc4ff commit 2f97cd3
Show file tree
Hide file tree
Showing 2 changed files with 24 additions and 15 deletions.
15 changes: 0 additions & 15 deletions arch/powerpc/kernel/signal.c
Original file line number Diff line number Diff line change
Expand Up @@ -16,19 +16,6 @@

#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
*/
Expand Down Expand Up @@ -161,10 +148,8 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
else
ret = handle_signal32(signr, &ka, &info, oldset,
regs);
#ifdef CONFIG_PPC64
} else {
ret = handle_rt_signal64(signr, &ka, &info, oldset, regs);
#endif
}

if (ret) {
Expand Down
24 changes: 24 additions & 0 deletions arch/powerpc/kernel/signal.h
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,32 @@ extern int handle_rt_signal32(unsigned long sig, struct k_sigaction *ka,
siginfo_t *info, sigset_t *oldset,
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,
siginfo_t *info, sigset_t *set,
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 */

0 comments on commit 2f97cd3

Please sign in to comment.