diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 17:46:22 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:41:48 -0400 |
commit | 2d1419624c2e0173aee138372dd1eccb5d5fd270 (patch) | |
tree | bbbdbe6212bc75f4c490cd2f9d53508d3c616a76 | |
parent | fcb07081f209d3d9c7662ba6a097b254e76f71ee (diff) |
sparc: Merge asm-sparc{,64}/shmbuf.h
Padding in the shmbuf structure made conditional
as only 32 bit sparc did so.
:$ diff -u include/asm-sparc/shmbuf.h include/asm-sparc64/shmbuf.h
:-- include/asm-sparc/shmbuf.h 2008-06-13 06:42:07.000000000 +0200
:++ include/asm-sparc64/shmbuf.h 2008-06-13 06:42:07.000000000 +0200
:@@ -1,23 +1,19 @@
:-#ifndef _SPARC_SHMBUF_H
:-#define _SPARC_SHMBUF_H
:+#ifndef _SPARC64_SHMBUF_H
:+#define _SPARC64_SHMBUF_H
:
: /*
:- * The shmid64_ds structure for sparc architecture.
:+ * The shmid64_ds structure for sparc64 architecture.
: * Note extra padding because this structure is passed back and forth
: * between kernel and user space.
: *
: * Pad space is left for:
:- * - 64-bit time_t to solve y2038 problem
:- * - 2 miscellaneous 32-bit values
:+ * - 2 miscellaneous 64-bit values
: */
:
: struct shmid64_ds {
: struct ipc64_perm shm_perm; /* operation perms */
:- unsigned int __pad1;
: __kernel_time_t shm_atime; /* last attach time */
:- unsigned int __pad2;
: __kernel_time_t shm_dtime; /* last detach time */
:- unsigned int __pad3;
: __kernel_time_t shm_ctime; /* last change time */
: size_t shm_segsz; /* size of segment (bytes) */
: __kernel_pid_t shm_cpid; /* pid of creator */
:@@ -39,4 +35,4 @@
: unsigned long __unused4;
: };
:
:-#endif /* _SPARC_SHMBUF_H */
:+#endif /* _SPARC64_SHMBUF_H */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | include/asm-sparc/shmbuf.h | 14 | ||||
-rw-r--r-- | include/asm-sparc64/shmbuf.h | 39 |
2 files changed, 12 insertions, 41 deletions
diff --git a/include/asm-sparc/shmbuf.h b/include/asm-sparc/shmbuf.h index 1ff9da8bec73..83a16055363f 100644 --- a/include/asm-sparc/shmbuf.h +++ b/include/asm-sparc/shmbuf.h | |||
@@ -11,13 +11,19 @@ | |||
11 | * - 2 miscellaneous 32-bit values | 11 | * - 2 miscellaneous 32-bit values |
12 | */ | 12 | */ |
13 | 13 | ||
14 | #if defined(__sparc__) && defined(__arch64__) | ||
15 | # define PADDING(x) | ||
16 | #else | ||
17 | # define PADDING(x) unsigned int x; | ||
18 | #endif | ||
19 | |||
14 | struct shmid64_ds { | 20 | struct shmid64_ds { |
15 | struct ipc64_perm shm_perm; /* operation perms */ | 21 | struct ipc64_perm shm_perm; /* operation perms */ |
16 | unsigned int __pad1; | 22 | PADDING(__pad1) |
17 | __kernel_time_t shm_atime; /* last attach time */ | 23 | __kernel_time_t shm_atime; /* last attach time */ |
18 | unsigned int __pad2; | 24 | PADDING(__pad2) |
19 | __kernel_time_t shm_dtime; /* last detach time */ | 25 | __kernel_time_t shm_dtime; /* last detach time */ |
20 | unsigned int __pad3; | 26 | PADDING(__pad3) |
21 | __kernel_time_t shm_ctime; /* last change time */ | 27 | __kernel_time_t shm_ctime; /* last change time */ |
22 | size_t shm_segsz; /* size of segment (bytes) */ | 28 | size_t shm_segsz; /* size of segment (bytes) */ |
23 | __kernel_pid_t shm_cpid; /* pid of creator */ | 29 | __kernel_pid_t shm_cpid; /* pid of creator */ |
@@ -39,4 +45,6 @@ struct shminfo64 { | |||
39 | unsigned long __unused4; | 45 | unsigned long __unused4; |
40 | }; | 46 | }; |
41 | 47 | ||
48 | #undef PADDING | ||
49 | |||
42 | #endif /* _SPARC_SHMBUF_H */ | 50 | #endif /* _SPARC_SHMBUF_H */ |
diff --git a/include/asm-sparc64/shmbuf.h b/include/asm-sparc64/shmbuf.h index 61c2ef42eba3..0c54a2d68681 100644 --- a/include/asm-sparc64/shmbuf.h +++ b/include/asm-sparc64/shmbuf.h | |||
@@ -1,38 +1 @@ | |||
1 | #ifndef _SPARC64_SHMBUF_H | #include <asm-sparc/shmbuf.h> | |
2 | #define _SPARC64_SHMBUF_H | ||
3 | |||
4 | /* | ||
5 | * The shmid64_ds structure for sparc64 architecture. | ||
6 | * Note extra padding because this structure is passed back and forth | ||
7 | * between kernel and user space. | ||
8 | * | ||
9 | * Pad space is left for: | ||
10 | * - 2 miscellaneous 64-bit values | ||
11 | */ | ||
12 | |||
13 | struct shmid64_ds { | ||
14 | struct ipc64_perm shm_perm; /* operation perms */ | ||
15 | __kernel_time_t shm_atime; /* last attach time */ | ||
16 | __kernel_time_t shm_dtime; /* last detach time */ | ||
17 | __kernel_time_t shm_ctime; /* last change time */ | ||
18 | size_t shm_segsz; /* size of segment (bytes) */ | ||
19 | __kernel_pid_t shm_cpid; /* pid of creator */ | ||
20 | __kernel_pid_t shm_lpid; /* pid of last operator */ | ||
21 | unsigned long shm_nattch; /* no. of current attaches */ | ||
22 | unsigned long __unused1; | ||
23 | unsigned long __unused2; | ||
24 | }; | ||
25 | |||
26 | struct shminfo64 { | ||
27 | unsigned long shmmax; | ||
28 | unsigned long shmmin; | ||
29 | unsigned long shmmni; | ||
30 | unsigned long shmseg; | ||
31 | unsigned long shmall; | ||
32 | unsigned long __unused1; | ||
33 | unsigned long __unused2; | ||
34 | unsigned long __unused3; | ||
35 | unsigned long __unused4; | ||
36 | }; | ||
37 | |||
38 | #endif /* _SPARC64_SHMBUF_H */ | ||