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

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

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



This patch moves a bunch more 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:
	hvcall.h
	proc_ppc64.c
	sysfs.c
	lparcfg.c
	rtas_pci.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

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 0f34f490

arch/powerpc/kernel/Makefile

+6 −2
Original line number Diff line number Diff line
@@ -16,13 +16,17 @@ obj-y := semaphore.o cputable.o ptrace.o syscalls.o \ 
obj-$(CONFIG_PPC64)		+= setup_64.o binfmt_elf32.o sys_ppc32.o \

				   signal_64.o ptrace32.o systbl.o \

				   paca.o ioctl32.o cpu_setup_power4.o \

				   firmware.o

				   firmware.o sysfs.o

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

obj-$(CONFIG_POWER4)		+= idle_power4.o

obj-$(CONFIG_PPC_OF)		+= of_device.o

obj-$(CONFIG_PPC_RTAS)		+= rtas.o

procfs-$(CONFIG_PPC64)		:= proc_ppc64.o

obj-$(CONFIG_PROC_FS)		+= $(procfs-y)

rtaspci-$(CONFIG_PPC64)		:= rtas_pci.o

obj-$(CONFIG_PPC_RTAS)		+= rtas.o $(rtaspci-y)

obj-$(CONFIG_RTAS_FLASH)	+= rtas_flash.o

obj-$(CONFIG_RTAS_PROC)		+= rtas-proc.o

obj-$(CONFIG_LPARCFG)		+= lparcfg.o

obj-$(CONFIG_IBMVIO)		+= vio.o

obj-$(CONFIG_GENERIC_TBSYNC)	+= smp-tbsync.o

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

+5 −5

File changed and moved.

Contains only whitespace changes.

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

+3 −5
Original line number Diff line number Diff line 
/*

 * arch/ppc64/kernel/proc_ppc64.c

 *

 * Copyright (C) 2001 Mike Corrigan & Dave Engebretsen IBM Corporation

 *

 * This program is free software; you can redistribute it and/or modify

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

+1 −1

File changed and moved.

Contains only whitespace changes.