Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9674dcf7 authored by Hirokazu Takata's avatar Hirokazu Takata Committed by Linus Torvalds
Browse files

[PATCH] m32r: build fix for processors without ISA_DSP_LEVEL2 



Additional fixes for processors without ISA_DSP_LEVEL2.  sigcontext_t does not
have dummy_acc1h, dummy_acc1l members any longer.

Signed-off-by: default avatarHirokazu Takata <takata@linux-m32r.org>
Cc: <stable@kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2b5b09b3

arch/m32r/kernel/process.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ void show_regs(struct pt_regs * regs) 
	  regs->acc1h, regs->acc1l);

#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)

	printk("ACCH[%08lx]:ACCL[%08lx]\n", \

	  regs->acch, regs->accl);

	  regs->acc0h, regs->acc0l);

#else

#error unknown isa configuration

#endif

arch/m32r/kernel/signal.c

+4 −22
Original line number Diff line number Diff line
@@ -109,19 +109,10 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, 
	COPY(r10);

	COPY(r11);

	COPY(r12);

#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)

	COPY(acc0h);

	COPY(acc0l);

	COPY(acc1h);

	COPY(acc1l);

#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)

	COPY(acch);

	COPY(accl);

	COPY(dummy_acc1h);

	COPY(dummy_acc1l);

#else

#error unknown isa configuration

#endif

	COPY(acc1h);		/* ISA_DSP_LEVEL2 only */

	COPY(acc1l);		/* ISA_DSP_LEVEL2 only */

	COPY(psw);

	COPY(bpc);

	COPY(bbpsw);
@@ -196,19 +187,10 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, 
	COPY(r10);

	COPY(r11);

	COPY(r12);

#if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2)

	COPY(acc0h);

	COPY(acc0l);

	COPY(acc1h);

	COPY(acc1l);

#elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R)

	COPY(acch);

	COPY(accl);

	COPY(dummy_acc1h);

	COPY(dummy_acc1l);

#else

#error unknown isa configuration

#endif

	COPY(acc1h);		/* ISA_DSP_LEVEL2 only */

	COPY(acc1l);		/* ISA_DSP_LEVEL2 only */

	COPY(psw);

	COPY(bpc);

	COPY(bbpsw);