diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:51 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-13 03:24:59 -0400 |
| commit | 2c96c142e941041973faab20ca3b82d57f435c5e (patch) | |
| tree | 45188f0ecb3f4bb7408a7219f8fcd041d500235a /arch/arm/mm/proc-xsc3.S | |
| parent | 3c355863fb32070a2800f41106519c5c3038623a (diff) | |
| parent | 8ad807318fcd62aba0e18c7c7fbfcc1af3fcdbab (diff) | |
Merge branch 'tracing/urgent' into tracing/core
Merge reason: Pick up tracing/filters fix from the urgent queue,
we will queue up dependent patches.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/arm/mm/proc-xsc3.S')
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index 33515c214b92..2028f3702881 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S | |||
| @@ -428,7 +428,7 @@ xsc3_crval: | |||
| 428 | .type xsc3_processor_functions, #object | 428 | .type xsc3_processor_functions, #object |
| 429 | ENTRY(xsc3_processor_functions) | 429 | ENTRY(xsc3_processor_functions) |
| 430 | .word v5t_early_abort | 430 | .word v5t_early_abort |
| 431 | .word pabort_noifar | 431 | .word legacy_pabort |
| 432 | .word cpu_xsc3_proc_init | 432 | .word cpu_xsc3_proc_init |
| 433 | .word cpu_xsc3_proc_fin | 433 | .word cpu_xsc3_proc_fin |
| 434 | .word cpu_xsc3_reset | 434 | .word cpu_xsc3_reset |