Skip to content

Commit b9be1be

Browse files
hcahcaVasily Gorbik
authored andcommitted
s390/asm-offsets: Remove ASM_OFFSETS_C
Remove ASM_OFFSETS_C which is used as guard in thread_info.h to decide if asm-offsets can be included or not. There is no reason to include asm-offsets.h in thread_info.h anymore. Remove the define and the not needed include. Explicitly include asm-offsets.h in all header files which require it, and where it used to be included implicitly via thread_info.h. This reduces header dependencies. Acked-by: Vasily Gorbik <gor@linux.ibm.com> Signed-off-by: Heiko Carstens <hca@linux.ibm.com> Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
1 parent 5eeec56 commit b9be1be

File tree

6 files changed

+4
-5
lines changed

6 files changed

+4
-5
lines changed

arch/s390/include/asm/thread_info.h

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,6 @@
99
#define _ASM_THREAD_INFO_H
1010

1111
#include <linux/bits.h>
12-
#ifndef ASM_OFFSETS_C
13-
#include <asm/asm-offsets.h>
14-
#endif
1512

1613
/*
1714
* General size of kernel stacks

arch/s390/kernel/asm-offsets.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@
55
* and format the required data.
66
*/
77

8-
#define ASM_OFFSETS_C
9-
108
#include <linux/kbuild.h>
119
#include <linux/sched.h>
1210
#include <linux/purgatory.h>

arch/s390/kernel/dumpstack.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
#include <linux/sched.h>
1818
#include <linux/sched/debug.h>
1919
#include <linux/sched/task_stack.h>
20+
#include <asm/asm-offsets.h>
2021
#include <asm/processor.h>
2122
#include <asm/debug.h>
2223
#include <asm/dis.h>

arch/s390/kernel/early.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <asm/asm-extable.h>
2323
#include <linux/memblock.h>
2424
#include <asm/access-regs.h>
25+
#include <asm/asm-offsets.h>
2526
#include <asm/machine.h>
2627
#include <asm/diag.h>
2728
#include <asm/ebcdic.h>

arch/s390/kernel/stacktrace.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/stacktrace.h>
1010
#include <linux/uaccess.h>
1111
#include <linux/compat.h>
12+
#include <asm/asm-offsets.h>
1213
#include <asm/stacktrace.h>
1314
#include <asm/unwind.h>
1415
#include <asm/kprobes.h>

arch/s390/mm/pfault.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/init.h>
1010
#include <linux/irq.h>
1111
#include <asm/asm-extable.h>
12+
#include <asm/asm-offsets.h>
1213
#include <asm/pfault.h>
1314
#include <asm/diag.h>
1415

0 commit comments

Comments
 (0)