Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge master.kernel.org:/home/rmk/linux-2.6-arm
+9
-2
+8
-1
arch/arm/mm/proc-v6.S
+8
-1
arch/arm/mm/proc-v6.S
···
55
55
mov pc, lr
56
56
57
57
ENTRY(cpu_v6_proc_fin)
58
-
mov pc, lr
58
+
stmfd sp!, {lr}
59
+
cpsid if @ disable interrupts
60
+
bl v6_flush_kern_cache_all
61
+
mrc p15, 0, r0, c1, c0, 0 @ ctrl register
62
+
bic r0, r0, #0x1000 @ ...i............
63
+
bic r0, r0, #0x0006 @ .............ca.
64
+
mcr p15, 0, r0, c1, c0, 0 @ disable caches
65
+
ldmfd sp!, {pc}
59
66
60
67
/*
61
68
* cpu_v6_reset(loc)
+1
-1
include/asm-arm/arch-pxa/pxa-regs.h
+1
-1
include/asm-arm/arch-pxa/pxa-regs.h
···
653
653
654
654
#define UDCCS_IO_RFS (1 << 0) /* Receive FIFO service */
655
655
#define UDCCS_IO_RPC (1 << 1) /* Receive packet complete */
656
-
#define UDCCS_IO_ROF (1 << 3) /* Receive overflow */
656
+
#define UDCCS_IO_ROF (1 << 2) /* Receive overflow */
657
657
#define UDCCS_IO_DME (1 << 3) /* DMA enable */
658
658
#define UDCCS_IO_RNE (1 << 6) /* Receive FIFO not empty */
659
659
#define UDCCS_IO_RSP (1 << 7) /* Receive short packet */