diff options
Diffstat (limited to 'arch/ppc/kernel/head_44x.S')
-rw-r--r-- | arch/ppc/kernel/head_44x.S | 32 |
1 files changed, 18 insertions, 14 deletions
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S index 599245b0407e..8b49679fad54 100644 --- a/arch/ppc/kernel/head_44x.S +++ b/arch/ppc/kernel/head_44x.S | |||
@@ -309,13 +309,13 @@ skpinv: addi r4,r4,1 /* Increment */ | |||
309 | 309 | ||
310 | interrupt_base: | 310 | interrupt_base: |
311 | /* Critical Input Interrupt */ | 311 | /* Critical Input Interrupt */ |
312 | CRITICAL_EXCEPTION(0x0100, CriticalInput, UnknownException) | 312 | CRITICAL_EXCEPTION(0x0100, CriticalInput, unknown_exception) |
313 | 313 | ||
314 | /* Machine Check Interrupt */ | 314 | /* Machine Check Interrupt */ |
315 | #ifdef CONFIG_440A | 315 | #ifdef CONFIG_440A |
316 | MCHECK_EXCEPTION(0x0200, MachineCheck, MachineCheckException) | 316 | MCHECK_EXCEPTION(0x0200, MachineCheck, machine_check_exception) |
317 | #else | 317 | #else |
318 | CRITICAL_EXCEPTION(0x0200, MachineCheck, MachineCheckException) | 318 | CRITICAL_EXCEPTION(0x0200, MachineCheck, machine_check_exception) |
319 | #endif | 319 | #endif |
320 | 320 | ||
321 | /* Data Storage Interrupt */ | 321 | /* Data Storage Interrupt */ |
@@ -442,7 +442,7 @@ interrupt_base: | |||
442 | #ifdef CONFIG_PPC_FPU | 442 | #ifdef CONFIG_PPC_FPU |
443 | FP_UNAVAILABLE_EXCEPTION | 443 | FP_UNAVAILABLE_EXCEPTION |
444 | #else | 444 | #else |
445 | EXCEPTION(0x2010, FloatingPointUnavailable, UnknownException, EXC_XFER_EE) | 445 | EXCEPTION(0x2010, FloatingPointUnavailable, unknown_exception, EXC_XFER_EE) |
446 | #endif | 446 | #endif |
447 | 447 | ||
448 | /* System Call Interrupt */ | 448 | /* System Call Interrupt */ |
@@ -451,21 +451,21 @@ interrupt_base: | |||
451 | EXC_XFER_EE_LITE(0x0c00, DoSyscall) | 451 | EXC_XFER_EE_LITE(0x0c00, DoSyscall) |
452 | 452 | ||
453 | /* Auxillary Processor Unavailable Interrupt */ | 453 | /* Auxillary Processor Unavailable Interrupt */ |
454 | EXCEPTION(0x2020, AuxillaryProcessorUnavailable, UnknownException, EXC_XFER_EE) | 454 | EXCEPTION(0x2020, AuxillaryProcessorUnavailable, unknown_exception, EXC_XFER_EE) |
455 | 455 | ||
456 | /* Decrementer Interrupt */ | 456 | /* Decrementer Interrupt */ |
457 | DECREMENTER_EXCEPTION | 457 | DECREMENTER_EXCEPTION |
458 | 458 | ||
459 | /* Fixed Internal Timer Interrupt */ | 459 | /* Fixed Internal Timer Interrupt */ |
460 | /* TODO: Add FIT support */ | 460 | /* TODO: Add FIT support */ |
461 | EXCEPTION(0x1010, FixedIntervalTimer, UnknownException, EXC_XFER_EE) | 461 | EXCEPTION(0x1010, FixedIntervalTimer, unknown_exception, EXC_XFER_EE) |
462 | 462 | ||
463 | /* Watchdog Timer Interrupt */ | 463 | /* Watchdog Timer Interrupt */ |
464 | /* TODO: Add watchdog support */ | 464 | /* TODO: Add watchdog support */ |
465 | #ifdef CONFIG_BOOKE_WDT | 465 | #ifdef CONFIG_BOOKE_WDT |
466 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException) | 466 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, WatchdogException) |
467 | #else | 467 | #else |
468 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, UnknownException) | 468 | CRITICAL_EXCEPTION(0x1020, WatchdogTimer, unknown_exception) |
469 | #endif | 469 | #endif |
470 | 470 | ||
471 | /* Data TLB Error Interrupt */ | 471 | /* Data TLB Error Interrupt */ |
@@ -743,14 +743,18 @@ _GLOBAL(set_context) | |||
743 | * goes at the beginning of the data segment, which is page-aligned. | 743 | * goes at the beginning of the data segment, which is page-aligned. |
744 | */ | 744 | */ |
745 | .data | 745 | .data |
746 | _GLOBAL(sdata) | 746 | .align 12 |
747 | _GLOBAL(empty_zero_page) | 747 | .globl sdata |
748 | sdata: | ||
749 | .globl empty_zero_page | ||
750 | empty_zero_page: | ||
748 | .space 4096 | 751 | .space 4096 |
749 | 752 | ||
750 | /* | 753 | /* |
751 | * To support >32-bit physical addresses, we use an 8KB pgdir. | 754 | * To support >32-bit physical addresses, we use an 8KB pgdir. |
752 | */ | 755 | */ |
753 | _GLOBAL(swapper_pg_dir) | 756 | .globl swapper_pg_dir |
757 | swapper_pg_dir: | ||
754 | .space 8192 | 758 | .space 8192 |
755 | 759 | ||
756 | /* Reserved 4k for the critical exception stack & 4k for the machine | 760 | /* Reserved 4k for the critical exception stack & 4k for the machine |
@@ -759,13 +763,15 @@ _GLOBAL(swapper_pg_dir) | |||
759 | .align 12 | 763 | .align 12 |
760 | exception_stack_bottom: | 764 | exception_stack_bottom: |
761 | .space BOOKE_EXCEPTION_STACK_SIZE | 765 | .space BOOKE_EXCEPTION_STACK_SIZE |
762 | _GLOBAL(exception_stack_top) | 766 | .globl exception_stack_top |
767 | exception_stack_top: | ||
763 | 768 | ||
764 | /* | 769 | /* |
765 | * This space gets a copy of optional info passed to us by the bootstrap | 770 | * This space gets a copy of optional info passed to us by the bootstrap |
766 | * which is used to pass parameters into the kernel like root=/dev/sda1, etc. | 771 | * which is used to pass parameters into the kernel like root=/dev/sda1, etc. |
767 | */ | 772 | */ |
768 | _GLOBAL(cmd_line) | 773 | .globl cmd_line |
774 | cmd_line: | ||
769 | .space 512 | 775 | .space 512 |
770 | 776 | ||
771 | /* | 777 | /* |
@@ -774,5 +780,3 @@ _GLOBAL(cmd_line) | |||
774 | */ | 780 | */ |
775 | abatron_pteptrs: | 781 | abatron_pteptrs: |
776 | .space 8 | 782 | .space 8 |
777 | |||
778 | |||