diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-03-23 02:25:38 +0000 |
| commit | 16b5d462f73eb29d1f67fa01cc1ea66afdc72569 (patch) | |
| tree | 5407bd573f4840e473ea27cbe61e5c7a07131fcd /include/asm-arm/arch-cl7500 | |
| parent | ce8a076e11e7e5ee36007f9a3eee5bb3744cb8f6 (diff) | |
Merge with Linux 2.3.99-pre2.
Diffstat (limited to 'include/asm-arm/arch-cl7500')
| -rw-r--r-- | include/asm-arm/arch-cl7500/system.h | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/include/asm-arm/arch-cl7500/system.h b/include/asm-arm/arch-cl7500/system.h index 6daffc785..a8a0ee518 100644 --- a/include/asm-arm/arch-cl7500/system.h +++ b/include/asm-arm/arch-cl7500/system.h @@ -8,18 +8,14 @@ #include <asm/iomd.h> -#define arch_do_idle() \ +#define arch_do_idle() \ outb(0, IOMD_SUSMODE) -#define arch_reset(mode) { \ - outb (0, IOMD_ROMCR0); \ - cli(); \ - __asm__ __volatile__("msr spsr, r1;" \ - "mcr p15, 0, %0, c1, c0, 0;" \ - "movs pc, #0" \ - : \ - : "r" (cpu_reset())); \ - } +#define arch_reset(mode) \ + do { \ + outb (0, IOMD_ROMCR0); \ + cpu_reset(0); \ + } while (0); #define arch_power_off() do { } while (0) |