From c95ccecc93ddd7582fef9cc3feafe563e87271ad Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 25 Jul 2008 01:48:28 -0700
Subject: [PATCH] --- yaml --- r: 105999 b: refs/heads/master c:
 6e644c3126149b65460610fe5a00d8a162092abe h: refs/heads/master i:   105997:
 fd4cc11d5c41f812ea8c8cc73cd0143c455e55e1   105995:
 634562688f63de56c18dbec4133ac9e833280247   105991:
 640f5bb575635a5f0f1b7506bc34f25b355ff144   105983:
 9be9cc827446e03ee670ab54363b28620e5521c5 v: v3

---
 [refs]                        | 2 +-
 trunk/fs/proc/internal.h      | 1 +
 trunk/fs/proc/kmsg.c          | 2 ++
 trunk/include/linux/proc_fs.h | 1 -
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 09092d3db0c1..592353e90d28 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: cd9a6f1078ed07fe919667b73e829f3bac485573
+refs/heads/master: 6e644c3126149b65460610fe5a00d8a162092abe
diff --git a/trunk/fs/proc/internal.h b/trunk/fs/proc/internal.h
index 28cbca805905..8d67616e7bb0 100644
--- a/trunk/fs/proc/internal.h
+++ b/trunk/fs/proc/internal.h
@@ -63,6 +63,7 @@ extern const struct file_operations proc_smaps_operations;
 extern const struct file_operations proc_clear_refs_operations;
 extern const struct file_operations proc_pagemap_operations;
 extern const struct file_operations proc_net_operations;
+extern const struct file_operations proc_kmsg_operations;
 extern const struct inode_operations proc_net_inode_operations;
 
 void free_proc_entry(struct proc_dir_entry *de);
diff --git a/trunk/fs/proc/kmsg.c b/trunk/fs/proc/kmsg.c
index ff3b90b56e9d..9fd5df3f40ce 100644
--- a/trunk/fs/proc/kmsg.c
+++ b/trunk/fs/proc/kmsg.c
@@ -15,6 +15,8 @@
 #include <asm/uaccess.h>
 #include <asm/io.h>
 
+#include "internal.h"
+
 extern wait_queue_head_t log_wait;
 
 extern int do_syslog(int type, char __user *bug, int count);
diff --git a/trunk/include/linux/proc_fs.h b/trunk/include/linux/proc_fs.h
index 15a9eaf4a802..cdabc2fc02f7 100644
--- a/trunk/include/linux/proc_fs.h
+++ b/trunk/include/linux/proc_fs.h
@@ -138,7 +138,6 @@ extern int proc_readdir(struct file *, void *, filldir_t);
 extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *);
 
 extern const struct file_operations proc_kcore_operations;
-extern const struct file_operations proc_kmsg_operations;
 extern const struct file_operations ppc_htab_operations;
 
 extern int pid_ns_prepare_proc(struct pid_namespace *ns);