diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:12:03 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-11-06 20:12:03 -0500 |
commit | 1197ab2942f920f261952de0c392ac749a35796b (patch) | |
tree | 4922ccc8a6061e5ece6ac7420001f3bf4524ea92 /arch/powerpc/kernel/head_8xx.S | |
parent | ec773e99ab4abce07b1ae23117179c2861831964 (diff) | |
parent | 96cc017c5b7ec095ef047d3c1952b6b6bbf98943 (diff) |
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc
* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/benh/powerpc: (106 commits)
powerpc/p3060qds: Add support for P3060QDS board
powerpc/83xx: Add shutdown request support to MCU handling on MPC8349 MITX
powerpc/85xx: Make kexec to interate over online cpus
powerpc/fsl_booke: Fix comment in head_fsl_booke.S
powerpc/85xx: issue 15 EOI after core reset for FSL CoreNet devices
powerpc/8xxx: Fix interrupt handling in MPC8xxx GPIO driver
powerpc/85xx: Add 'fsl,pq3-gpio' compatiable for GPIO driver
powerpc/86xx: Correct Gianfar support for GE boards
powerpc/cpm: Clear muram before it is in use.
drivers/virt: add ioctl for 32-bit compat on 64-bit to fsl-hv-manager
powerpc/fsl_msi: add support for "msi-address-64" property
powerpc/85xx: Setup secondary cores PIR with hard SMP id
powerpc/fsl-booke: Fix settlbcam for 64-bit
powerpc/85xx: Adding DCSR node to dtsi device trees
powerpc/85xx: clean up FPGA device tree nodes for Freecsale QorIQ boards
powerpc/85xx: fix PHYS_64BIT selection for P1022DS
powerpc/fsl-booke: Fix setup_initial_memory_limit to not blindly map
powerpc: respect mem= setting for early memory limit setup
powerpc: Update corenet64_smp_defconfig
powerpc: Update mpc85xx/corenet 32-bit defconfigs
...
Fix up trivial conflicts in:
- arch/powerpc/configs/40x/hcu4_defconfig
removed stale file, edited elsewhere
- arch/powerpc/include/asm/udbg.h, arch/powerpc/kernel/udbg.c:
added opal and gelic drivers vs added ePAPR driver
- drivers/tty/serial/8250.c
moved UPIO_TSI to powerpc vs removed UPIO_DWAPB support
Diffstat (limited to 'arch/powerpc/kernel/head_8xx.S')
-rw-r--r-- | arch/powerpc/kernel/head_8xx.S | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/arch/powerpc/kernel/head_8xx.S b/arch/powerpc/kernel/head_8xx.S index 1cbf64e6b41..b68cb173ba2 100644 --- a/arch/powerpc/kernel/head_8xx.S +++ b/arch/powerpc/kernel/head_8xx.S | |||
@@ -76,11 +76,7 @@ _ENTRY(_start); | |||
76 | */ | 76 | */ |
77 | .globl __start | 77 | .globl __start |
78 | __start: | 78 | __start: |
79 | mr r31,r3 /* save parameters */ | 79 | mr r31,r3 /* save device tree ptr */ |
80 | mr r30,r4 | ||
81 | mr r29,r5 | ||
82 | mr r28,r6 | ||
83 | mr r27,r7 | ||
84 | 80 | ||
85 | /* We have to turn on the MMU right away so we get cache modes | 81 | /* We have to turn on the MMU right away so we get cache modes |
86 | * set correctly. | 82 | * set correctly. |
@@ -723,11 +719,8 @@ start_here: | |||
723 | /* | 719 | /* |
724 | * Decide what sort of machine this is and initialize the MMU. | 720 | * Decide what sort of machine this is and initialize the MMU. |
725 | */ | 721 | */ |
726 | mr r3,r31 | 722 | li r3,0 |
727 | mr r4,r30 | 723 | mr r4,r31 |
728 | mr r5,r29 | ||
729 | mr r6,r28 | ||
730 | mr r7,r27 | ||
731 | bl machine_init | 724 | bl machine_init |
732 | bl MMU_init | 725 | bl MMU_init |
733 | 726 | ||