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

Commit 81e7009e authored Oct 18, 2005 by Stephen Rothwell

powerpc: merge ppc signal.c and ppc64 signal32.c



Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>

parent 55d36339

arch/powerpc/kernel/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10,7 +10,7 @@ CFLAGS_prom_init.o += -fPIC
	CFLAGS_btext.o += -fPIC		CFLAGS_btext.o += -fPIC
	endif		endif

	obj-y := semaphore.o cputable.o ptrace.o		obj-y := semaphore.o cputable.o ptrace.o signal_32.o
	obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o		obj-$(CONFIG_PPC64) += binfmt_elf32.o sys_ppc32.o
	obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o		obj-$(CONFIG_ALTIVEC) += vecemu.o vector.o
	obj-$(CONFIG_POWER4) += idle_power4.o		obj-$(CONFIG_POWER4) += idle_power4.o

arch/ppc64/kernel/signal32.c→arch/powerpc/kernel/signal_32.c

+624 −353

File changed and moved.

Preview size limit exceeded, changes collapsed.

arch/ppc/kernel/Makefile

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -13,7 +13,7 @@ extra-$(CONFIG_POWER4) += idle_power4.o
	extra-y += vmlinux.lds		extra-y += vmlinux.lds

	obj-y := entry.o traps.o irq.o idle.o time.o misc.o \		obj-y := entry.o traps.o irq.o idle.o time.o misc.o \
	process.o signal.o align.o \		process.o align.o \
	syscalls.o setup.o \		syscalls.o setup.o \
	ppc_htab.o perfmon.o		ppc_htab.o perfmon.o
	obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o		obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
	@@ -38,7 +38,7 @@ endif

	else		else
	obj-y := irq.o idle.o time.o \		obj-y := irq.o idle.o time.o \
	signal.o align.o perfmon.o		align.o perfmon.o
	obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o		obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
	obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o		obj-$(CONFIG_SOFTWARE_SUSPEND) += swsusp.o
	obj-$(CONFIG_MODULES) += module.o		obj-$(CONFIG_MODULES) += module.o

arch/ppc/kernel/signal.c

deleted100644 → 0

+0 −771

File deleted.

Preview size limit exceeded, changes collapsed.

arch/ppc64/kernel/Makefile

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -15,7 +15,7 @@ obj-y += irq.o idle.o dma.o \
	time.o signal.o \		time.o signal.o \
	align.o bitops.o pacaData.o \		align.o bitops.o pacaData.o \
	udbg.o ioctl32.o \		udbg.o ioctl32.o \
	ptrace32.o signal32.o rtc.o \		ptrace32.o rtc.o \
	cpu_setup_power4.o \		cpu_setup_power4.o \
	iommu.o sysfs.o vdso.o pmc.o firmware.o		iommu.o sysfs.o vdso.o pmc.o firmware.o
	obj-y += vdso32/ vdso64/		obj-y += vdso32/ vdso64/