]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
powerpc: Merge rtas.c into arch/powerpc/kernel
authorPaul Mackerras <paulus@samba.org>
Wed, 26 Oct 2005 07:05:24 +0000 (17:05 +1000)
committerPaul Mackerras <paulus@samba.org>
Wed, 26 Oct 2005 07:05:24 +0000 (17:05 +1000)
commit033ef338b6e007dc081c6282a4f2a9dd761f8cd2
tree3c77fad71c3d9ba04ddcdaea33063aaf7520ddb0
parentf9bd170a87948a9e077149b70fb192c563770fdf
powerpc: Merge rtas.c into arch/powerpc/kernel

This splits arch/ppc64/kernel/rtas.c into arch/powerpc/kernel/rtas.c,
which contains generic RTAS functions useful on any CHRP platform,
and arch/powerpc/platforms/pseries/rtas-fw.[ch], which contain
some pSeries-specific firmware flashing bits.  The parts of rtas.c
that are to do with pSeries-specific error logging are protected
by a new CONFIG_RTAS_ERROR_LOGGING symbol.  The inclusion of rtas.o
is controlled by the CONFIG_PPC_RTAS symbol, and the relevant
platforms select that.

Signed-off-by: Paul Mackerras <paulus@samba.org>
13 files changed:
arch/powerpc/Kconfig
arch/powerpc/kernel/Makefile
arch/powerpc/kernel/asm-offsets.c
arch/powerpc/kernel/entry_32.S
arch/powerpc/kernel/prom.c
arch/powerpc/kernel/rtas.c [moved from arch/ppc64/kernel/rtas.c with 72% similarity]
arch/powerpc/platforms/pseries/Kconfig
arch/powerpc/platforms/pseries/Makefile
arch/powerpc/platforms/pseries/rtas-fw.c [new file with mode: 0644]
arch/powerpc/platforms/pseries/rtas-fw.h [new file with mode: 0644]
arch/powerpc/platforms/pseries/setup.c
arch/ppc64/Kconfig
arch/ppc64/kernel/Makefile