summaryrefslogtreecommitdiff
path: root/include/linux/cred.h
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-03-21 05:00:56 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-03-21 05:00:55 -0700
commitce96e448b2a57a6ec43a91a24d1dbb3f5f4095e3 (patch)
tree4f3b6e1a6fa91d46f6265d3134418debd77848bc /include/linux/cred.h
parentb23c3fca0596a7e23dc26cb54b719774eb7d3045 (diff)
parent78cbd38fd58116df6d09bfc6166cf57b90d0711d (diff)
Merge "Merge tag 'lsk-v4.4-17.02-android' into branch 'msm-4.4'"
Diffstat (limited to 'include/linux/cred.h')
-rw-r--r--include/linux/cred.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/linux/cred.h b/include/linux/cred.h
index 8d70e1361ecd..257db64562e5 100644
--- a/include/linux/cred.h
+++ b/include/linux/cred.h
@@ -377,7 +377,10 @@ extern struct user_namespace init_user_ns;
#ifdef CONFIG_USER_NS
#define current_user_ns() (current_cred_xxx(user_ns))
#else
-#define current_user_ns() (&init_user_ns)
+static inline struct user_namespace *current_user_ns(void)
+{
+ return &init_user_ns;
+}
#endif