From: Paul Gortmaker <paul.gortmaker@windriver.com>
Date: Fri, 27 May 2011 01:07:10 +0000 (-0400)
Subject: kernel: params/rcutiny needs module.h not moduleparam.h
X-Git-Tag: next-20110826~3^2~186
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=f804c191c4e23a670e85e292393d697fcddef1ce;p=karo-tx-linux.git

kernel: params/rcutiny needs module.h not moduleparam.h

Through various other twisted include paths, these files were
getting the full module.h file, and hence living the illusion
that it really only needed moduleparam.h -- but the reality
is that once you remove module.h, you will get screenfulls of
things like:

kernel/params.c:583: warning: ‘struct module_kobject’ declared inside parameter list

The file really requires module.h so simply make it so.  As the
file module.h grabs moduleparam.h on the fly, all will be well.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

diff --git a/kernel/params.c b/kernel/params.c
index 487b1f2dedc1..1d1c01b72500 100644
--- a/kernel/params.c
+++ b/kernel/params.c
@@ -15,7 +15,7 @@
     along with this program; if not, write to the Free Software
     Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/kernel.h>
 #include <linux/string.h>
 #include <linux/errno.h>
diff --git a/kernel/rcutiny.c b/kernel/rcutiny.c
index 013af5d76293..837ebb2bf3bf 100644
--- a/kernel/rcutiny.c
+++ b/kernel/rcutiny.c
@@ -22,7 +22,7 @@
  * For detailed explanation of Read-Copy Update mechanism see -
  *		Documentation/RCU
  */
-#include <linux/moduleparam.h>
+#include <linux/module.h>
 #include <linux/completion.h>
 #include <linux/interrupt.h>
 #include <linux/notifier.h>