err.no Git - linux-2.6/commit

]> err.no Git - linux-2.6/commit

author	Stephen Rothwell <sfr@canb.auug.org.au>
	Sat, 1 Oct 2005 08:43:42 +0000 (18:43 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Sat, 1 Oct 2005 08:43:42 +0000 (18:43 +1000)
commit	dc1c1ca3dcd94c545c5e01d7c06b46824d43f4d0
tree	fa088ac3eae8709dd379deda6f31d5b29197d4c9	tree \| snapshot
parent	d96024c688b59d4d1e60dbb0e226964eb758aa01	commit \| diff

powerpc: merge idle_power4.S and trapc.s

Use idle_power4.S from ppc64 as we are not going to support
32 bit power4 in the merged tree.

Merge ppc64 traps.c into powerpc traps.c:
use ppc64 versions of exception routine names
(as they don't have StudlyCaps)
make all the versions if die() have the same
prototype

Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

22 files changed:

arch/powerpc/Kconfig		diff \| blob \| history
arch/powerpc/kernel/head.S		diff \| blob \| history
arch/powerpc/kernel/head_44x.S		diff \| blob \| history
arch/powerpc/kernel/head_4xx.S		diff \| blob \| history
arch/powerpc/kernel/head_8xx.S		diff \| blob \| history
arch/powerpc/kernel/head_fsl_booke.S		diff \| blob \| history
arch/powerpc/kernel/idle_power4.S	[moved from arch/ppc64/kernel/idle_power4.S with 98% similarity]	diff \| blob \| history
arch/powerpc/kernel/ppc_ksyms.c		diff \| blob \| history
arch/powerpc/kernel/traps.c		diff \| blob \| history
arch/ppc/kernel/head.S		diff \| blob \| history
arch/ppc/kernel/head_44x.S		diff \| blob \| history
arch/ppc/kernel/head_4xx.S		diff \| blob \| history
arch/ppc/kernel/head_8xx.S		diff \| blob \| history
arch/ppc/kernel/head_booke.h		diff \| blob \| history
arch/ppc/kernel/head_fsl_booke.S		diff \| blob \| history
arch/ppc/kernel/ppc_ksyms.c		diff \| blob \| history
arch/ppc/kernel/traps.c		diff \| blob \| history
arch/ppc/syslib/ibm44x_common.c		diff \| blob \| history
arch/ppc/syslib/ppc4xx_setup.c		diff \| blob \| history
arch/ppc64/kernel/Makefile		diff \| blob \| history
arch/ppc64/kernel/traps.c	[deleted file]	blob \| history
include/asm-ppc/system.h		diff \| blob \| history

Linux 2.6 source tree

RSS Atom