diff options
author | Hirokazu Takata <takata@linux-m32r.org> | 2007-02-10 04:43:35 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-11 13:51:20 -0500 |
commit | 9674dcf795a4c7384e4e42c8f38fcb87517b1a43 (patch) | |
tree | 7bd9bc05e1e1f6202e15b27139a4a19a1b06f7c6 | |
parent | 2b5b09b3b576d7323d8b4244429a83f16dc5446a (diff) |
[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>
-rw-r--r-- | arch/m32r/kernel/process.c | 2 | ||||
-rw-r--r-- | arch/m32r/kernel/signal.c | 26 |
2 files changed, 5 insertions, 23 deletions
diff --git a/arch/m32r/kernel/process.c b/arch/m32r/kernel/process.c index 44cbe0ce0f8f..a689e2978b6e 100644 --- a/arch/m32r/kernel/process.c +++ b/arch/m32r/kernel/process.c | |||
@@ -174,7 +174,7 @@ void show_regs(struct pt_regs * regs) | |||
174 | regs->acc1h, regs->acc1l); | 174 | regs->acc1h, regs->acc1l); |
175 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | 175 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) |
176 | printk("ACCH[%08lx]:ACCL[%08lx]\n", \ | 176 | printk("ACCH[%08lx]:ACCL[%08lx]\n", \ |
177 | regs->acch, regs->accl); | 177 | regs->acc0h, regs->acc0l); |
178 | #else | 178 | #else |
179 | #error unknown isa configuration | 179 | #error unknown isa configuration |
180 | #endif | 180 | #endif |
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index 092ea86bb079..4b156054baa6 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, | |||
109 | COPY(r10); | 109 | COPY(r10); |
110 | COPY(r11); | 110 | COPY(r11); |
111 | COPY(r12); | 111 | COPY(r12); |
112 | #if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2) | ||
113 | COPY(acc0h); | 112 | COPY(acc0h); |
114 | COPY(acc0l); | 113 | COPY(acc0l); |
115 | COPY(acc1h); | 114 | COPY(acc1h); /* ISA_DSP_LEVEL2 only */ |
116 | COPY(acc1l); | 115 | COPY(acc1l); /* ISA_DSP_LEVEL2 only */ |
117 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | ||
118 | COPY(acch); | ||
119 | COPY(accl); | ||
120 | COPY(dummy_acc1h); | ||
121 | COPY(dummy_acc1l); | ||
122 | #else | ||
123 | #error unknown isa configuration | ||
124 | #endif | ||
125 | COPY(psw); | 116 | COPY(psw); |
126 | COPY(bpc); | 117 | COPY(bpc); |
127 | COPY(bbpsw); | 118 | COPY(bbpsw); |
@@ -196,19 +187,10 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
196 | COPY(r10); | 187 | COPY(r10); |
197 | COPY(r11); | 188 | COPY(r11); |
198 | COPY(r12); | 189 | COPY(r12); |
199 | #if defined(CONFIG_ISA_M32R2) && defined(CONFIG_ISA_DSP_LEVEL2) | ||
200 | COPY(acc0h); | 190 | COPY(acc0h); |
201 | COPY(acc0l); | 191 | COPY(acc0l); |
202 | COPY(acc1h); | 192 | COPY(acc1h); /* ISA_DSP_LEVEL2 only */ |
203 | COPY(acc1l); | 193 | COPY(acc1l); /* ISA_DSP_LEVEL2 only */ |
204 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | ||
205 | COPY(acch); | ||
206 | COPY(accl); | ||
207 | COPY(dummy_acc1h); | ||
208 | COPY(dummy_acc1l); | ||
209 | #else | ||
210 | #error unknown isa configuration | ||
211 | #endif | ||
212 | COPY(psw); | 194 | COPY(psw); |
213 | COPY(bpc); | 195 | COPY(bpc); |
214 | COPY(bbpsw); | 196 | COPY(bbpsw); |