* [PATCH] Consolidate the last compat sigvals
@ 2005-02-15 4:46 Stephen Rothwell
2005-02-15 18:38 ` David S. Miller
2005-02-16 17:44 ` Ralf Baechle
0 siblings, 2 replies; 4+ messages in thread
From: Stephen Rothwell @ 2005-02-15 4:46 UTC (permalink / raw)
To: LKML; +Cc: davem, ralf, tony.luck, schwidefsky
Hi all,
This patch just consolidates the last of the (what should have been)
compat_sigval_ts. It worries me that S390 has a sigval_t in its struct
compat_siginfo, but I have left that for now.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
P.S. this patch has not even been compiled as I don't have acces to any of
the platforms involved, but should be straight forward to fix if it breaks
anything.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff -ruNp linus-waitid.1/arch/ia64/ia32/ia32priv.h linus-waitid.2/arch/ia64/ia32/ia32priv.h
--- linus-waitid.1/arch/ia64/ia32/ia32priv.h 2005-01-05 17:06:07.000000000 +1100
+++ linus-waitid.2/arch/ia64/ia32/ia32priv.h 2005-02-15 15:26:42.000000000 +1100
@@ -225,11 +225,6 @@ struct stat64 {
unsigned int st_ino_hi;
};
-typedef union sigval32 {
- int sival_int;
- unsigned int sival_ptr;
-} sigval_t32;
-
#define SIGEV_PAD_SIZE32 ((SIGEV_MAX_SIZE/sizeof(int)) - 3)
typedef struct compat_siginfo {
@@ -251,7 +246,7 @@ typedef struct compat_siginfo {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
char _pad[sizeof(unsigned int) - sizeof(int)];
- sigval_t32 _sigval; /* same as below */
+ compat_sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
@@ -259,7 +254,7 @@ typedef struct compat_siginfo {
struct {
unsigned int _pid; /* sender's pid */
unsigned int _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
@@ -285,7 +280,7 @@ typedef struct compat_siginfo {
} compat_siginfo_t;
typedef struct sigevent32 {
- sigval_t32 sigev_value;
+ compat_sigval_t sigev_value;
int sigev_signo;
int sigev_notify;
union {
diff -ruNp linus-waitid.1/arch/mips/kernel/signal32.c linus-waitid.2/arch/mips/kernel/signal32.c
--- linus-waitid.1/arch/mips/kernel/signal32.c 2005-02-04 04:10:36.000000000 +1100
+++ linus-waitid.2/arch/mips/kernel/signal32.c 2005-02-15 15:27:37.000000000 +1100
@@ -32,11 +32,6 @@
#define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3)
-typedef union sigval32 {
- int sival_int;
- s32 sival_ptr;
-} sigval_t32;
-
typedef struct compat_siginfo {
int si_signo;
int si_code;
@@ -89,7 +84,7 @@ typedef struct compat_siginfo {
struct {
compat_pid_t _pid; /* sender's pid */
compat_uid_t _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
} _sifields;
diff -ruNp linus-waitid.1/arch/s390/kernel/compat_linux.h linus-waitid.2/arch/s390/kernel/compat_linux.h
--- linus-waitid.1/arch/s390/kernel/compat_linux.h 2005-02-04 13:05:31.000000000 +1100
+++ linus-waitid.2/arch/s390/kernel/compat_linux.h 2005-02-15 15:28:48.000000000 +1100
@@ -29,11 +29,6 @@ struct old_sigaction32 {
__u32 sa_restorer; /* Another 32 bit pointer */
};
-typedef union sigval32 {
- int sival_int;
- __u32 sival_ptr;
-} sigval_t32;
-
typedef struct compat_siginfo {
int si_signo;
int si_errno;
@@ -60,7 +55,7 @@ typedef struct compat_siginfo {
struct {
pid_t _pid; /* sender's pid */
uid_t _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
diff -ruNp linus-waitid.1/arch/sparc64/kernel/signal32.c linus-waitid.2/arch/sparc64/kernel/signal32.c
--- linus-waitid.1/arch/sparc64/kernel/signal32.c 2005-02-04 04:10:36.000000000 +1100
+++ linus-waitid.2/arch/sparc64/kernel/signal32.c 2005-02-15 15:38:14.000000000 +1100
@@ -104,7 +104,7 @@ typedef struct compat_siginfo{
struct {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
- sigval_t32 _sigval; /* same as below */
+ compat_sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
@@ -112,7 +112,7 @@ typedef struct compat_siginfo{
struct {
compat_pid_t _pid; /* sender's pid */
unsigned int _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
diff -ruNp linus-waitid.1/include/asm-sparc64/siginfo.h linus-waitid.2/include/asm-sparc64/siginfo.h
--- linus-waitid.1/include/asm-sparc64/siginfo.h 2005-01-05 17:06:08.000000000 +1100
+++ linus-waitid.2/include/asm-sparc64/siginfo.h 2005-02-15 15:30:04.000000000 +1100
@@ -19,11 +19,6 @@
#ifdef CONFIG_COMPAT
-typedef union sigval32 {
- int sival_int;
- u32 sival_ptr;
-} sigval_t32;
-
struct compat_siginfo;
#endif /* CONFIG_COMPAT */
@@ -43,7 +38,7 @@ struct compat_siginfo;
#ifdef CONFIG_COMPAT
typedef struct sigevent32 {
- sigval_t32 sigev_value;
+ compat_sigval_t sigev_value;
int sigev_signo;
int sigev_notify;
union {
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Consolidate the last compat sigvals
2005-02-15 4:46 [PATCH] Consolidate the last compat sigvals Stephen Rothwell
@ 2005-02-15 18:38 ` David S. Miller
2005-02-16 17:44 ` Ralf Baechle
1 sibling, 0 replies; 4+ messages in thread
From: David S. Miller @ 2005-02-15 18:38 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: linux-kernel, ralf, tony.luck, schwidefsky
On Tue, 15 Feb 2005 15:46:48 +1100
Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> This patch just consolidates the last of the (what should have been)
> compat_sigval_ts. It worries me that S390 has a sigval_t in its struct
> compat_siginfo, but I have left that for now.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This one looks good too.
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Consolidate the last compat sigvals
2005-02-15 4:46 [PATCH] Consolidate the last compat sigvals Stephen Rothwell
2005-02-15 18:38 ` David S. Miller
@ 2005-02-16 17:44 ` Ralf Baechle
1 sibling, 0 replies; 4+ messages in thread
From: Ralf Baechle @ 2005-02-16 17:44 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: LKML, davem, tony.luck, schwidefsky
On Tue, Feb 15, 2005 at 03:46:48PM +1100, Stephen Rothwell wrote:
> This patch just consolidates the last of the (what should have been)
> compat_sigval_ts. It worries me that S390 has a sigval_t in its struct
> compat_siginfo, but I have left that for now.
>
> Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
>
> P.S. this patch has not even been compiled as I don't have acces to any of
> the platforms involved, but should be straight forward to fix if it breaks
> anything.
You missed one instance for MIPS. Below patch makes MIPS build.
Ralf
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
signal32.c | 2 +-
1 files changed, 1 insertion(+), 1 deletion(-)
Index: linux-oprof/arch/mips/kernel/signal32.c
===================================================================
--- linux-oprof.orig/arch/mips/kernel/signal32.c 2005-02-16 17:42:42.000000000 +0000
+++ linux-oprof/arch/mips/kernel/signal32.c 2005-02-16 17:43:46.000000000 +0000
@@ -78,7 +78,7 @@
struct {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
- sigval_t32 _sigval; /* same as below */
+ compat_sigval_t _sigval;/* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] Consolidate the last compat sigvals
@ 2005-03-07 7:00 Stephen Rothwell
0 siblings, 0 replies; 4+ messages in thread
From: Stephen Rothwell @ 2005-03-07 7:00 UTC (permalink / raw)
To: Andrew Morton, Linus; +Cc: LKML
Hi Andrew, Linus,
This patch just consolidates the last of the (what should have been)
compat_sigval_ts. It also fixes S390 that had a sigval_t in its struct
compat_siginfo.
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
This patch needs to be applied on top of my "add and use
COMPAT_SIGEV_PAD_SIZE" patch posted a few minutes ago.
P.S. this patch has not even been compiled as I don't have acces to any of
the platforms involved, but has been acked by Dave Miller.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/
diff -ruNp linus-SIGEV/arch/ia64/ia32/ia32priv.h linus-sigval/arch/ia64/ia32/ia32priv.h
--- linus-SIGEV/arch/ia64/ia32/ia32priv.h 2005-02-21 12:02:07.000000000 +1100
+++ linus-sigval/arch/ia64/ia32/ia32priv.h 2005-03-07 17:52:28.000000000 +1100
@@ -225,11 +225,6 @@ struct stat64 {
unsigned int st_ino_hi;
};
-typedef union sigval32 {
- int sival_int;
- unsigned int sival_ptr;
-} sigval_t32;
-
typedef struct compat_siginfo {
int si_signo;
int si_errno;
@@ -249,7 +244,7 @@ typedef struct compat_siginfo {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
char _pad[sizeof(unsigned int) - sizeof(int)];
- sigval_t32 _sigval; /* same as below */
+ compat_sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
@@ -257,7 +252,7 @@ typedef struct compat_siginfo {
struct {
unsigned int _pid; /* sender's pid */
unsigned int _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
@@ -283,7 +278,7 @@ typedef struct compat_siginfo {
} compat_siginfo_t;
typedef struct sigevent32 {
- sigval_t32 sigev_value;
+ compat_sigval_t sigev_value;
int sigev_signo;
int sigev_notify;
union {
diff -ruNp linus-SIGEV/arch/mips/kernel/signal32.c linus-sigval/arch/mips/kernel/signal32.c
--- linus-SIGEV/arch/mips/kernel/signal32.c 2005-02-04 04:10:36.000000000 +1100
+++ linus-sigval/arch/mips/kernel/signal32.c 2005-03-02 14:25:33.000000000 +1100
@@ -32,11 +32,6 @@
#define SI_PAD_SIZE32 ((SI_MAX_SIZE/sizeof(int)) - 3)
-typedef union sigval32 {
- int sival_int;
- s32 sival_ptr;
-} sigval_t32;
-
typedef struct compat_siginfo {
int si_signo;
int si_code;
@@ -89,7 +84,7 @@ typedef struct compat_siginfo {
struct {
compat_pid_t _pid; /* sender's pid */
compat_uid_t _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
} _sifields;
diff -ruNp linus-SIGEV/arch/s390/kernel/compat_linux.h linus-sigval/arch/s390/kernel/compat_linux.h
--- linus-SIGEV/arch/s390/kernel/compat_linux.h 2005-02-21 12:02:07.000000000 +1100
+++ linus-sigval/arch/s390/kernel/compat_linux.h 2005-03-07 17:49:16.000000000 +1100
@@ -29,11 +29,6 @@ struct old_sigaction32 {
__u32 sa_restorer; /* Another 32 bit pointer */
};
-typedef union sigval32 {
- int sival_int;
- __u32 sival_ptr;
-} sigval_t32;
-
typedef struct compat_siginfo {
int si_signo;
int si_errno;
@@ -52,7 +47,7 @@ typedef struct compat_siginfo {
struct {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
- sigval_t _sigval; /* same as below */
+ compat_sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
@@ -60,7 +55,7 @@ typedef struct compat_siginfo {
struct {
pid_t _pid; /* sender's pid */
uid_t _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
diff -ruNp linus-SIGEV/arch/sparc64/kernel/signal32.c linus-sigval/arch/sparc64/kernel/signal32.c
--- linus-SIGEV/arch/sparc64/kernel/signal32.c 2005-02-04 04:10:36.000000000 +1100
+++ linus-sigval/arch/sparc64/kernel/signal32.c 2005-03-02 14:25:33.000000000 +1100
@@ -104,7 +104,7 @@ typedef struct compat_siginfo{
struct {
timer_t _tid; /* timer id */
int _overrun; /* overrun count */
- sigval_t32 _sigval; /* same as below */
+ compat_sigval_t _sigval; /* same as below */
int _sys_private; /* not to be passed to user */
} _timer;
@@ -112,7 +112,7 @@ typedef struct compat_siginfo{
struct {
compat_pid_t _pid; /* sender's pid */
unsigned int _uid; /* sender's uid */
- sigval_t32 _sigval;
+ compat_sigval_t _sigval;
} _rt;
/* SIGCHLD */
diff -ruNp linus-SIGEV/include/asm-sparc64/siginfo.h linus-sigval/include/asm-sparc64/siginfo.h
--- linus-SIGEV/include/asm-sparc64/siginfo.h 2005-02-21 12:02:07.000000000 +1100
+++ linus-sigval/include/asm-sparc64/siginfo.h 2005-03-07 17:49:55.000000000 +1100
@@ -18,11 +18,6 @@
#ifdef CONFIG_COMPAT
-typedef union sigval32 {
- int sival_int;
- u32 sival_ptr;
-} sigval_t32;
-
struct compat_siginfo;
#endif /* CONFIG_COMPAT */
@@ -42,7 +37,7 @@ struct compat_siginfo;
#ifdef CONFIG_COMPAT
typedef struct sigevent32 {
- sigval_t32 sigev_value;
+ compat_sigval_t sigev_value;
int sigev_signo;
int sigev_notify;
union {
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2005-03-07 7:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2005-02-15 4:46 [PATCH] Consolidate the last compat sigvals Stephen Rothwell
2005-02-15 18:38 ` David S. Miller
2005-02-16 17:44 ` Ralf Baechle
2005-03-07 7:00 Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).