diff options
Diffstat (limited to 'arch/ppc64/kernel/head.S')
-rw-r--r-- | arch/ppc64/kernel/head.S | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S index accaa052d31f..13c03648a602 100644 --- a/arch/ppc64/kernel/head.S +++ b/arch/ppc64/kernel/head.S | |||
@@ -30,7 +30,6 @@ | |||
30 | #include <asm/processor.h> | 30 | #include <asm/processor.h> |
31 | #include <asm/page.h> | 31 | #include <asm/page.h> |
32 | #include <asm/mmu.h> | 32 | #include <asm/mmu.h> |
33 | #include <asm/naca.h> | ||
34 | #include <asm/systemcfg.h> | 33 | #include <asm/systemcfg.h> |
35 | #include <asm/ppc_asm.h> | 34 | #include <asm/ppc_asm.h> |
36 | #include <asm/offsets.h> | 35 | #include <asm/offsets.h> |
@@ -511,24 +510,10 @@ _GLOBAL(do_stab_bolted_pSeries) | |||
511 | mfspr r12,SPRG2 | 510 | mfspr r12,SPRG2 |
512 | EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted) | 511 | EXCEPTION_PROLOG_PSERIES(PACA_EXSLB, .do_stab_bolted) |
513 | 512 | ||
514 | |||
515 | /* Space for the naca. Architected to be located at real address | ||
516 | * NACA_PHYS_ADDR. Various tools rely on this location being fixed. | ||
517 | * The first dword of the naca is required by iSeries LPAR to | ||
518 | * point to itVpdAreas. On pSeries native, this value is not used. | ||
519 | */ | ||
520 | . = NACA_PHYS_ADDR | ||
521 | .globl __end_interrupts | ||
522 | __end_interrupts: | ||
523 | #ifdef CONFIG_PPC_ISERIES | ||
524 | .globl naca | ||
525 | naca: | ||
526 | .llong itVpdAreas | ||
527 | .llong 0 /* xRamDisk */ | ||
528 | .llong 0 /* xRamDiskSize */ | ||
529 | 513 | ||
530 | . = 0x6100 | 514 | . = 0x6100 |
531 | 515 | ||
516 | #ifdef CONFIG_PPC_ISERIES | ||
532 | /*** ISeries-LPAR interrupt handlers ***/ | 517 | /*** ISeries-LPAR interrupt handlers ***/ |
533 | 518 | ||
534 | STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC) | 519 | STD_EXCEPTION_ISERIES(0x200, machine_check, PACA_EXMC) |