diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-04-27 04:55:53 -0400 |
| commit | 7894eaf291238a62a565e9e9777483beeb00eeae (patch) | |
| tree | 43c08830d2030d39d719f3f3d54a0e9b36554770 /arch/m32r/kernel/signal.c | |
| parent | 9e73972cef1c0961c78b0e0b61c4ecc275b29f04 (diff) | |
| parent | acc696d93dcf993dec123d69d599979e1456ffec (diff) | |
Merge branch 'upstream' into irq-pio
Diffstat (limited to 'arch/m32r/kernel/signal.c')
| -rw-r--r-- | arch/m32r/kernel/signal.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/m32r/kernel/signal.c b/arch/m32r/kernel/signal.c index cb33097fefc4..6498ee70bb73 100644 --- a/arch/m32r/kernel/signal.c +++ b/arch/m32r/kernel/signal.c | |||
| @@ -118,6 +118,8 @@ restore_sigcontext(struct pt_regs *regs, struct sigcontext __user *sc, | |||
| 118 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | 118 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) |
| 119 | COPY(acch); | 119 | COPY(acch); |
| 120 | COPY(accl); | 120 | COPY(accl); |
| 121 | COPY(dummy_acc1h); | ||
| 122 | COPY(dummy_acc1l); | ||
| 121 | #else | 123 | #else |
| 122 | #error unknown isa configuration | 124 | #error unknown isa configuration |
| 123 | #endif | 125 | #endif |
| @@ -203,6 +205,8 @@ setup_sigcontext(struct sigcontext __user *sc, struct pt_regs *regs, | |||
| 203 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) | 205 | #elif defined(CONFIG_ISA_M32R2) || defined(CONFIG_ISA_M32R) |
| 204 | COPY(acch); | 206 | COPY(acch); |
| 205 | COPY(accl); | 207 | COPY(accl); |
| 208 | COPY(dummy_acc1h); | ||
| 209 | COPY(dummy_acc1l); | ||
| 206 | #else | 210 | #else |
| 207 | #error unknown isa configuration | 211 | #error unknown isa configuration |
| 208 | #endif | 212 | #endif |