Merge branch 'writeback-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[mirror_ubuntu-zesty-kernel.git] / include / linux / utsname.h

diff --git a/include/linux/utsname.h b/include/linux/utsname.h
index 4e5b0213fdc16adc61dbb4d46ee5e98030c9a1cc..c714ed75eae25c523e60c1cc6df1b249d3659134 100644 (file)
--- a/include/linux/utsname.h
+++ b/include/linux/utsname.h
@@ -37,6 +37,14 @@ struct new_utsname {
 #include <linux/nsproxy.h>
 #include <linux/err.h>
 
+enum uts_proc {
+       UTS_PROC_OSTYPE,
+       UTS_PROC_OSRELEASE,
+       UTS_PROC_VERSION,
+       UTS_PROC_HOSTNAME,
+       UTS_PROC_DOMAINNAME,
+};
+
 struct user_namespace;
 extern struct user_namespace init_user_ns;
 
@@ -80,6 +88,14 @@ static inline struct uts_namespace *copy_utsname(unsigned long flags,
 }
 #endif
 
+#ifdef CONFIG_PROC_SYSCTL
+extern void uts_proc_notify(enum uts_proc proc);
+#else
+static inline void uts_proc_notify(enum uts_proc proc)
+{
+}
+#endif
+
 static inline struct new_utsname *utsname(void)
 {
        return &current->nsproxy->uts_ns->name;