[prev in list] [next in list] [prev in thread] [next in thread]
List: git-commits-head
Subject: ppc64: sigcontext_struct -> sigcontext, from Stephen Rothwell
From: Linux Kernel Mailing List <linux-kernel () vger ! kernel ! org>
Date: 2002-09-25 14:02:15
[Download RAW message or body]
ChangeSet 1.573.32.3, 2002/09/26 00:02:15+10:00, anton@samba.org
ppc64: sigcontext_struct -> sigcontext, from Stephen Rothwell
# This patch includes the following deltas:
# ChangeSet 1.573.32.2 -> 1.573.32.3
# arch/ppc64/kernel/signal.c 1.17 -> 1.18
# include/asm-ppc64/ucontext.h 1.1 -> 1.2
# include/asm-ppc64/sigcontext.h 1.1 -> 1.2
# include/asm-ppc64/ppc32.h 1.1 -> 1.2
# arch/ppc64/kernel/signal32.c 1.23 -> 1.24
#
arch/ppc64/kernel/signal.c | 12 ++++++------
arch/ppc64/kernel/signal32.c | 13 ++++++-------
include/asm-ppc64/ppc32.h | 4 ++--
include/asm-ppc64/sigcontext.h | 2 +-
include/asm-ppc64/ucontext.h | 2 +-
5 files changed, 16 insertions(+), 17 deletions(-)
diff -Nru a/arch/ppc64/kernel/signal.c b/arch/ppc64/kernel/signal.c
--- a/arch/ppc64/kernel/signal.c Wed Oct 16 10:08:24 2002
+++ b/arch/ppc64/kernel/signal.c Wed Oct 16 10:08:24 2002
@@ -213,7 +213,7 @@
struct pt_regs *regs)
{
struct rt_sigframe *rt_sf;
- struct sigcontext_struct sigctx;
+ struct sigcontext sigctx;
struct sigregs *sr;
elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */
sigset_t set;
@@ -331,12 +331,12 @@
unsigned long r6, unsigned long r7, unsigned long r8,
struct pt_regs *regs)
{
- struct sigcontext_struct *sc, sigctx;
+ struct sigcontext *sc, sigctx;
struct sigregs *sr;
elf_gregset_t saved_regs; /* an array of ELF_NGREG unsigned longs */
sigset_t set;
- sc = (struct sigcontext_struct *)(regs->gpr[1] + __SIGNAL_FRAMESIZE);
+ sc = (struct sigcontext *)(regs->gpr[1] + __SIGNAL_FRAMESIZE);
if (copy_from_user(&sigctx, sc, sizeof(sigctx)))
goto badframe;
@@ -391,7 +391,7 @@
struct funct_descr_entry * funct_desc_ptr;
unsigned long temp_ptr;
- struct sigcontext_struct *sc = (struct sigcontext_struct *)newsp;
+ struct sigcontext *sc = (struct sigcontext *)newsp;
if (verify_area(VERIFY_WRITE, frame, sizeof(*frame)))
goto badframe;
@@ -440,7 +440,7 @@
static void handle_signal(unsigned long sig, siginfo_t *info, sigset_t *oldset,
struct pt_regs * regs, unsigned long *newspp, unsigned long frame)
{
- struct sigcontext_struct *sc;
+ struct sigcontext *sc;
struct rt_sigframe *rt_sf;
struct k_sigaction *ka = ¤t->sig->action[sig-1];
@@ -481,7 +481,7 @@
} else {
/* Put a sigcontext on the stack */
*newspp -= sizeof(*sc);
- sc = (struct sigcontext_struct *)*newspp;
+ sc = (struct sigcontext *)*newspp;
if (verify_area(VERIFY_WRITE, sc, sizeof(*sc)))
goto badframe;
diff -Nru a/arch/ppc64/kernel/signal32.c b/arch/ppc64/kernel/signal32.c
--- a/arch/ppc64/kernel/signal32.c Wed Oct 16 10:08:24 2002
+++ b/arch/ppc64/kernel/signal32.c Wed Oct 16 10:08:24 2002
@@ -218,14 +218,14 @@
unsigned long r6, unsigned long r7, unsigned long r8,
struct pt_regs *regs)
{
- struct sigcontext32_struct *sc, sigctx;
+ struct sigcontext32 *sc, sigctx;
struct sigregs32 *sr;
int ret;
elf_gregset_t32 saved_regs; /* an array of ELF_NGREG unsigned ints (32 bits) */
sigset_t set;
int i;
- sc = (struct sigcontext32_struct *)(regs->gpr[1] + __SIGNAL_FRAMESIZE32);
+ sc = (struct sigcontext32 *)(regs->gpr[1] + __SIGNAL_FRAMESIZE32);
if (copy_from_user(&sigctx, sc, sizeof(sigctx)))
goto badframe;
@@ -315,8 +315,7 @@
static void setup_frame32(struct pt_regs *regs, struct sigregs32 *frame,
unsigned int newsp)
{
- struct sigcontext32_struct *sc =
- (struct sigcontext32_struct *)(u64)newsp;
+ struct sigcontext32 *sc = (struct sigcontext32 *)(u64)newsp;
int i;
if (verify_area(VERIFY_WRITE, frame, sizeof(*frame)))
@@ -430,7 +429,7 @@
struct pt_regs * regs)
{
struct rt_sigframe_32 *rt_sf;
- struct sigcontext32_struct sigctx;
+ struct sigcontext32 sigctx;
struct sigregs32 *sr;
int ret;
elf_gregset_t32 saved_regs; /* an array of 32 bit register values */
@@ -958,7 +957,7 @@
sigset_t *oldset, struct pt_regs * regs, unsigned int *newspp,
unsigned int frame)
{
- struct sigcontext32_struct *sc;
+ struct sigcontext32 *sc;
struct rt_sigframe_32 *rt_sf;
struct k_sigaction *ka = ¤t->sig->action[sig-1];
@@ -1000,7 +999,7 @@
} else {
/* Put a sigcontext on the stack */
*newspp -= sizeof(*sc);
- sc = (struct sigcontext32_struct *)(u64)*newspp;
+ sc = (struct sigcontext32 *)(u64)*newspp;
if (verify_area(VERIFY_WRITE, sc, sizeof(*sc)))
goto badframe;
/*
diff -Nru a/include/asm-ppc64/ppc32.h b/include/asm-ppc64/ppc32.h
--- a/include/asm-ppc64/ppc32.h Wed Oct 16 10:08:24 2002
+++ b/include/asm-ppc64/ppc32.h Wed Oct 16 10:08:24 2002
@@ -212,7 +212,7 @@
unsigned int st_ctime;
};
-struct sigcontext32_struct {
+struct sigcontext32 {
unsigned int _unused[4];
int signal;
unsigned int handler;
@@ -224,7 +224,7 @@
unsigned int uc_flags;
unsigned int uc_link;
stack_32_t uc_stack;
- struct sigcontext32_struct uc_mcontext;
+ struct sigcontext32 uc_mcontext;
sigset_t uc_sigmask; /* mask last for extensibility */
};
diff -Nru a/include/asm-ppc64/sigcontext.h b/include/asm-ppc64/sigcontext.h
--- a/include/asm-ppc64/sigcontext.h Wed Oct 16 10:08:24 2002
+++ b/include/asm-ppc64/sigcontext.h Wed Oct 16 10:08:24 2002
@@ -10,7 +10,7 @@
#include <asm/ptrace.h>
-struct sigcontext_struct {
+struct sigcontext {
unsigned long _unused[4];
int signal;
unsigned long handler;
diff -Nru a/include/asm-ppc64/ucontext.h b/include/asm-ppc64/ucontext.h
--- a/include/asm-ppc64/ucontext.h Wed Oct 16 10:08:24 2002
+++ b/include/asm-ppc64/ucontext.h Wed Oct 16 10:08:24 2002
@@ -13,7 +13,7 @@
unsigned long uc_flags;
struct ucontext *uc_link;
stack_t uc_stack;
- struct sigcontext_struct uc_mcontext;
+ struct sigcontext uc_mcontext;
sigset_t uc_sigmask; /* mask last for extensibility */
};
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic