diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-19 23:12:03 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-19 23:12:03 -0700 |
| commit | 26baeba8ddfb23bb295807ebc387c98f47f60fd9 (patch) | |
| tree | 17bb4da6c15e92a30157752cabe10848a84479e2 | |
| parent | 281dd25cdc0d6903929b79183816d151ea626341 (diff) | |
| parent | 67c5587ad4047041e4fb137628076388ede05281 (diff) | |
| download | linux-lfu-26baeba8ddfb23bb295807ebc387c98f47f60fd9.tar.gz linux-lfu-26baeba8ddfb23bb295807ebc387c98f47f60fd9.tar.xz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 9 | ||||
| -rw-r--r-- | include/asm-arm/arch-pxa/pxa-regs.h | 2 |
2 files changed, 9 insertions, 2 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index caf3b19b167..9bb5fff406f 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S @@ -55,7 +55,14 @@ ENTRY(cpu_v6_proc_init) mov pc, lr ENTRY(cpu_v6_proc_fin) - mov pc, lr + stmfd sp!, {lr} + cpsid if @ disable interrupts + bl v6_flush_kern_cache_all + mrc p15, 0, r0, c1, c0, 0 @ ctrl register + bic r0, r0, #0x1000 @ ...i............ + bic r0, r0, #0x0006 @ .............ca. + mcr p15, 0, r0, c1, c0, 0 @ disable caches + ldmfd sp!, {pc} /* * cpu_v6_reset(loc) diff --git a/include/asm-arm/arch-pxa/pxa-regs.h b/include/asm-arm/arch-pxa/pxa-regs.h index 13fa2deb4dd..3af7165ab0d 100644 --- a/include/asm-arm/arch-pxa/pxa-regs.h +++ b/include/asm-arm/arch-pxa/pxa-regs.h @@ -653,7 +653,7 @@ #define UDCCS_IO_RFS (1 << 0) /* Receive FIFO service */ #define UDCCS_IO_RPC (1 << 1) /* Receive packet complete */ -#define UDCCS_IO_ROF (1 << 3) /* Receive overflow */ +#define UDCCS_IO_ROF (1 << 2) /* Receive overflow */ #define UDCCS_IO_DME (1 << 3) /* DMA enable */ #define UDCCS_IO_RNE (1 << 6) /* Receive FIFO not empty */ #define UDCCS_IO_RSP (1 << 7) /* Receive short packet */ |