diff options
author | Catalin Marinas <catalin.marinas@arm.com> | 2008-04-21 13:42:04 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2008-04-24 05:06:45 -0400 |
commit | 4a1fd556c1f1fbd6d9d6739efec042324732b697 (patch) | |
tree | 0175c078b97e3e74249a07df619280832fa06b37 /arch | |
parent | 328d8a012583f0c25f8db25a2e5e63b521201542 (diff) |
[ARM] fix 48d7927bdf071d05cf5d15b816cf06b0937cb84f
The proc-*.S files have the _prefetch_abort pointer placed at the end
of the processor structure but the cpu-multi32.h defines it in the
second position. The patch also fixes the support for XSC3 and the
MMU-less CPUs (740, 7tdmi, 940, 946 and 9tdmi).
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mm/Kconfig | 6 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm1020.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm1020e.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm1022.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm1026.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm6_7.S | 4 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm720.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm740.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm7tdmi.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm920.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm922.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm925.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm926.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm940.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm946.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-arm9tdmi.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-feroceon.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-sa110.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-sa1100.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-v6.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-v7.S | 2 | ||||
-rw-r--r-- | arch/arm/mm/proc-xsc3.S | 1 | ||||
-rw-r--r-- | arch/arm/mm/proc-xscale.S | 2 |
23 files changed, 29 insertions, 17 deletions
diff --git a/arch/arm/mm/Kconfig b/arch/arm/mm/Kconfig index 746cbb7c8e95..1b8229d9c9d5 100644 --- a/arch/arm/mm/Kconfig +++ b/arch/arm/mm/Kconfig | |||
@@ -32,6 +32,7 @@ config CPU_ARM7TDMI | |||
32 | depends on !MMU | 32 | depends on !MMU |
33 | select CPU_32v4T | 33 | select CPU_32v4T |
34 | select CPU_ABRT_LV4T | 34 | select CPU_ABRT_LV4T |
35 | select CPU_PABRT_NOIFAR | ||
35 | select CPU_CACHE_V4 | 36 | select CPU_CACHE_V4 |
36 | help | 37 | help |
37 | A 32-bit RISC microprocessor based on the ARM7 processor core | 38 | A 32-bit RISC microprocessor based on the ARM7 processor core |
@@ -85,6 +86,7 @@ config CPU_ARM740T | |||
85 | depends on !MMU | 86 | depends on !MMU |
86 | select CPU_32v4T | 87 | select CPU_32v4T |
87 | select CPU_ABRT_LV4T | 88 | select CPU_ABRT_LV4T |
89 | select CPU_PABRT_NOIFAR | ||
88 | select CPU_CACHE_V3 # although the core is v4t | 90 | select CPU_CACHE_V3 # although the core is v4t |
89 | select CPU_CP15_MPU | 91 | select CPU_CP15_MPU |
90 | help | 92 | help |
@@ -101,6 +103,7 @@ config CPU_ARM9TDMI | |||
101 | depends on !MMU | 103 | depends on !MMU |
102 | select CPU_32v4T | 104 | select CPU_32v4T |
103 | select CPU_ABRT_NOMMU | 105 | select CPU_ABRT_NOMMU |
106 | select CPU_PABRT_NOIFAR | ||
104 | select CPU_CACHE_V4 | 107 | select CPU_CACHE_V4 |
105 | help | 108 | help |
106 | A 32-bit RISC microprocessor based on the ARM9 processor core | 109 | A 32-bit RISC microprocessor based on the ARM9 processor core |
@@ -200,6 +203,7 @@ config CPU_ARM940T | |||
200 | depends on !MMU | 203 | depends on !MMU |
201 | select CPU_32v4T | 204 | select CPU_32v4T |
202 | select CPU_ABRT_NOMMU | 205 | select CPU_ABRT_NOMMU |
206 | select CPU_PABRT_NOIFAR | ||
203 | select CPU_CACHE_VIVT | 207 | select CPU_CACHE_VIVT |
204 | select CPU_CP15_MPU | 208 | select CPU_CP15_MPU |
205 | help | 209 | help |
@@ -217,6 +221,7 @@ config CPU_ARM946E | |||
217 | depends on !MMU | 221 | depends on !MMU |
218 | select CPU_32v5 | 222 | select CPU_32v5 |
219 | select CPU_ABRT_NOMMU | 223 | select CPU_ABRT_NOMMU |
224 | select CPU_PABRT_NOIFAR | ||
220 | select CPU_CACHE_VIVT | 225 | select CPU_CACHE_VIVT |
221 | select CPU_CP15_MPU | 226 | select CPU_CP15_MPU |
222 | help | 227 | help |
@@ -351,6 +356,7 @@ config CPU_XSC3 | |||
351 | default y | 356 | default y |
352 | select CPU_32v5 | 357 | select CPU_32v5 |
353 | select CPU_ABRT_EV5T | 358 | select CPU_ABRT_EV5T |
359 | select CPU_PABRT_NOIFAR | ||
354 | select CPU_CACHE_VIVT | 360 | select CPU_CACHE_VIVT |
355 | select CPU_CP15_MMU | 361 | select CPU_CP15_MMU |
356 | select CPU_TLB_V4WBI if MMU | 362 | select CPU_TLB_V4WBI if MMU |
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S index 32fd7ea533f2..5673f4d6113b 100644 --- a/arch/arm/mm/proc-arm1020.S +++ b/arch/arm/mm/proc-arm1020.S | |||
@@ -471,6 +471,7 @@ arm1020_crval: | |||
471 | .type arm1020_processor_functions, #object | 471 | .type arm1020_processor_functions, #object |
472 | arm1020_processor_functions: | 472 | arm1020_processor_functions: |
473 | .word v4t_early_abort | 473 | .word v4t_early_abort |
474 | .word pabort_noifar | ||
474 | .word cpu_arm1020_proc_init | 475 | .word cpu_arm1020_proc_init |
475 | .word cpu_arm1020_proc_fin | 476 | .word cpu_arm1020_proc_fin |
476 | .word cpu_arm1020_reset | 477 | .word cpu_arm1020_reset |
@@ -478,7 +479,6 @@ arm1020_processor_functions: | |||
478 | .word cpu_arm1020_dcache_clean_area | 479 | .word cpu_arm1020_dcache_clean_area |
479 | .word cpu_arm1020_switch_mm | 480 | .word cpu_arm1020_switch_mm |
480 | .word cpu_arm1020_set_pte_ext | 481 | .word cpu_arm1020_set_pte_ext |
481 | .word pabort_noifar | ||
482 | .size arm1020_processor_functions, . - arm1020_processor_functions | 482 | .size arm1020_processor_functions, . - arm1020_processor_functions |
483 | 483 | ||
484 | .section ".rodata" | 484 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S index fe2b0ae70274..4343fdb0e9e5 100644 --- a/arch/arm/mm/proc-arm1020e.S +++ b/arch/arm/mm/proc-arm1020e.S | |||
@@ -452,6 +452,7 @@ arm1020e_crval: | |||
452 | .type arm1020e_processor_functions, #object | 452 | .type arm1020e_processor_functions, #object |
453 | arm1020e_processor_functions: | 453 | arm1020e_processor_functions: |
454 | .word v4t_early_abort | 454 | .word v4t_early_abort |
455 | .word pabort_noifar | ||
455 | .word cpu_arm1020e_proc_init | 456 | .word cpu_arm1020e_proc_init |
456 | .word cpu_arm1020e_proc_fin | 457 | .word cpu_arm1020e_proc_fin |
457 | .word cpu_arm1020e_reset | 458 | .word cpu_arm1020e_reset |
@@ -459,7 +460,6 @@ arm1020e_processor_functions: | |||
459 | .word cpu_arm1020e_dcache_clean_area | 460 | .word cpu_arm1020e_dcache_clean_area |
460 | .word cpu_arm1020e_switch_mm | 461 | .word cpu_arm1020e_switch_mm |
461 | .word cpu_arm1020e_set_pte_ext | 462 | .word cpu_arm1020e_set_pte_ext |
462 | .word pabort_noifar | ||
463 | .size arm1020e_processor_functions, . - arm1020e_processor_functions | 463 | .size arm1020e_processor_functions, . - arm1020e_processor_functions |
464 | 464 | ||
465 | .section ".rodata" | 465 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S index 06dde678e19d..2a4ea1659e96 100644 --- a/arch/arm/mm/proc-arm1022.S +++ b/arch/arm/mm/proc-arm1022.S | |||
@@ -435,6 +435,7 @@ arm1022_crval: | |||
435 | .type arm1022_processor_functions, #object | 435 | .type arm1022_processor_functions, #object |
436 | arm1022_processor_functions: | 436 | arm1022_processor_functions: |
437 | .word v4t_early_abort | 437 | .word v4t_early_abort |
438 | .word pabort_noifar | ||
438 | .word cpu_arm1022_proc_init | 439 | .word cpu_arm1022_proc_init |
439 | .word cpu_arm1022_proc_fin | 440 | .word cpu_arm1022_proc_fin |
440 | .word cpu_arm1022_reset | 441 | .word cpu_arm1022_reset |
@@ -442,7 +443,6 @@ arm1022_processor_functions: | |||
442 | .word cpu_arm1022_dcache_clean_area | 443 | .word cpu_arm1022_dcache_clean_area |
443 | .word cpu_arm1022_switch_mm | 444 | .word cpu_arm1022_switch_mm |
444 | .word cpu_arm1022_set_pte_ext | 445 | .word cpu_arm1022_set_pte_ext |
445 | .word pabort_noifar | ||
446 | .size arm1022_processor_functions, . - arm1022_processor_functions | 446 | .size arm1022_processor_functions, . - arm1022_processor_functions |
447 | 447 | ||
448 | .section ".rodata" | 448 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S index f5506e6e681e..77a1babd421c 100644 --- a/arch/arm/mm/proc-arm1026.S +++ b/arch/arm/mm/proc-arm1026.S | |||
@@ -430,6 +430,7 @@ arm1026_crval: | |||
430 | .type arm1026_processor_functions, #object | 430 | .type arm1026_processor_functions, #object |
431 | arm1026_processor_functions: | 431 | arm1026_processor_functions: |
432 | .word v5t_early_abort | 432 | .word v5t_early_abort |
433 | .word pabort_noifar | ||
433 | .word cpu_arm1026_proc_init | 434 | .word cpu_arm1026_proc_init |
434 | .word cpu_arm1026_proc_fin | 435 | .word cpu_arm1026_proc_fin |
435 | .word cpu_arm1026_reset | 436 | .word cpu_arm1026_reset |
@@ -437,7 +438,6 @@ arm1026_processor_functions: | |||
437 | .word cpu_arm1026_dcache_clean_area | 438 | .word cpu_arm1026_dcache_clean_area |
438 | .word cpu_arm1026_switch_mm | 439 | .word cpu_arm1026_switch_mm |
439 | .word cpu_arm1026_set_pte_ext | 440 | .word cpu_arm1026_set_pte_ext |
440 | .word pabort_noifar | ||
441 | .size arm1026_processor_functions, . - arm1026_processor_functions | 441 | .size arm1026_processor_functions, . - arm1026_processor_functions |
442 | 442 | ||
443 | .section .rodata | 443 | .section .rodata |
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S index 14b6a95c8d45..c371fc87776e 100644 --- a/arch/arm/mm/proc-arm6_7.S +++ b/arch/arm/mm/proc-arm6_7.S | |||
@@ -293,6 +293,7 @@ __arm7_setup: mov r0, #0 | |||
293 | .type arm6_processor_functions, #object | 293 | .type arm6_processor_functions, #object |
294 | ENTRY(arm6_processor_functions) | 294 | ENTRY(arm6_processor_functions) |
295 | .word cpu_arm6_data_abort | 295 | .word cpu_arm6_data_abort |
296 | .word pabort_noifar | ||
296 | .word cpu_arm6_proc_init | 297 | .word cpu_arm6_proc_init |
297 | .word cpu_arm6_proc_fin | 298 | .word cpu_arm6_proc_fin |
298 | .word cpu_arm6_reset | 299 | .word cpu_arm6_reset |
@@ -300,7 +301,6 @@ ENTRY(arm6_processor_functions) | |||
300 | .word cpu_arm6_dcache_clean_area | 301 | .word cpu_arm6_dcache_clean_area |
301 | .word cpu_arm6_switch_mm | 302 | .word cpu_arm6_switch_mm |
302 | .word cpu_arm6_set_pte_ext | 303 | .word cpu_arm6_set_pte_ext |
303 | .word pabort_noifar | ||
304 | .size arm6_processor_functions, . - arm6_processor_functions | 304 | .size arm6_processor_functions, . - arm6_processor_functions |
305 | 305 | ||
306 | /* | 306 | /* |
@@ -310,6 +310,7 @@ ENTRY(arm6_processor_functions) | |||
310 | .type arm7_processor_functions, #object | 310 | .type arm7_processor_functions, #object |
311 | ENTRY(arm7_processor_functions) | 311 | ENTRY(arm7_processor_functions) |
312 | .word cpu_arm7_data_abort | 312 | .word cpu_arm7_data_abort |
313 | .word pabort_noifar | ||
313 | .word cpu_arm7_proc_init | 314 | .word cpu_arm7_proc_init |
314 | .word cpu_arm7_proc_fin | 315 | .word cpu_arm7_proc_fin |
315 | .word cpu_arm7_reset | 316 | .word cpu_arm7_reset |
@@ -317,7 +318,6 @@ ENTRY(arm7_processor_functions) | |||
317 | .word cpu_arm7_dcache_clean_area | 318 | .word cpu_arm7_dcache_clean_area |
318 | .word cpu_arm7_switch_mm | 319 | .word cpu_arm7_switch_mm |
319 | .word cpu_arm7_set_pte_ext | 320 | .word cpu_arm7_set_pte_ext |
320 | .word pabort_noifar | ||
321 | .size arm7_processor_functions, . - arm7_processor_functions | 321 | .size arm7_processor_functions, . - arm7_processor_functions |
322 | 322 | ||
323 | .section ".rodata" | 323 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S index ca5e7aac2da7..d64f8e6f75ab 100644 --- a/arch/arm/mm/proc-arm720.S +++ b/arch/arm/mm/proc-arm720.S | |||
@@ -198,6 +198,7 @@ arm720_crval: | |||
198 | .type arm720_processor_functions, #object | 198 | .type arm720_processor_functions, #object |
199 | ENTRY(arm720_processor_functions) | 199 | ENTRY(arm720_processor_functions) |
200 | .word v4t_late_abort | 200 | .word v4t_late_abort |
201 | .word pabort_noifar | ||
201 | .word cpu_arm720_proc_init | 202 | .word cpu_arm720_proc_init |
202 | .word cpu_arm720_proc_fin | 203 | .word cpu_arm720_proc_fin |
203 | .word cpu_arm720_reset | 204 | .word cpu_arm720_reset |
@@ -205,7 +206,6 @@ ENTRY(arm720_processor_functions) | |||
205 | .word cpu_arm720_dcache_clean_area | 206 | .word cpu_arm720_dcache_clean_area |
206 | .word cpu_arm720_switch_mm | 207 | .word cpu_arm720_switch_mm |
207 | .word cpu_arm720_set_pte_ext | 208 | .word cpu_arm720_set_pte_ext |
208 | .word pabort_noifar | ||
209 | .size arm720_processor_functions, . - arm720_processor_functions | 209 | .size arm720_processor_functions, . - arm720_processor_functions |
210 | 210 | ||
211 | .section ".rodata" | 211 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm740.S b/arch/arm/mm/proc-arm740.S index 7069f495cf9b..3a57376c8bc9 100644 --- a/arch/arm/mm/proc-arm740.S +++ b/arch/arm/mm/proc-arm740.S | |||
@@ -126,6 +126,7 @@ __arm740_setup: | |||
126 | .type arm740_processor_functions, #object | 126 | .type arm740_processor_functions, #object |
127 | ENTRY(arm740_processor_functions) | 127 | ENTRY(arm740_processor_functions) |
128 | .word v4t_late_abort | 128 | .word v4t_late_abort |
129 | .word pabort_noifar | ||
129 | .word cpu_arm740_proc_init | 130 | .word cpu_arm740_proc_init |
130 | .word cpu_arm740_proc_fin | 131 | .word cpu_arm740_proc_fin |
131 | .word cpu_arm740_reset | 132 | .word cpu_arm740_reset |
diff --git a/arch/arm/mm/proc-arm7tdmi.S b/arch/arm/mm/proc-arm7tdmi.S index d091c2571823..7b3ecdeb5370 100644 --- a/arch/arm/mm/proc-arm7tdmi.S +++ b/arch/arm/mm/proc-arm7tdmi.S | |||
@@ -64,6 +64,7 @@ __arm7tdmi_setup: | |||
64 | .type arm7tdmi_processor_functions, #object | 64 | .type arm7tdmi_processor_functions, #object |
65 | ENTRY(arm7tdmi_processor_functions) | 65 | ENTRY(arm7tdmi_processor_functions) |
66 | .word v4t_late_abort | 66 | .word v4t_late_abort |
67 | .word pabort_noifar | ||
67 | .word cpu_arm7tdmi_proc_init | 68 | .word cpu_arm7tdmi_proc_init |
68 | .word cpu_arm7tdmi_proc_fin | 69 | .word cpu_arm7tdmi_proc_fin |
69 | .word cpu_arm7tdmi_reset | 70 | .word cpu_arm7tdmi_reset |
diff --git a/arch/arm/mm/proc-arm920.S b/arch/arm/mm/proc-arm920.S index 0170d4f466ea..28cdb060df45 100644 --- a/arch/arm/mm/proc-arm920.S +++ b/arch/arm/mm/proc-arm920.S | |||
@@ -417,6 +417,7 @@ arm920_crval: | |||
417 | .type arm920_processor_functions, #object | 417 | .type arm920_processor_functions, #object |
418 | arm920_processor_functions: | 418 | arm920_processor_functions: |
419 | .word v4t_early_abort | 419 | .word v4t_early_abort |
420 | .word pabort_noifar | ||
420 | .word cpu_arm920_proc_init | 421 | .word cpu_arm920_proc_init |
421 | .word cpu_arm920_proc_fin | 422 | .word cpu_arm920_proc_fin |
422 | .word cpu_arm920_reset | 423 | .word cpu_arm920_reset |
@@ -424,7 +425,6 @@ arm920_processor_functions: | |||
424 | .word cpu_arm920_dcache_clean_area | 425 | .word cpu_arm920_dcache_clean_area |
425 | .word cpu_arm920_switch_mm | 426 | .word cpu_arm920_switch_mm |
426 | .word cpu_arm920_set_pte_ext | 427 | .word cpu_arm920_set_pte_ext |
427 | .word pabort_noifar | ||
428 | .size arm920_processor_functions, . - arm920_processor_functions | 428 | .size arm920_processor_functions, . - arm920_processor_functions |
429 | 429 | ||
430 | .section ".rodata" | 430 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm922.S b/arch/arm/mm/proc-arm922.S index b7952493d404..94ddcb4a4b76 100644 --- a/arch/arm/mm/proc-arm922.S +++ b/arch/arm/mm/proc-arm922.S | |||
@@ -421,6 +421,7 @@ arm922_crval: | |||
421 | .type arm922_processor_functions, #object | 421 | .type arm922_processor_functions, #object |
422 | arm922_processor_functions: | 422 | arm922_processor_functions: |
423 | .word v4t_early_abort | 423 | .word v4t_early_abort |
424 | .word pabort_noifar | ||
424 | .word cpu_arm922_proc_init | 425 | .word cpu_arm922_proc_init |
425 | .word cpu_arm922_proc_fin | 426 | .word cpu_arm922_proc_fin |
426 | .word cpu_arm922_reset | 427 | .word cpu_arm922_reset |
@@ -428,7 +429,6 @@ arm922_processor_functions: | |||
428 | .word cpu_arm922_dcache_clean_area | 429 | .word cpu_arm922_dcache_clean_area |
429 | .word cpu_arm922_switch_mm | 430 | .word cpu_arm922_switch_mm |
430 | .word cpu_arm922_set_pte_ext | 431 | .word cpu_arm922_set_pte_ext |
431 | .word pabort_noifar | ||
432 | .size arm922_processor_functions, . - arm922_processor_functions | 432 | .size arm922_processor_functions, . - arm922_processor_functions |
433 | 433 | ||
434 | .section ".rodata" | 434 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm925.S b/arch/arm/mm/proc-arm925.S index e2988eba4cf6..065087afb772 100644 --- a/arch/arm/mm/proc-arm925.S +++ b/arch/arm/mm/proc-arm925.S | |||
@@ -484,6 +484,7 @@ arm925_crval: | |||
484 | .type arm925_processor_functions, #object | 484 | .type arm925_processor_functions, #object |
485 | arm925_processor_functions: | 485 | arm925_processor_functions: |
486 | .word v4t_early_abort | 486 | .word v4t_early_abort |
487 | .word pabort_noifar | ||
487 | .word cpu_arm925_proc_init | 488 | .word cpu_arm925_proc_init |
488 | .word cpu_arm925_proc_fin | 489 | .word cpu_arm925_proc_fin |
489 | .word cpu_arm925_reset | 490 | .word cpu_arm925_reset |
@@ -491,7 +492,6 @@ arm925_processor_functions: | |||
491 | .word cpu_arm925_dcache_clean_area | 492 | .word cpu_arm925_dcache_clean_area |
492 | .word cpu_arm925_switch_mm | 493 | .word cpu_arm925_switch_mm |
493 | .word cpu_arm925_set_pte_ext | 494 | .word cpu_arm925_set_pte_ext |
494 | .word pabort_noifar | ||
495 | .size arm925_processor_functions, . - arm925_processor_functions | 495 | .size arm925_processor_functions, . - arm925_processor_functions |
496 | 496 | ||
497 | .section ".rodata" | 497 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index 62f7d1dfe016..997db8472b5c 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S | |||
@@ -437,6 +437,7 @@ arm926_crval: | |||
437 | .type arm926_processor_functions, #object | 437 | .type arm926_processor_functions, #object |
438 | arm926_processor_functions: | 438 | arm926_processor_functions: |
439 | .word v5tj_early_abort | 439 | .word v5tj_early_abort |
440 | .word pabort_noifar | ||
440 | .word cpu_arm926_proc_init | 441 | .word cpu_arm926_proc_init |
441 | .word cpu_arm926_proc_fin | 442 | .word cpu_arm926_proc_fin |
442 | .word cpu_arm926_reset | 443 | .word cpu_arm926_reset |
@@ -444,7 +445,6 @@ arm926_processor_functions: | |||
444 | .word cpu_arm926_dcache_clean_area | 445 | .word cpu_arm926_dcache_clean_area |
445 | .word cpu_arm926_switch_mm | 446 | .word cpu_arm926_switch_mm |
446 | .word cpu_arm926_set_pte_ext | 447 | .word cpu_arm926_set_pte_ext |
447 | .word pabort_noifar | ||
448 | .size arm926_processor_functions, . - arm926_processor_functions | 448 | .size arm926_processor_functions, . - arm926_processor_functions |
449 | 449 | ||
450 | .section ".rodata" | 450 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S index 786c593778f0..44ead902bd54 100644 --- a/arch/arm/mm/proc-arm940.S +++ b/arch/arm/mm/proc-arm940.S | |||
@@ -321,6 +321,7 @@ __arm940_setup: | |||
321 | .type arm940_processor_functions, #object | 321 | .type arm940_processor_functions, #object |
322 | ENTRY(arm940_processor_functions) | 322 | ENTRY(arm940_processor_functions) |
323 | .word nommu_early_abort | 323 | .word nommu_early_abort |
324 | .word pabort_noifar | ||
324 | .word cpu_arm940_proc_init | 325 | .word cpu_arm940_proc_init |
325 | .word cpu_arm940_proc_fin | 326 | .word cpu_arm940_proc_fin |
326 | .word cpu_arm940_reset | 327 | .word cpu_arm940_reset |
diff --git a/arch/arm/mm/proc-arm946.S b/arch/arm/mm/proc-arm946.S index a60c1421d450..2218b0c01330 100644 --- a/arch/arm/mm/proc-arm946.S +++ b/arch/arm/mm/proc-arm946.S | |||
@@ -376,6 +376,7 @@ __arm946_setup: | |||
376 | .type arm946_processor_functions, #object | 376 | .type arm946_processor_functions, #object |
377 | ENTRY(arm946_processor_functions) | 377 | ENTRY(arm946_processor_functions) |
378 | .word nommu_early_abort | 378 | .word nommu_early_abort |
379 | .word pabort_noifar | ||
379 | .word cpu_arm946_proc_init | 380 | .word cpu_arm946_proc_init |
380 | .word cpu_arm946_proc_fin | 381 | .word cpu_arm946_proc_fin |
381 | .word cpu_arm946_reset | 382 | .word cpu_arm946_reset |
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S index 4848eeac86b6..c85c1f50e396 100644 --- a/arch/arm/mm/proc-arm9tdmi.S +++ b/arch/arm/mm/proc-arm9tdmi.S | |||
@@ -64,6 +64,7 @@ __arm9tdmi_setup: | |||
64 | .type arm9tdmi_processor_functions, #object | 64 | .type arm9tdmi_processor_functions, #object |
65 | ENTRY(arm9tdmi_processor_functions) | 65 | ENTRY(arm9tdmi_processor_functions) |
66 | .word nommu_early_abort | 66 | .word nommu_early_abort |
67 | .word pabort_noifar | ||
67 | .word cpu_arm9tdmi_proc_init | 68 | .word cpu_arm9tdmi_proc_init |
68 | .word cpu_arm9tdmi_proc_fin | 69 | .word cpu_arm9tdmi_proc_fin |
69 | .word cpu_arm9tdmi_reset | 70 | .word cpu_arm9tdmi_reset |
diff --git a/arch/arm/mm/proc-feroceon.S b/arch/arm/mm/proc-feroceon.S index 2f169b28e938..90e7594e29b1 100644 --- a/arch/arm/mm/proc-feroceon.S +++ b/arch/arm/mm/proc-feroceon.S | |||
@@ -423,6 +423,7 @@ feroceon_crval: | |||
423 | .type feroceon_processor_functions, #object | 423 | .type feroceon_processor_functions, #object |
424 | feroceon_processor_functions: | 424 | feroceon_processor_functions: |
425 | .word v5t_early_abort | 425 | .word v5t_early_abort |
426 | .word pabort_noifar | ||
426 | .word cpu_feroceon_proc_init | 427 | .word cpu_feroceon_proc_init |
427 | .word cpu_feroceon_proc_fin | 428 | .word cpu_feroceon_proc_fin |
428 | .word cpu_feroceon_reset | 429 | .word cpu_feroceon_reset |
@@ -430,7 +431,6 @@ feroceon_processor_functions: | |||
430 | .word cpu_feroceon_dcache_clean_area | 431 | .word cpu_feroceon_dcache_clean_area |
431 | .word cpu_feroceon_switch_mm | 432 | .word cpu_feroceon_switch_mm |
432 | .word cpu_feroceon_set_pte_ext | 433 | .word cpu_feroceon_set_pte_ext |
433 | .word pabort_noifar | ||
434 | .size feroceon_processor_functions, . - feroceon_processor_functions | 434 | .size feroceon_processor_functions, . - feroceon_processor_functions |
435 | 435 | ||
436 | .section ".rodata" | 436 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S index 4db3d6299a2b..9818195dbf11 100644 --- a/arch/arm/mm/proc-sa110.S +++ b/arch/arm/mm/proc-sa110.S | |||
@@ -216,6 +216,7 @@ sa110_crval: | |||
216 | .type sa110_processor_functions, #object | 216 | .type sa110_processor_functions, #object |
217 | ENTRY(sa110_processor_functions) | 217 | ENTRY(sa110_processor_functions) |
218 | .word v4_early_abort | 218 | .word v4_early_abort |
219 | .word pabort_noifar | ||
219 | .word cpu_sa110_proc_init | 220 | .word cpu_sa110_proc_init |
220 | .word cpu_sa110_proc_fin | 221 | .word cpu_sa110_proc_fin |
221 | .word cpu_sa110_reset | 222 | .word cpu_sa110_reset |
@@ -223,7 +224,6 @@ ENTRY(sa110_processor_functions) | |||
223 | .word cpu_sa110_dcache_clean_area | 224 | .word cpu_sa110_dcache_clean_area |
224 | .word cpu_sa110_switch_mm | 225 | .word cpu_sa110_switch_mm |
225 | .word cpu_sa110_set_pte_ext | 226 | .word cpu_sa110_set_pte_ext |
226 | .word pabort_noifar | ||
227 | .size sa110_processor_functions, . - sa110_processor_functions | 227 | .size sa110_processor_functions, . - sa110_processor_functions |
228 | 228 | ||
229 | .section ".rodata" | 229 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S index 3cdef043760f..c5fe27ad2892 100644 --- a/arch/arm/mm/proc-sa1100.S +++ b/arch/arm/mm/proc-sa1100.S | |||
@@ -231,6 +231,7 @@ sa1100_crval: | |||
231 | .type sa1100_processor_functions, #object | 231 | .type sa1100_processor_functions, #object |
232 | ENTRY(sa1100_processor_functions) | 232 | ENTRY(sa1100_processor_functions) |
233 | .word v4_early_abort | 233 | .word v4_early_abort |
234 | .word pabort_noifar | ||
234 | .word cpu_sa1100_proc_init | 235 | .word cpu_sa1100_proc_init |
235 | .word cpu_sa1100_proc_fin | 236 | .word cpu_sa1100_proc_fin |
236 | .word cpu_sa1100_reset | 237 | .word cpu_sa1100_reset |
@@ -238,7 +239,6 @@ ENTRY(sa1100_processor_functions) | |||
238 | .word cpu_sa1100_dcache_clean_area | 239 | .word cpu_sa1100_dcache_clean_area |
239 | .word cpu_sa1100_switch_mm | 240 | .word cpu_sa1100_switch_mm |
240 | .word cpu_sa1100_set_pte_ext | 241 | .word cpu_sa1100_set_pte_ext |
241 | .word pabort_noifar | ||
242 | .size sa1100_processor_functions, . - sa1100_processor_functions | 242 | .size sa1100_processor_functions, . - sa1100_processor_functions |
243 | 243 | ||
244 | .section ".rodata" | 244 | .section ".rodata" |
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index bf760ea2f789..5702ec58b2a2 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
@@ -219,6 +219,7 @@ v6_crval: | |||
219 | .type v6_processor_functions, #object | 219 | .type v6_processor_functions, #object |
220 | ENTRY(v6_processor_functions) | 220 | ENTRY(v6_processor_functions) |
221 | .word v6_early_abort | 221 | .word v6_early_abort |
222 | .word pabort_noifar | ||
222 | .word cpu_v6_proc_init | 223 | .word cpu_v6_proc_init |
223 | .word cpu_v6_proc_fin | 224 | .word cpu_v6_proc_fin |
224 | .word cpu_v6_reset | 225 | .word cpu_v6_reset |
@@ -226,7 +227,6 @@ ENTRY(v6_processor_functions) | |||
226 | .word cpu_v6_dcache_clean_area | 227 | .word cpu_v6_dcache_clean_area |
227 | .word cpu_v6_switch_mm | 228 | .word cpu_v6_switch_mm |
228 | .word cpu_v6_set_pte_ext | 229 | .word cpu_v6_set_pte_ext |
229 | .word pabort_noifar | ||
230 | .size v6_processor_functions, . - v6_processor_functions | 230 | .size v6_processor_functions, . - v6_processor_functions |
231 | 231 | ||
232 | .type cpu_arch_name, #object | 232 | .type cpu_arch_name, #object |
diff --git a/arch/arm/mm/proc-v7.S b/arch/arm/mm/proc-v7.S index a1d7331cd64c..b49f9a4c82c8 100644 --- a/arch/arm/mm/proc-v7.S +++ b/arch/arm/mm/proc-v7.S | |||
@@ -205,6 +205,7 @@ __v7_setup_stack: | |||
205 | .type v7_processor_functions, #object | 205 | .type v7_processor_functions, #object |
206 | ENTRY(v7_processor_functions) | 206 | ENTRY(v7_processor_functions) |
207 | .word v7_early_abort | 207 | .word v7_early_abort |
208 | .word pabort_ifar | ||
208 | .word cpu_v7_proc_init | 209 | .word cpu_v7_proc_init |
209 | .word cpu_v7_proc_fin | 210 | .word cpu_v7_proc_fin |
210 | .word cpu_v7_reset | 211 | .word cpu_v7_reset |
@@ -212,7 +213,6 @@ ENTRY(v7_processor_functions) | |||
212 | .word cpu_v7_dcache_clean_area | 213 | .word cpu_v7_dcache_clean_area |
213 | .word cpu_v7_switch_mm | 214 | .word cpu_v7_switch_mm |
214 | .word cpu_v7_set_pte_ext | 215 | .word cpu_v7_set_pte_ext |
215 | .word pabort_ifar | ||
216 | .size v7_processor_functions, . - v7_processor_functions | 216 | .size v7_processor_functions, . - v7_processor_functions |
217 | 217 | ||
218 | .type cpu_arch_name, #object | 218 | .type cpu_arch_name, #object |
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index d95921a2ab99..3533741a76f6 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
@@ -450,6 +450,7 @@ xsc3_crval: | |||
450 | .type xsc3_processor_functions, #object | 450 | .type xsc3_processor_functions, #object |
451 | ENTRY(xsc3_processor_functions) | 451 | ENTRY(xsc3_processor_functions) |
452 | .word v5t_early_abort | 452 | .word v5t_early_abort |
453 | .word pabort_noifar | ||
453 | .word cpu_xsc3_proc_init | 454 | .word cpu_xsc3_proc_init |
454 | .word cpu_xsc3_proc_fin | 455 | .word cpu_xsc3_proc_fin |
455 | .word cpu_xsc3_reset | 456 | .word cpu_xsc3_reset |
diff --git a/arch/arm/mm/proc-xscale.S b/arch/arm/mm/proc-xscale.S index 1a6d89823dff..2dd85273976f 100644 --- a/arch/arm/mm/proc-xscale.S +++ b/arch/arm/mm/proc-xscale.S | |||
@@ -527,6 +527,7 @@ xscale_crval: | |||
527 | .type xscale_processor_functions, #object | 527 | .type xscale_processor_functions, #object |
528 | ENTRY(xscale_processor_functions) | 528 | ENTRY(xscale_processor_functions) |
529 | .word v5t_early_abort | 529 | .word v5t_early_abort |
530 | .word pabort_noifar | ||
530 | .word cpu_xscale_proc_init | 531 | .word cpu_xscale_proc_init |
531 | .word cpu_xscale_proc_fin | 532 | .word cpu_xscale_proc_fin |
532 | .word cpu_xscale_reset | 533 | .word cpu_xscale_reset |
@@ -534,7 +535,6 @@ ENTRY(xscale_processor_functions) | |||
534 | .word cpu_xscale_dcache_clean_area | 535 | .word cpu_xscale_dcache_clean_area |
535 | .word cpu_xscale_switch_mm | 536 | .word cpu_xscale_switch_mm |
536 | .word cpu_xscale_set_pte_ext | 537 | .word cpu_xscale_set_pte_ext |
537 | .word pabort_noifar | ||
538 | .size xscale_processor_functions, . - xscale_processor_functions | 538 | .size xscale_processor_functions, . - xscale_processor_functions |
539 | 539 | ||
540 | .section ".rodata" | 540 | .section ".rodata" |