OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
[uclinux-h8/linux.git]
/
ipc
/
sem.c
diff --git
a/ipc/sem.c
b/ipc/sem.c
index
d1a6edd
..
bc3d530
100644
(file)
--- a/
ipc/sem.c
+++ b/
ipc/sem.c
@@
-391,7
+391,7
@@
static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns,
struct kern_ipc_perm *ipcp;
struct sem_array *sma;
struct kern_ipc_perm *ipcp;
struct sem_array *sma;
- ipcp = ipc_obtain_object(&sem_ids(ns), id);
+ ipcp = ipc_obtain_object
_idr
(&sem_ids(ns), id);
if (IS_ERR(ipcp))
return ERR_CAST(ipcp);
if (IS_ERR(ipcp))
return ERR_CAST(ipcp);
@@
-410,7
+410,7
@@
static inline struct sem_array *sem_obtain_lock(struct ipc_namespace *ns,
static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id)
{
static inline struct sem_array *sem_obtain_object(struct ipc_namespace *ns, int id)
{
- struct kern_ipc_perm *ipcp = ipc_obtain_object(&sem_ids(ns), id);
+ struct kern_ipc_perm *ipcp = ipc_obtain_object
_idr
(&sem_ids(ns), id);
if (IS_ERR(ipcp))
return ERR_CAST(ipcp);
if (IS_ERR(ipcp))
return ERR_CAST(ipcp);