diff options
| author | Hirokazu Takata <takata@linux-m32r.org> | 2007-02-10 01:43:35 -0800 | 
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 10:51:20 -0800 | 
| commit | 9674dcf795a4c7384e4e42c8f38fcb87517b1a43 (patch) | |
| tree | 7bd9bc05e1e1f6202e15b27139a4a19a1b06f7c6 /arch/m32r/kernel/signal.c | |
| parent | 2b5b09b3b576d7323d8b4244429a83f16dc5446a (diff) | |
| download | olio-linux-3.10-9674dcf795a4c7384e4e42c8f38fcb87517b1a43.tar.xz olio-linux-3.10-9674dcf795a4c7384e4e42c8f38fcb87517b1a43.zip  | |
[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: Hirokazu Takata <takata@linux-m32r.org>
Cc: <stable@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/m32r/kernel/signal.c')
| -rw-r--r-- | arch/m32r/kernel/signal.c | 26 | 
1 files changed, 4 insertions, 22 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 092ea86bb07..4b156054baa 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c @@ -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);  |