luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[PATCH] Remove occurences of PPC_MULTIPLATFORM in head_64.S

Browse Source 
Since iSeries is merged to MULTIPLATFORM, there is no way to build a 64bit
kernel without MULTIPLATFORM, so PPC_MULTIPLATFORM can be removed in
64bit-only files.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
This commit is contained in:
s.hauer@pengutronix.de 2006-11-02 13:56:04 +01:00 committed by Paul Mackerras
parent 68e1300a55
commit a7a1ed3050
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/powerpc/kernel/entry_64.S
View File

@ -736,8 +736,6 @@ _STATIC(rtas_restore_regs)
#endif /* CONFIG_PPC_RTAS */ #endif /* CONFIG_PPC_RTAS */
#ifdef CONFIG_PPC_MULTIPLATFORM
_GLOBAL(enter_prom) _GLOBAL(enter_prom)
mflr r0 mflr r0
std r0,16(r1) std r0,16(r1)
@ -822,5 +820,3 @@ _GLOBAL(enter_prom)
ld r0,16(r1) ld r0,16(r1)
mtlr r0 mtlr r0
blr blr
#endif /* CONFIG_PPC_MULTIPLATFORM */

11
arch/powerpc/kernel/head_64.S
View File

@ -72,13 +72,11 @@
.text .text
.globl _stext .globl _stext
_stext: _stext:
#ifdef CONFIG_PPC_MULTIPLATFORM
_GLOBAL(__start) _GLOBAL(__start)
/* NOP this out unconditionally */ /* NOP this out unconditionally */
BEGIN_FTR_SECTION BEGIN_FTR_SECTION
b .__start_initialization_multiplatform b .__start_initialization_multiplatform
END_FTR_SECTION(0, 1) END_FTR_SECTION(0, 1)
#endif /* CONFIG_PPC_MULTIPLATFORM */
/* Catch branch to 0 in real mode */ /* Catch branch to 0 in real mode */
trap trap
@ -1643,7 +1641,6 @@ _STATIC(__start_initialization_iSeries)
b .start_here_common b .start_here_common
#endif /* CONFIG_PPC_ISERIES */ #endif /* CONFIG_PPC_ISERIES */
#ifdef CONFIG_PPC_MULTIPLATFORM
_STATIC(__mmu_off) _STATIC(__mmu_off)
mfmsr r3 mfmsr r3
@ -1669,13 +1666,11 @@ _STATIC(__mmu_off)
* *
*/ */
_GLOBAL(__start_initialization_multiplatform) _GLOBAL(__start_initialization_multiplatform)
#ifdef CONFIG_PPC_MULTIPLATFORM
/* /*
* Are we booted from a PROM Of-type client-interface ? * Are we booted from a PROM Of-type client-interface ?
*/ */
cmpldi cr0,r5,0 cmpldi cr0,r5,0
bne .__boot_from_prom /* yes -> prom */ bne .__boot_from_prom /* yes -> prom */
#endif
/* Save parameters */ /* Save parameters */
mr r31,r3 mr r31,r3
@ -1702,7 +1697,6 @@ _GLOBAL(__start_initialization_multiplatform)
bl .__mmu_off bl .__mmu_off
b .__after_prom_start b .__after_prom_start
#ifdef CONFIG_PPC_MULTIPLATFORM
_STATIC(__boot_from_prom) _STATIC(__boot_from_prom)
/* Save parameters */ /* Save parameters */
mr r31,r3 mr r31,r3
@ -1742,7 +1736,6 @@ _STATIC(__boot_from_prom)
bl .prom_init bl .prom_init
/* We never return */ /* We never return */
trap trap
#endif
/* /*
* At this point, r3 contains the physical address we are running at, * At this point, r3 contains the physical address we are running at,
@ -1798,8 +1791,6 @@ _STATIC(__after_prom_start)
bl .copy_and_flush /* copy the rest */ bl .copy_and_flush /* copy the rest */
b .start_here_multiplatform b .start_here_multiplatform
#endif /* CONFIG_PPC_MULTIPLATFORM */
/* /*
* Copy routine used to copy the kernel to start at physical address 0 * Copy routine used to copy the kernel to start at physical address 0
* and flush and invalidate the caches as needed. * and flush and invalidate the caches as needed.
@ -1964,7 +1955,6 @@ _GLOBAL(enable_64b_mode)
isync isync
blr blr
#ifdef CONFIG_PPC_MULTIPLATFORM
/* /*
* This is where the main kernel code starts. * This is where the main kernel code starts.
*/ */
@ -2035,7 +2025,6 @@ _STATIC(start_here_multiplatform)
mtspr SPRN_SRR1,r4 mtspr SPRN_SRR1,r4
rfid rfid
b . /* prevent speculative execution */ b . /* prevent speculative execution */
#endif /* CONFIG_PPC_MULTIPLATFORM */
/* This is where all platforms converge execution */ /* This is where all platforms converge execution */
_STATIC(start_here_common) _STATIC(start_here_common)