diff options
author | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-16 22:01:09 -0400 |
---|---|---|
committer | Masahiro Yamada <yamada.masahiro@socionext.com> | 2019-03-16 23:56:32 -0400 |
commit | 037fc3368be46dc1a2a90f6e50c8cbce49d75fd6 (patch) | |
tree | 2fdd8f1b803d33f27aff70391742d48f843b33b5 /include | |
parent | 7cbbbb8bc2974264bbbf326d9a4552fc8878d375 (diff) |
kbuild: force all architectures except um to include mandatory-y
Currently, every arch/*/include/uapi/asm/Kbuild explicitly includes
the common Kbuild.asm file. Factor out the duplicated include directives
to scripts/Makefile.asm-generic so that no architecture would opt out
of the mandatory-y mechanism.
um is not forced to include mandatory-y since it is a very exceptional
case which does not support UAPI.
Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-generic/Kbuild | 5 | ||||
-rw-r--r-- | include/uapi/asm-generic/Kbuild (renamed from include/uapi/asm-generic/Kbuild.asm) | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/include/asm-generic/Kbuild b/include/asm-generic/Kbuild new file mode 100644 index 000000000000..6f4536d70b8e --- /dev/null +++ b/include/asm-generic/Kbuild | |||
@@ -0,0 +1,5 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
2 | # | ||
3 | # asm headers that all architectures except um should have | ||
4 | # (This file is not included when SRCARCH=um since UML borrows several | ||
5 | # asm headers from the host architecutre.) | ||
diff --git a/include/uapi/asm-generic/Kbuild.asm b/include/uapi/asm-generic/Kbuild index 355c4ac2c0b0..ebb180aac74e 100644 --- a/include/uapi/asm-generic/Kbuild.asm +++ b/include/uapi/asm-generic/Kbuild | |||
@@ -1,6 +1,8 @@ | |||
1 | # SPDX-License-Identifier: GPL-2.0 | ||
1 | # | 2 | # |
2 | # Headers that are mandatory in usr/include/asm/ | 3 | # Headers that are mandatory in usr/include/asm/ |
3 | # | 4 | # (This file is not included when SRCARCH=um since UML does not support UAPI.) |
5 | |||
4 | mandatory-y += auxvec.h | 6 | mandatory-y += auxvec.h |
5 | mandatory-y += bitsperlong.h | 7 | mandatory-y += bitsperlong.h |
6 | mandatory-y += bpf_perf_event.h | 8 | mandatory-y += bpf_perf_event.h |