treewide: Replace kernel.h by printk.h

The kernel.h should be discouraged for use.

Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>

diff --git a/examples/bottomhalf.c b/examples/bottomhalf.c
index 91be30e2daf284de25f6cc5558b707bf9d0445cf..a4cbf5ef126674245b303b1c56a061005e537400 100644 (file)
--- a/examples/bottomhalf.c
+++ b/examples/bottomhalf.c
@@ -11,8 +11,8 @@
 #include <linux/delay.h>
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 
 /* Macro DECLARE_TASKLET_OLD exists for compatibiity.
  * See https://lwn.net/Articles/830964/

diff --git a/examples/completions.c b/examples/completions.c
index 197dea92f99055d911955dc4be8de9c59c3b1cb8..e9a87c686a1432071bfffe5c7281ad33698b3679 100644 (file)
--- a/examples/completions.c
+++ b/examples/completions.c
@@ -4,9 +4,9 @@
 #include <linux/completion.h>
 #include <linux/err.h> /* for IS_ERR() */
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/kthread.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 
 static struct {
     struct completion crank_comp;

diff --git a/examples/example_atomic.c b/examples/example_atomic.c
index 4cd4897f019b35efd873cf72396846d3c82090e8..7ae8fb8394667113453f19b1dcb148fa87891831 100644 (file)
--- a/examples/example_atomic.c
+++ b/examples/example_atomic.c
@@ -3,8 +3,8 @@
  */
 #include <linux/atomic.h>
 #include <linux/bitops.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 
 #define BYTE_TO_BINARY_PATTERN "%c%c%c%c%c%c%c%c"
 #define BYTE_TO_BINARY(byte)                                                   \

diff --git a/examples/example_mutex.c b/examples/example_mutex.c
index 3149c23799d4c58c5019183687d947ba7d825afc..6baf61f42be9728ff96ea886ef5cc1cfb0f15411 100644 (file)
--- a/examples/example_mutex.c
+++ b/examples/example_mutex.c
@@ -1,9 +1,9 @@
 /*
  * example_mutex.c
  */
-#include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/mutex.h>
+#include <linux/printk.h>
 
 static DEFINE_MUTEX(mymutex);
 

diff --git a/examples/example_rwlock.c b/examples/example_rwlock.c
index 9668e756108f67c18e7ec6e72f1a097fd8f51b44..3bdcb14a7473a74a3f68453010eb882842743894 100644 (file)
--- a/examples/example_rwlock.c
+++ b/examples/example_rwlock.c
@@ -1,8 +1,8 @@
 /*
  * example_rwlock.c
  */
-#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 #include <linux/rwlock.h>
 
 static DEFINE_RWLOCK(myrwlock);

diff --git a/examples/example_spinlock.c b/examples/example_spinlock.c
index 862291b9b4fe26ad7a8047cdc74d276129499a70..483034fe05b3b860db3abe4acb0649ccc9a4df6e 100644 (file)
--- a/examples/example_spinlock.c
+++ b/examples/example_spinlock.c
@@ -2,8 +2,8 @@
  * example_spinlock.c
  */
 #include <linux/init.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 #include <linux/spinlock.h>
 
 static DEFINE_SPINLOCK(sl_static);

diff --git a/examples/example_tasklet.c b/examples/example_tasklet.c
index 49c825e5ec16b646a3d7206fdcf532261ccd77e2..bd894dc54c0ea2b83e7e7a982f95733a06015331 100644 (file)
--- a/examples/example_tasklet.c
+++ b/examples/example_tasklet.c
@@ -3,8 +3,8 @@
  */
 #include <linux/delay.h>
 #include <linux/interrupt.h>
-#include <linux/kernel.h>
 #include <linux/module.h>
+#include <linux/printk.h>
 
 /* Macro DECLARE_TASKLET_OLD exists for compatibility.
  * See https://lwn.net/Articles/830964/

diff --git a/examples/hello-1.c b/examples/hello-1.c
index 0abcf644e3894342bb961effa8a89d1ebbac4fdf..12f1a5d45dd0d45768e2bb138fcfe9ee4f985018 100644 (file)
--- a/examples/hello-1.c
+++ b/examples/hello-1.c
@@ -1,8 +1,8 @@
 /*
  * hello-1.c - The simplest kernel module.
  */
-#include <linux/kernel.h> /* Needed for pr_info() */
 #include <linux/module.h> /* Needed by all modules */
+#include <linux/printk.h> /* Needed for pr_info() */
 
 int init_module(void)
 {

diff --git a/examples/hello-2.c b/examples/hello-2.c
index b5c360d870f2d43f645df38bdcf973d82d2a0e97..d76e716bf2172c434a85f5d63ffc410a42c2a66c 100644 (file)
--- a/examples/hello-2.c
+++ b/examples/hello-2.c
@@ -3,8 +3,8 @@
  * This is preferred over using init_module() and cleanup_module().
  */
 #include <linux/init.h> /* Needed for the macros */
-#include <linux/kernel.h> /* Needed for pr_info() */
 #include <linux/module.h> /* Needed by all modules */
+#include <linux/printk.h> /* Needed for pr_info() */
 
 static int __init hello_2_init(void)
 {

diff --git a/examples/hello-3.c b/examples/hello-3.c
index a82c3852a2ea465d8555ac58e562c578849528e0..84ea2c1f90941c849f689421c96e29ad3171bed2 100644 (file)
--- a/examples/hello-3.c
+++ b/examples/hello-3.c
@@ -2,8 +2,8 @@
  * hello-3.c - Illustrating the __init, __initdata and __exit macros.
  */
 #include <linux/init.h> /* Needed for the macros */
-#include <linux/kernel.h> /* Needed for pr_info() */
 #include <linux/module.h> /* Needed by all modules */
+#include <linux/printk.h> /* Needed for pr_info() */
 
 static int hello3_data __initdata = 3;
 

diff --git a/examples/hello-4.c b/examples/hello-4.c
index 8e2937de6da9b75fcd7aea3adfb6854c177b30ab..c029761cd3a70da9975ef212963aed2c9272f3fb 100644 (file)
--- a/examples/hello-4.c
+++ b/examples/hello-4.c
@@ -2,8 +2,8 @@
  * hello-4.c - Demonstrates module documentation.
  */
 #include <linux/init.h> /* Needed for the macros */
-#include <linux/kernel.h> /* Needed for pr_info() */
 #include <linux/module.h> /* Needed by all modules */
+#include <linux/printk.h> /* Needed for pr_info() */
 
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("LKMPG");

diff --git a/examples/hello-5.c b/examples/hello-5.c
index 5978e719bd06d8b19abe028ed1db8869d51a6e06..3447855626f5490cc1a9f321fd68537e814722e3 100644 (file)
--- a/examples/hello-5.c
+++ b/examples/hello-5.c
@@ -2,9 +2,10 @@
  * hello-5.c - Demonstrates command line argument passing to a module.
  */
 #include <linux/init.h>
-#include <linux/kernel.h>
+#include <linux/kernel.h> /* for ARRAY_SIZE() */
 #include <linux/module.h>
 #include <linux/moduleparam.h>
+#include <linux/printk.h>
 #include <linux/stat.h>
 
 MODULE_LICENSE("GPL");

diff --git a/examples/intrpt.c b/examples/intrpt.c
index 0a6b252c702698482d77a0893416b98e6232c269..beeddd6ffc86053cacacba28ed71bfcd0a484476 100644 (file)
--- a/examples/intrpt.c
+++ b/examples/intrpt.c
@@ -10,8 +10,9 @@
 
 #include <linux/gpio.h>
 #include <linux/interrupt.h>
-#include <linux/kernel.h>
+#include <linux/kernel.h> /* for ARRAY_SIZE() */
 #include <linux/module.h>
+#include <linux/printk.h>
 
 static int button_irqs[] = { -1, -1 };
 

diff --git a/examples/sleep.c b/examples/sleep.c
index dff612a126b09575c382b341a40b0d134339abe9..ad8c1dd1d993dc39e0a5a978c6b20e62c38b3e98 100644 (file)
--- a/examples/sleep.c
+++ b/examples/sleep.c
@@ -5,8 +5,9 @@
 
 #include <linux/atomic.h>
 #include <linux/fs.h>
-#include <linux/kernel.h> /* We're doing kernel work */
+#include <linux/kernel.h> /* for sprintf() */
 #include <linux/module.h> /* Specifically, a module */
+#include <linux/printk.h>
 #include <linux/proc_fs.h> /* Necessary because we use proc fs */
 #include <linux/types.h>
 #include <linux/uaccess.h> /* for get_user and put_user */

diff --git a/lkmpg.tex b/lkmpg.tex
index d2fa59d2d5ef07fb338d6aa0843a5a88458ba9c2..1976fee5002c5fa617e004504f4dce98b3ab9769 100644 (file)
--- a/lkmpg.tex
+++ b/lkmpg.tex
@@ -401,7 +401,7 @@ The \cpp|cleanup_module()| function is supposed to undo whatever \cpp|init_modul
 
 Lastly, every kernel module needs to include \verb|<linux/module.h>|.
 % TODO: adjust the section anchor
-We needed to include \verb|<linux/kernel.h>| only for the macro expansion for the \cpp|pr_alert()| log level, which you'll learn about in Section \ref{sec:printk}.
+We needed to include \verb|<linux/printk.h>| only for the macro expansion for the \cpp|pr_alert()| log level, which you'll learn about in Section \ref{sec:printk}.
 
 \begin{enumerate}
   \item A point about coding style.