From: Victor Fusco <victor@cetuc.puc-rio.br>
Subject: [KJ] [PATCH 2.6.13-rc1 14/17] fix sparse warnings [UPDATE 1/2]

Fix the sparse warning "implicit cast to nocast type"

File/Subsystem: include/linux/security.h

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>


---
 security.h |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)

Index: quilt/include/linux/security.h
===================================================================
--- quilt.orig/include/linux/security.h
+++ quilt/include/linux/security.h
@@ -1240,7 +1240,7 @@ struct security_operations {
 	int (*socket_shutdown) (struct socket * sock, int how);
 	int (*socket_sock_rcv_skb) (struct sock * sk, struct sk_buff * skb);
 	int (*socket_getpeersec) (struct socket *sock, char __user *optval, int __user *optlen, unsigned len);
-	int (*sk_alloc_security) (struct sock *sk, int family, int priority);
+	int (*sk_alloc_security) (struct sock *sk, int family, unsigned int __nocast priority);
 	void (*sk_free_security) (struct sock *sk);
 #endif	/* CONFIG_SECURITY_NETWORK */
 };
@@ -2727,7 +2727,8 @@ static inline int security_socket_getpee
 	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_getpee
 	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;
 }

