Skip to content

Commit

Permalink
s390: Audit and remove any remaining unnecessary uses of module.h
Browse files Browse the repository at this point in the history
Historically a lot of these existed because we did not have
a distinction between what was modular code and what was providing
support to modules via EXPORT_SYMBOL and friends.  That changed
when we forked out support for the latter into the export.h file.

This means we should be able to reduce the usage of module.h
in code that is obj-y Makefile or bool Kconfig.  The advantage
in doing so is that module.h itself sources about 15 other headers;
adding significantly to what we feed cpp, and it can obscure what
headers we are effectively using.

Since module.h was the source for init.h (for __init) and for
export.h (for EXPORT_SYMBOL) we consider each change instance
for the presence of either and replace as needed.  An instance
where module_param was used without moduleparam.h was also fixed,
as well as implicit use of ptrace.h and string.h headers.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
  • Loading branch information
Paul Gortmaker authored and Martin Schwidefsky committed Feb 17, 2017
1 parent ff24b07 commit d321796
Show file tree
Hide file tree
Showing 6 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion arch/s390/include/asm/livepatch.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#ifndef ASM_LIVEPATCH_H
#define ASM_LIVEPATCH_H

#include <linux/module.h>
#include <asm/ptrace.h>

static inline int klp_check_compiler_support(void)
{
Expand Down
1 change: 1 addition & 0 deletions arch/s390/kvm/kvm-s390.c
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include <linux/kvm_host.h>
#include <linux/mman.h>
#include <linux/module.h>
#include <linux/moduleparam.h>
#include <linux/random.h>
#include <linux/slab.h>
#include <linux/timer.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/lib/delay.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <linux/sched.h>
#include <linux/delay.h>
#include <linux/timex.h>
#include <linux/module.h>
#include <linux/export.h>
#include <linux/irqflags.h>
#include <linux/interrupt.h>
#include <linux/irq.h>
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/lib/spinlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include <linux/types.h>
#include <linux/module.h>
#include <linux/export.h>
#include <linux/spinlock.h>
#include <linux/init.h>
#include <linux/smp.h>
Expand Down
3 changes: 2 additions & 1 deletion arch/s390/lib/string.c
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@
#define IN_ARCH_STRING_C 1

#include <linux/types.h>
#include <linux/module.h>
#include <linux/string.h>
#include <linux/export.h>

/*
* Helper functions to find the end of a string
Expand Down
2 changes: 1 addition & 1 deletion arch/s390/lib/xor.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

#include <linux/types.h>
#include <linux/module.h>
#include <linux/export.h>
#include <linux/raid/xor.h>

static void xor_xc_2(unsigned long bytes, unsigned long *p1, unsigned long *p2)
Expand Down

0 comments on commit d321796

Please sign in to comment.