[PATCH 0/9] more merge changes

[Stephen Rothwell]

Another series of patches to continue the merge.  These are some tidyups
and moving of more code and lead to enough merged for ppc64 legacy iSeries
to build and boot with ARCH=powerpc.  There is still a lot left to merge,
though.

As an aside, this leads to a machine that says this:

igosouth:~# uname -a
Linux igosouth 2.6.14-rc2sfr #1 SMP Fri Sep 30 17:16:03 EST 2005 powerpc GNU/Linux

i.e. it identifies itself as powerpc not ppc64. Which benh points out will
probably break all sorts of things :-)

I have built this for (my configs) pSeries, iSeries, g5, ARCH=ppc,
ARCH=powerpc ppc32 pmac, ARCH=powerpc iSeries and booted the ARCH=powerpc
iSeries kernel.  So hopefully I haven't broken too much.

Paulus, I will let you know where you can find my git tree in a separate email.
-- 
Cheers,
Stephen Rothwell                    sfr at canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

 arch/powerpc/Kconfig                           |   12 +
 arch/powerpc/Kconfig.debug                     |    2 
 arch/powerpc/Makefile                          |   28 +--
 arch/powerpc/kernel/Makefile                   |   20 +-
 arch/powerpc/kernel/asm-offsets.c              |  220 +++++++++++++------------
 arch/powerpc/kernel/head_64.S                  |    9 -
 arch/powerpc/kernel/idle_power4.S              |    5 
 arch/powerpc/kernel/vmlinux.lds                |  174 -------------------
 arch/powerpc/kernel/vmlinux.lds.S              |  190 ++++++++++++++++++++-
 arch/powerpc/platforms/iseries/call_sm.h       |    7 
 arch/powerpc/platforms/iseries/ipl_parms.h     |    7 
 arch/powerpc/platforms/iseries/irq.c           |    3 
 arch/powerpc/platforms/iseries/irq.h           |    8 
 arch/powerpc/platforms/iseries/lpardata.c      |   10 -
 arch/powerpc/platforms/iseries/lpevents.c      |    2 
 arch/powerpc/platforms/iseries/main_store.h    |    7 
 arch/powerpc/platforms/iseries/pci.c           |    3 
 arch/powerpc/platforms/iseries/proc.c          |    5 
 arch/powerpc/platforms/iseries/processor_vpd.h |    7 
 arch/powerpc/platforms/iseries/release_data.h  |    7 
 arch/powerpc/platforms/iseries/setup.c         |   10 -
 arch/powerpc/platforms/iseries/spcomm_area.h   |    7 
 arch/powerpc/platforms/iseries/vpd_areas.h     |    7 
 arch/ppc/kernel/Makefile                       |    2 
 arch/ppc/kernel/fpu.S                          |  133 ---------------
 arch/ppc/kernel/vector.S                       |  217 ------------------------
 arch/ppc64/Makefile                            |    2 
 arch/ppc64/kernel/Makefile                     |   16 -
 arch/ppc64/kernel/vector.S                     |  172 -------------------
 include/asm-powerpc/system.h                   |    4 
 include/asm-ppc64/iSeries/iSeries_irq.h        |    8 
 31 files changed, 406 insertions(+), 898 deletions(-)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
URL: <http://lists.ozlabs.org/pipermail/linuxppc-dev/attachments/20050930/4ef249be/attachment.pgp>