Skip to contentSkip to conversation

s390: migrate exception table users off module.h and onto extable.h

PATCH In review Paul Gortmaker 2 participants 2 messages Sep 19, 2016 – Sep 20, 2016

Subsystems (2)
s390 s390 MM
lore
Share & tools
lore

Paul Gortmaker

author
#0 lore raw

PATCH 1/1 s390: migrate exception table users off module.h and onto extable.h

These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files.

The additions of uaccess.h are to deal with implict includes like:

arch/s390/kernel/traps.c: In function 'do_report_trap':
arch/s390/kernel/traps.c:56:4: error: implicit declaration of function 'extable_fixup' [-Werror=implicit-function-declaration] arch/s390/kernel/traps.c: In function 'illegal_op':
arch/s390/kernel/traps.c:173:3: error: implicit declaration of function 'get_user' [-Werror=implicit-function-declaration]

Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Signed-off-by Paul Gortmaker <[email protected]>

---

[see: https://lkml.org/lkml/2016/7/24/224 for additional context if needed]

 arch/s390/kernel/early.c   | 2 +-
 arch/s390/kernel/kprobes.c | 2 ++
 arch/s390/kernel/traps.c   | 3 ++-
 arch/s390/mm/fault.c       | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)
arch/s390/kernel/early.c +1 -1
index 717b03aa16b5..2374c5b46bbc 100644
@@ -13,7 +13,7 @@
 #include <linux/string.h>
 #include <linux/ctype.h>
 #include <linux/lockdep.h>
-#include <linux/module.h>
+#include <linux/extable.h>
 #include <linux/pfn.h>
 #include <linux/uaccess.h>
 #include <linux/kernel.h>
arch/s390/kernel/kprobes.c +2 -0
index 250f5972536a..4871c7c3ccde 100644
@@ -26,12 +26,14 @@
 #include <linux/stop_machine.h>
 #include <linux/kdebug.h>
 #include <linux/uaccess.h>
+#include <linux/extable.h>
 #include <linux/module.h>
 #include <linux/slab.h>
 #include <linux/hardirq.h>
 #include <linux/ftrace.h>
 #include <asm/cacheflush.h>
 #include <asm/sections.h>
+#include <asm/uaccess.h>
 #include <asm/dis.h>
 
 DEFINE_PER_CPU(struct kprobe *, current_kprobe);
arch/s390/kernel/traps.c +2 -1
index dd97a3e8a34a..d0539f76fd24 100644
@@ -14,11 +14,12 @@
  */
 #include <linux/kprobes.h>
 #include <linux/kdebug.h>
-#include <linux/module.h>
+#include <linux/extable.h>
 #include <linux/ptrace.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
 #include <linux/slab.h>
+#include <asm/uaccess.h>
 #include <asm/fpu/api.h>
 #include "entry.h"
arch/s390/mm/fault.c +1 -1
index a58bca62a93b..cca73881e672 100644
@@ -24,7 +24,7 @@
 #include <linux/kdebug.h>
 #include <linux/init.h>
 #include <linux/console.h>
-#include <linux/module.h>
+#include <linux/extable.h>
 #include <linux/hardirq.h>
 #include <linux/kprobes.h>
 #include <linux/uaccess.h>
Signature · 1 line
2.8.4
#1 lore raw
Quoted 13 lines · On Mon, 19 Sep 2016 17:54:56 -0400 Paul Gortmaker…

These files were only including module.h for exception table related functions. We've now separated that content out into its own file "extable.h" so now move over to that and avoid all the extra header content in module.h that we don't really need to compile these files.

The additions of uaccess.h are to deal with implict includes like:

arch/s390/kernel/traps.c: In function 'do_report_trap':
arch/s390/kernel/traps.c:56:4: error: implicit declaration of function 'extable_fixup' [-Werror=implicit-function-declaration] arch/s390/kernel/traps.c: In function 'illegal_op':
arch/s390/kernel/traps.c:173:3: error: implicit declaration of function 'get_user' [-Werror=implicit-function-declaration]

Quoted 4 lines
Cc Martin Schwidefsky <[email protected]>
Cc Heiko Carstens <[email protected]>
Cc [email protected]
Signed-off-by Paul Gortmaker <[email protected]>

Added to the linux-s390 tree for the next merge window. Thanks.

Signature · 4 lines
blue skies,
   Martin.

"Reality continues to ruin my life." - Calvin.