Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8882a4da authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Move various ppc64 files with no ppc32 equivalent to powerpc 



This patch moves a bunch of files from arch/ppc64 and
include/asm-ppc64 which have no equivalents in ppc32 code into
arch/powerpc and include/asm-powerpc.  The file affected are:
	abs_addr.h
	compat.h
	lppaca.h
	paca.h
	tce.h
	cpu_setup_power4.S
	ioctl32.c
	firmware.c
	pacaData.c

The only changes apart from the move and corresponding Makefile
changes are:
	- #ifndef/#define in includes updated to _ASM_POWERPC_ form
	- trailing whitespace removed
	- comments giving full paths removed
	- pacaData.c renamed paca.c to remove studlyCaps
	- Misplaced { moved in lppaca.h

Built and booted on POWER5 LPAR (ARCH=powerpc and ARCH=ppc64), built
for 32-bit powermac (ARCH=powerpc).

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 584224e4

arch/powerpc/kernel/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ 


ifeq ($(CONFIG_PPC64),y)

EXTRA_CFLAGS	+= -mno-minimal-toc

CFLAGS_ioctl32.o += -Ifs/

endif

ifeq ($(CONFIG_PPC32),y)

CFLAGS_prom_init.o      += -fPIC
@@ -13,7 +14,9 @@ endif 
obj-y				:= semaphore.o cputable.o ptrace.o syscalls.o \

				   signal_32.o pmc.o

obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o

				   signal_64.o ptrace32.o systbl.o \

				   paca.o ioctl32.o cpu_setup_power4.o \

				   firmware.o

obj-$(CONFIG_ALTIVEC)		+= vecemu.o vector.o

obj-$(CONFIG_POWER4)		+= idle_power4.o

obj-$(CONFIG_PPC_OF)		+= of_device.o

arch/ppc64/kernel/cpu_setup_power4.S→arch/powerpc/kernel/cpu_setup_power4.S

+4 −4

File changed and moved.

Contains only whitespace changes.

arch/ppc64/kernel/firmware.c→arch/powerpc/kernel/firmware.c

+0 −2
Original line number Diff line number Diff line 
/*

 *  arch/ppc64/kernel/firmware.c

 *

 *  Extracted from cputable.c

 *

 *  Copyright (C) 2001 Ben. Herrenschmidt (benh@kernel.crashing.org)

arch/ppc64/kernel/ioctl32.c→arch/powerpc/kernel/ioctl32.c

+2 −2

File changed and moved.

Contains only whitespace changes.

arch/ppc64/kernel/pacaData.c→arch/powerpc/kernel/paca.c

+1 −1

File changed and moved.

Contains only whitespace changes.