Merge 4.9.120 into android-4.9

[android-x86/kernel.git] / fs / proc / internal.h

diff --git a/fs/proc/internal.h b/fs/proc/internal.h
index c0bdece..5b41088 100644 (file)
--- a/fs/proc/internal.h
+++ b/fs/proc/internal.h
@@ -259,6 +259,15 @@ static inline void proc_sys_evict_inode(struct  inode *inode,
 #endif
 
 /*
+ * uid.c
+ */
+#ifdef CONFIG_PROC_UID
+extern int proc_uid_init(void);
+#else
+static inline void proc_uid_init(void) { }
+#endif
+
+/*
  * proc_tty.c
  */
 #ifdef CONFIG_TTY