Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
L
linux
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
linux
Commits
3a7da85c
Commit
3a7da85c
authored
Sep 03, 2003
by
Anton Blanchard
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ppc64: add missing IPC_64 mask, from sparc64 and add some compat types
parent
e5122ad4
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
25 deletions
+27
-25
arch/ppc64/kernel/sys_ppc32.c
arch/ppc64/kernel/sys_ppc32.c
+27
-25
No files found.
arch/ppc64/kernel/sys_ppc32.c
View file @
3a7da85c
...
...
@@ -1243,16 +1243,19 @@ asmlinkage long sys32_settimeofday(struct compat_timeval *tv, struct timezone *t
}
struct
msgbuf32
{
s32
mtype
;
char
mtext
[
1
];
};
struct
msgbuf32
{
compat_long_t
mtype
;
char
mtext
[
1
];
};
struct
semid_ds32
{
struct
ipc_perm
sem_perm
;
compat_time_t
sem_otime
;
compat_time_t
sem_ctime
;
u32
sem_base
;
u32
sem_pending
;
u32
sem_pending_last
;
u32
undo
;
compat_uptr_t
sem_base
;
compat_uptr_t
sem_pending
;
compat_uptr_t
sem_pending_last
;
compat_uptr_t
undo
;
unsigned
short
sem_nsems
;
};
...
...
@@ -1262,21 +1265,20 @@ struct semid64_ds32 {
compat_time_t
sem_otime
;
unsigned
int
__unused2
;
compat_time_t
sem_ctime
;
u32
sem_nsems
;
u32
__unused3
;
u32
__unused4
;
compat_ulong_t
sem_nsems
;
compat_ulong_t
__unused3
;
compat_ulong_t
__unused4
;
};
struct
msqid_ds32
{
struct
msqid_ds32
{
struct
ipc_perm
msg_perm
;
u32
msg_first
;
u32
msg_last
;
compat_uptr_t
msg_first
;
compat_uptr_t
msg_last
;
compat_time_t
msg_stime
;
compat_time_t
msg_rtime
;
compat_time_t
msg_ctime
;
u32
msg_lcbytes
;
u32
msg_lqbytes
;
compat_ulong_t
msg_lcbytes
;
compat_ulong_t
msg_lqbytes
;
unsigned
short
msg_cbytes
;
unsigned
short
msg_qnum
;
unsigned
short
msg_qbytes
;
...
...
@@ -1292,13 +1294,13 @@ struct msqid64_ds32 {
compat_time_t
msg_rtime
;
unsigned
int
__unused3
;
compat_time_t
msg_ctime
;
unsigned
in
t
msg_cbytes
;
unsigned
in
t
msg_qnum
;
unsigned
in
t
msg_qbytes
;
compat_ulong_
t
msg_cbytes
;
compat_ulong_
t
msg_qnum
;
compat_ulong_
t
msg_qbytes
;
compat_pid_t
msg_lspid
;
compat_pid_t
msg_lrpid
;
unsigned
in
t
__unused4
;
unsigned
in
t
__unused5
;
compat_ulong_
t
__unused4
;
compat_ulong_
t
__unused5
;
};
struct
shmid_ds32
{
...
...
@@ -1311,8 +1313,8 @@ struct shmid_ds32 {
compat_ipc_pid_t
shm_lpid
;
unsigned
short
shm_nattch
;
unsigned
short
__unused
;
unsigned
in
t
__unused2
;
unsigned
in
t
__unused3
;
compat_uptr_
t
__unused2
;
compat_uptr_
t
__unused3
;
};
struct
shmid64_ds32
{
...
...
@@ -1327,9 +1329,9 @@ struct shmid64_ds32 {
compat_size_t
shm_segsz
;
compat_pid_t
shm_cpid
;
compat_pid_t
shm_lpid
;
unsigned
in
t
shm_nattch
;
unsigned
in
t
__unused5
;
unsigned
in
t
__unused6
;
compat_ulong_
t
shm_nattch
;
compat_ulong_
t
__unused5
;
compat_ulong_
t
__unused6
;
};
/*
...
...
@@ -1350,7 +1352,7 @@ static long do_sys32_semctl(int first, int second, int third, void *uptr)
err
=
-
EFAULT
;
if
(
get_user
(
pad
,
(
u32
*
)
uptr
))
return
err
;
if
(
third
==
SETVAL
)
if
(
(
third
&
~
IPC_64
)
==
SETVAL
)
fourth
.
val
=
(
int
)
pad
;
else
fourth
.
__pad
=
(
void
*
)
A
(
pad
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment