diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-18 13:53:16 -0400 |
| commit | 9b610fda0df5d0f0b0c64242e37441ad1b384aac (patch) | |
| tree | 0ea14b15f2e6546f37fe18d8ac3dc83077ec0e55 /arch/arm/boot/compressed/head.S | |
| parent | b8f8c3cf0a4ac0632ec3f0e15e9dc0c29de917af (diff) | |
| parent | 5b664cb235e97afbf34db9c4d77f08ebd725335e (diff) | |
Merge branch 'linus' into timers/nohz
Diffstat (limited to 'arch/arm/boot/compressed/head.S')
| -rw-r--r-- | arch/arm/boot/compressed/head.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/compressed/head.S b/arch/arm/boot/compressed/head.S index 3c2c8f2a1dc4..de41daeab5e9 100644 --- a/arch/arm/boot/compressed/head.S +++ b/arch/arm/boot/compressed/head.S | |||
| @@ -623,8 +623,8 @@ proc_types: | |||
| 623 | b __armv4_mmu_cache_off | 623 | b __armv4_mmu_cache_off |
| 624 | b __armv4_mmu_cache_flush | 624 | b __armv4_mmu_cache_flush |
| 625 | 625 | ||
| 626 | .word 0x56055310 @ Feroceon | 626 | .word 0x56050000 @ Feroceon |
| 627 | .word 0xfffffff0 | 627 | .word 0xff0f0000 |
| 628 | b __armv4_mmu_cache_on | 628 | b __armv4_mmu_cache_on |
| 629 | b __armv4_mmu_cache_off | 629 | b __armv4_mmu_cache_off |
| 630 | b __armv5tej_mmu_cache_flush | 630 | b __armv5tej_mmu_cache_flush |