[PATCH 6/9] powerpc: merge idle_power4.S and fixup traps.c

[Kumar Gala]

(My first attempt at posting to the list failed due to size)

I really dont like the ideal of splitting up traps.c into traps32.c  
and traps64.c.  This defeats the purpose of the merge.  I expect that  
a significant portion of traps.c is common (or can be made to be)  
between all powerpc's.

- kumar


On Sep 30, 2005, at 9:00 AM, Stephen Rothwell wrote:

> Use idle_power4.S from ppc64 as we are not going to support
> 32 bit power4 in the merged tree.
>
> create traps{32,64}.c as these are hard to merge.
>
> Signed-off-by: Stephen Rothwell <sfr at canb.auug.org.au>
> ---
>
>  arch/powerpc/Kconfig              |    4
>  arch/powerpc/kernel/Makefile      |    4
>  arch/powerpc/kernel/idle_power4.S |   78 +++
>  arch/powerpc/kernel/traps.c       | 1047
> -------------------------------------
>  arch/powerpc/kernel/traps32.c     | 1047
> +++++++++++++++++++++++++++++++++++++
>  arch/powerpc/kernel/traps64.c     |  568 ++++++++++++++++++++
>  arch/ppc64/kernel/Makefile        |   10
>  arch/ppc64/kernel/idle_power4.S   |   79 ---
>  arch/ppc64/kernel/traps.c         |  568 --------------------
>  9 files changed, 1707 insertions(+), 1698 deletions(-)
>  create mode 100644 arch/powerpc/kernel/idle_power4.S
>  delete mode 100644 arch/powerpc/kernel/traps.c
>  create mode 100644 arch/powerpc/kernel/traps32.c
>  create mode 100644 arch/powerpc/kernel/traps64.c
>  delete mode 100644 arch/ppc64/kernel/idle_power4.S
>  delete mode 100644 arch/ppc64/kernel/traps.c
>