Merge branches 'locking-urgent-for-linus' and 'timers-urgent-for-linus' of git:/...

[firefly-linux-kernel-4.4.55.git] / include / net / netlabel.h

diff --git a/include/net/netlabel.h b/include/net/netlabel.h
index a4fc39bb3e4fc1eedd7fc6be183be96a734d941e..7b5a300de7f589a534ac315f24a1151674aa54a4 100644 (file)
--- a/include/net/netlabel.h
+++ b/include/net/netlabel.h
@@ -524,10 +524,10 @@ static inline int netlbl_catmap_setrng(struct netlbl_lsm_catmap **catmap,
 {
        return 0;
 }
-static int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
-                                u32 offset,
-                                unsigned long bitmap,
-                                gfp_t flags)
+static inline int netlbl_catmap_setlong(struct netlbl_lsm_catmap **catmap,
+                                       u32 offset,
+                                       unsigned long bitmap,
+                                       gfp_t flags)
 {
        return 0;
 }