diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /include/asm-arm/arch-rpc | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'include/asm-arm/arch-rpc')
| -rw-r--r-- | include/asm-arm/arch-rpc/memory.h | 5 | ||||
| -rw-r--r-- | include/asm-arm/arch-rpc/system.h | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/include/asm-arm/arch-rpc/memory.h b/include/asm-arm/arch-rpc/memory.h index d5a6a4f9f..e5f59abdb 100644 --- a/include/asm-arm/arch-rpc/memory.h +++ b/include/asm-arm/arch-rpc/memory.h @@ -24,11 +24,12 @@ * Page offset: 3GB */ #define PAGE_OFFSET (0xc0000000UL) +#define PHYS_OFFSET (0x10000000UL) #define __virt_to_phys__is_a_macro -#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + 0x10000000) +#define __virt_to_phys(vpage) ((vpage) - PAGE_OFFSET + PHYS_OFFSET) #define __phys_to_virt__is_a_macro -#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - 0x10000000) +#define __phys_to_virt(ppage) ((ppage) + PAGE_OFFSET - PHYS_OFFSET) /* * These are exactly the same on the RiscPC as the diff --git a/include/asm-arm/arch-rpc/system.h b/include/asm-arm/arch-rpc/system.h index af4ebc348..c40aadcad 100644 --- a/include/asm-arm/arch-rpc/system.h +++ b/include/asm-arm/arch-rpc/system.h @@ -18,7 +18,7 @@ extern __inline__ void arch_reset(char mode) outb(0, IOMD_ROMCR0); __asm__ __volatile__( - "mcr p15, 0, %0, c1, c0, 0\n\t" - "movs pc, #0" + "mcr p15, 0, %0, c1, c0, 0\n\t" + "mov pc, #0" : : "r" (cpu_reset())); } |