Commit 81e7009e authored by Stephen Rothwell's avatar Stephen Rothwell

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

Signed-off-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
parent 55d36339
......@@ -10,7 +10,7 @@ CFLAGS_prom_init.o += -fPIC
CFLAGS_btext.o += -fPIC
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_ALTIVEC) += vecemu.o vector.o
obj-$(CONFIG_POWER4) += idle_power4.o
......
......@@ -13,7 +13,7 @@ extra-$(CONFIG_POWER4) += idle_power4.o
extra-y += vmlinux.lds
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 \
ppc_htab.o perfmon.o
obj-$(CONFIG_6xx) += l2cr.o cpu_setup_6xx.o
......@@ -38,7 +38,7 @@ endif
else
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_SOFTWARE_SUSPEND) += swsusp.o
obj-$(CONFIG_MODULES) += module.o
......
This diff is collapsed.
......@@ -15,7 +15,7 @@ obj-y += irq.o idle.o dma.o \
time.o signal.o \
align.o bitops.o pacaData.o \
udbg.o ioctl32.o \
ptrace32.o signal32.o rtc.o \
ptrace32.o rtc.o \
cpu_setup_power4.o \
iommu.o sysfs.o vdso.o pmc.o firmware.o
obj-y += vdso32/ vdso64/
......
......@@ -70,18 +70,18 @@ typedef struct compat_siginfo {
#define __old_sigaction32 old_sigaction32
struct __old_sigaction32 {
unsigned sa_handler;
compat_uptr_t sa_handler;
compat_old_sigset_t sa_mask;
unsigned int sa_flags;
unsigned sa_restorer; /* not used by Linux/SPARC yet */
compat_uptr_t sa_restorer; /* not used by Linux/SPARC yet */
};
struct sigaction32 {
unsigned int sa_handler; /* Really a pointer, but need to deal with 32 bits */
compat_uptr_t sa_handler; /* Really a pointer, but need to deal with 32 bits */
unsigned int sa_flags;
unsigned int sa_restorer; /* Another 32 bit pointer */
compat_uptr_t sa_restorer; /* Another 32 bit pointer */
compat_sigset_t sa_mask; /* A 32 bit mask */
};
......@@ -94,9 +94,9 @@ typedef struct sigaltstack_32 {
struct sigcontext32 {
unsigned int _unused[4];
int signal;
unsigned int handler;
compat_uptr_t handler;
unsigned int oldmask;
u32 regs; /* 4 byte pointer to the pt_regs32 structure. */
compat_uptr_t regs; /* 4 byte pointer to the pt_regs32 structure. */
};
struct mcontext32 {
......@@ -111,7 +111,7 @@ struct ucontext32 {
unsigned int uc_link;
stack_32_t uc_stack;
int uc_pad[7];
u32 uc_regs; /* points to uc_mcontext field */
compat_uptr_t uc_regs; /* points to uc_mcontext field */
compat_sigset_t uc_sigmask; /* mask last for extensibility */
/* glibc has 1024-bit signal masks, ours are 64-bit */
int uc_maskext[30];
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment