summaryrefslogtreecommitdiff
path: root/ipc/util.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <greg@kroah.com>2002-10-25 00:52:30 -0700
committerGreg Kroah-Hartman <greg@kroah.com>2002-10-25 00:52:30 -0700
commitefdddf70cc1946feb4b00b1771cce3aef8efcc0e (patch)
treeec80678dad8c5c215caf93fbdfc7c175972a9c7f /ipc/util.c
parentecf2c2143f0865f447020144b2ee6e4181f65814 (diff)
parent9d9682d81c14ef82d5fa566b2ebfa047c01c0fc1 (diff)
Merge kroah.com:/home/greg/linux/BK/bleeding_edge-2.5
into kroah.com:/home/greg/linux/BK/lsm-2.5
Diffstat (limited to 'ipc/util.c')
-rw-r--r--ipc/util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/ipc/util.c b/ipc/util.c
index 73b978baa1ec..e6510c962e1c 100644
--- a/ipc/util.c
+++ b/ipc/util.c
@@ -264,7 +264,7 @@ int ipcperms (struct kern_ipc_perm *ipcp, short flag)
!capable(CAP_IPC_OWNER))
return -1;
- return security_ops->ipc_permission(ipcp, flag);
+ return security_ipc_permission(ipcp, flag);
}
/*