From 3d6dbbdbe7d7bb129760fb377001ee2e9b87beea Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <adobriyan@gmail.com>
Date: Fri, 17 Oct 2008 05:07:44 +0400
Subject: [PATCH] --- yaml --- r: 117639 b: refs/heads/master c:
 1e0edd3f67d5b5c04ef6c0908aac8bd70dffc6f6 h: refs/heads/master i:   117637:
 3c03a399f2d08dbe1a1397b3ea28c899fcd9e9fd   117635:
 b69feb27f5bda1ff66838f0ae99134e6f6fae011   117631:
 b7ca0fcc8df06653d12c3436a53837d4f609a13f v: v3

---
 [refs]                       | 2 +-
 trunk/fs/proc/proc_devtree.c | 3 ++-
 trunk/fs/proc/proc_sysctl.c  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index c9246f0dc032..1515989b7f2a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5bcd7ff9e1690dbdbccb2a1cb3c2ea8b8381c435
+refs/heads/master: 1e0edd3f67d5b5c04ef6c0908aac8bd70dffc6f6
diff --git a/trunk/fs/proc/proc_devtree.c b/trunk/fs/proc/proc_devtree.c
index eca471bc8512..d777789b7a89 100644
--- a/trunk/fs/proc/proc_devtree.c
+++ b/trunk/fs/proc/proc_devtree.c
@@ -4,6 +4,7 @@
  * Copyright 1997 Paul Mackerras
  */
 #include <linux/errno.h>
+#include <linux/init.h>
 #include <linux/time.h>
 #include <linux/proc_fs.h>
 #include <linux/stat.h>
@@ -214,7 +215,7 @@ void proc_device_tree_add_node(struct device_node *np,
 /*
  * Called on initialization to set up the /proc/device-tree subtree
  */
-void proc_device_tree_init(void)
+void __init proc_device_tree_init(void)
 {
 	struct device_node *root;
 	if ( !have_of )
diff --git a/trunk/fs/proc/proc_sysctl.c b/trunk/fs/proc/proc_sysctl.c
index 945a81043ba2..41b5063e28d1 100644
--- a/trunk/fs/proc/proc_sysctl.c
+++ b/trunk/fs/proc/proc_sysctl.c
@@ -1,7 +1,7 @@
 /*
  * /proc/sys support
  */
-
+#include <linux/init.h>
 #include <linux/sysctl.h>
 #include <linux/proc_fs.h>
 #include <linux/security.h>
@@ -395,7 +395,7 @@ static struct dentry_operations proc_sys_dentry_operations = {
 	.d_compare	= proc_sys_compare,
 };
 
-int proc_sys_init(void)
+int __init proc_sys_init(void)
 {
 	struct proc_dir_entry *proc_sys_root;