diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-08-30 09:30:09 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-08-30 09:30:09 -0700 |
| commit | 288ceb8f142249109fd2e9f1bf0492bd6ff6d892 (patch) | |
| tree | eab3d229c7a527816db405299ce9603e538b521f /include/linux/security.h | |
| parent | [IA64-SGI] One new use of "UNCACHED" needed fixing for sn2 region cleanup (diff) | |
| parent | [INET]: compile errors when DEBUG is defined (diff) | |
Auto-update from upstream
Diffstat (limited to 'include/linux/security.h')
| -rw-r--r-- | include/linux/security.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/security.h b/include/linux/security.h index b42095a68b1c..7aab6ab7c57f 100644 --- a/include/linux/security.h +++ b/include/linux/security.h @@ -2727,7 +2727,8 @@ static inline int security_socket_getpeersec(struct socket *sock, char __user *o return security_ops->socket_getpeersec(sock, optval, optlen, len); } -static inline int security_sk_alloc(struct sock *sk, int family, int priority) +static inline int security_sk_alloc(struct sock *sk, int family, + unsigned int __nocast priority) { return security_ops->sk_alloc_security(sk, family, priority); } @@ -2844,7 +2845,8 @@ static inline int security_socket_getpeersec(struct socket *sock, char __user *o return -ENOPROTOOPT; } -static inline int security_sk_alloc(struct sock *sk, int family, int priority) +static inline int security_sk_alloc(struct sock *sk, int family, + unsigned int __nocast priority) { return 0; } |