Commit f1cf4f93 authored by Christophe Leroy's avatar Christophe Leroy Committed by Michael Ellerman
Browse files

powerpc/signal32: Remove ifdefery in middle of if/else 



MSR_TM_ACTIVE() is always defined and returns always 0 when
CONFIG_PPC_TRANSACTIONAL_MEM is not selected, so the awful
ifdefery in the middle of an if/else can be removed.

Signed-off-by: default avatarChristophe Leroy <christophe.leroy@csgroup.eu>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
Link: https://lore.kernel.org/r/f3c36d687e4228f58d5c207a4036aa9ddcc7420a.1597770847.git.christophe.leroy@csgroup.eu
parent 9504db3e

arch/powerpc/kernel/signal_32.c

+8 −14
Original line number Diff line number Diff line
@@ -447,6 +447,12 @@ static int save_tm_user_regs(struct pt_regs *regs, struct mcontext __user *frame 


	return 0;

}

#else

static int save_tm_user_regs(struct pt_regs *regs, struct mcontext __user *frame,

			     struct mcontext __user *tm_frame, unsigned long msr)

{

	return 0;

}

#endif



/*
@@ -732,10 +738,8 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset, 
	unsigned long newsp = 0;

	unsigned long tramp;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	/* Set up Signal Frame */

	frame = get_sigframe(ksig, tsk, sizeof(*frame), 1);
@@ -786,14 +790,10 @@ int handle_rt_signal32(struct ksignal *ksig, sigset_t *oldset, 
	if (tramp == (unsigned long)mctx->mc_pad)

		flush_icache_range(tramp, tramp + 2 * sizeof(unsigned long));



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	if (MSR_TM_ACTIVE(msr)) {

		if (save_tm_user_regs(regs, mctx, tm_mctx, msr))

			goto badframe;

	}

	else

#endif

	{

	} else {

		if (save_user_regs(regs, mctx, tm_mctx, 1))

			goto badframe;

	}
@@ -842,10 +842,8 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, 
	unsigned long newsp = 0;

	unsigned long tramp;

	struct pt_regs *regs = tsk->thread.regs;

#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	/* Save the thread's msr before get_tm_stackpointer() changes it */

	unsigned long msr = regs->msr;

#endif



	/* Set up Signal Frame */

	frame = get_sigframe(ksig, tsk, sizeof(*frame), 1);
@@ -883,14 +881,10 @@ int handle_signal32(struct ksignal *ksig, sigset_t *oldset, 
	if (tramp == (unsigned long)mctx->mc_pad)

		flush_icache_range(tramp, tramp + 2 * sizeof(unsigned long));



#ifdef CONFIG_PPC_TRANSACTIONAL_MEM

	if (MSR_TM_ACTIVE(msr)) {

		if (save_tm_user_regs(regs, mctx, tm_mctx, msr))

			goto badframe;

	}

	else

#endif

	{

	} else {

		if (save_user_regs(regs, mctx, tm_mctx, 1))

			goto badframe;

	}