git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[pandora-kernel.git]
/
ipc
/
compat.c
diff --git
a/ipc/compat.c
b/ipc/compat.c
index
3881d56
..
a544dfb
100644
(file)
--- a/
ipc/compat.c
+++ b/
ipc/compat.c
@@
-30,7
+30,7
@@
#include <linux/slab.h>
#include <linux/syscalls.h>
#include <linux/slab.h>
#include <linux/syscalls.h>
-#include <
asm/semaphore
.h>
+#include <
linux/mutex
.h>
#include <asm/uaccess.h>
#include "util.h"
#include <asm/uaccess.h>
#include "util.h"
@@
-42,10
+42,10
@@
struct compat_msgbuf {
struct compat_ipc_perm {
key_t key;
struct compat_ipc_perm {
key_t key;
- compat_uid_t uid;
- compat_gid_t gid;
- compat_uid_t cuid;
- compat_gid_t cgid;
+
__
compat_uid_t uid;
+
__
compat_gid_t gid;
+
__
compat_uid_t cuid;
+
__
compat_gid_t cgid;
compat_mode_t mode;
unsigned short seq;
};
compat_mode_t mode;
unsigned short seq;
};
@@
-174,8
+174,8
@@
static inline int __put_compat_ipc_perm(struct ipc64_perm *p,
struct compat_ipc_perm __user *up)
{
int err;
struct compat_ipc_perm __user *up)
{
int err;
- compat_uid_t u;
- compat_gid_t g;
+
__
compat_uid_t u;
+
__
compat_gid_t g;
err = __put_user(p->key, &up->key);
SET_UID(u, p->uid);
err = __put_user(p->key, &up->key);
SET_UID(u, p->uid);