Skip to content

Commit 325ce9e

Browse files
torvaldstorvalds
committed
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm: [ARM] pxa/colibri: fix missing #include <mach/mfp.h> in colibri.h [ARM] pxa/spitz: fix On/off key name to fix warning during boot [ARM] pxa: fix the incorrect cpu_is_pxa950() [ARM] pxa: update cpuid pattern for pxa9xx in head.S [ARM] pxa/viper: fix timeout usage for I2C [ARM] pxa/raumfeld: fix button name [ARM] pxa/imote2: Fix iMote2 defconfig [ARM] pxa: add missing new line to regs-u2d.h ARM: 6093/1: Fix kernel memory printing for sparsemem arch/arm/include/asm/elf.h: forward-declare the task-struct arch/arm/plat-pxa/dma.c: correct NULL test ARM: 6076/1: SA1100: add processor check to sa1110-cpufreq driver ARM: 6075/1: SA1100: fix wrong CPU type for h3100 and h3600 ARM: Update mach-types ARM: 6066/1: Fix "BUG: scheduling while atomic: swapper/0/0x00000002 ARM: 6068/1: Fix build break with KPROBES enabled mx5: Fix build error for mx51_defconfig
2 parents bbfdbe9 + 257dab8 commit 325ce9e

File tree

17 files changed

+156
-137
lines changed

17 files changed

+156
-137
lines changed

‎arch/arm/boot/compressed/head.S

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -685,8 +685,8 @@ proc_types:
685685
W(b) __armv4_mmu_cache_off
686686
W(b) __armv4_mmu_cache_flush
687687

688-
.word 0x56056930
689-
.word 0xff0ffff0 @ PXA935
688+
.word 0x56056900
689+
.word 0xffffff00 @ PXA9xx
690690
W(b) __armv4_mmu_cache_on
691691
W(b) __armv4_mmu_cache_off
692692
W(b) __armv4_mmu_cache_flush
@@ -697,12 +697,6 @@ proc_types:
697697
W(b) __armv4_mmu_cache_off
698698
W(b) __armv5tej_mmu_cache_flush
699699

700-
.word 0x56056930
701-
.word 0xff0ffff0 @ PXA935
702-
W(b) __armv4_mmu_cache_on
703-
W(b) __armv4_mmu_cache_off
704-
W(b) __armv4_mmu_cache_flush
705-
706700
.word 0x56050000 @ Feroceon
707701
.word 0xff0f0000
708702
W(b) __armv4_mmu_cache_on

0 commit comments

Comments
 (0)