diff options
| author | Mark Brown <broonie@kernel.org> | 2026-11-13 14:06:01 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-11-13 14:06:01 +0000 |
| commit | b3a0e6eff0572ca5afc1e541d6cd2538b3f10b60 (patch) | |
| tree | 91d16d176d6b1511d1ea8d980b0b766406bb0986 /include/linux | |
| parent | 2346493c470713b8bd90fc7d7a338fc0852b1ee5 (diff) | |
| parent | 73d83cea1b6a47fb34128393b074d9a703c4b17f (diff) | |
| download | linux-next-b3a0e6eff0572ca5afc1e541d6cd2538b3f10b60.tar.gz linux-next-b3a0e6eff0572ca5afc1e541d6cd2538b3f10b60.zip | |
Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/cpufeature.h | 3 | ||||
| -rw-r--r-- | include/linux/device-id/cpu_feature.h | 18 | ||||
| -rw-r--r-- | include/linux/kbuild.h | 2 | ||||
| -rw-r--r-- | include/linux/mod_devicetable.h | 13 |
4 files changed, 21 insertions, 15 deletions
diff --git a/include/linux/cpufeature.h b/include/linux/cpufeature.h index 6aff540ee9e5..cd470987777f 100644 --- a/include/linux/cpufeature.h +++ b/include/linux/cpufeature.h @@ -6,10 +6,11 @@ #ifndef __LINUX_CPUFEATURE_H #define __LINUX_CPUFEATURE_H +#include <linux/device-id/cpu_feature.h> + #ifdef CONFIG_GENERIC_CPU_AUTOPROBE #include <linux/init.h> -#include <linux/mod_devicetable.h> #include <asm/cpufeature.h> /* diff --git a/include/linux/device-id/cpu_feature.h b/include/linux/device-id/cpu_feature.h new file mode 100644 index 000000000000..937fbe00dcd5 --- /dev/null +++ b/include/linux/device-id/cpu_feature.h @@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef LINUX_DEVICE_ID_CPU_FEATURE_H +#define LINUX_DEVICE_ID_CPU_FEATURE_H + +#ifdef __KERNEL__ +#include <linux/types.h> +#endif + +/* + * Generic table type for matching CPU features. + * @feature: the bit number of the feature (0 - 65535) + */ + +struct cpu_feature { + __u16 feature; +}; + +#endif /* ifndef LINUX_DEVICE_ID_CPU_FEATURE_H */ diff --git a/include/linux/kbuild.h b/include/linux/kbuild.h index e7be517aaaf6..118568971fdf 100644 --- a/include/linux/kbuild.h +++ b/include/linux/kbuild.h @@ -5,7 +5,7 @@ #define DEFINE(sym, val) \ asm volatile("\n.ascii \"->" #sym " %0 " #val "\"" : : "i" (val)) -#define BLANK() asm volatile("\n.ascii \"->\"" : : ) +#define BLANK() do { asm volatile ("\n.ascii \"->BLANK()\"" : : ); } while (0) #define OFFSET(sym, str, mem) \ DEFINE(sym, offsetof(struct str, mem)) diff --git a/include/linux/mod_devicetable.h b/include/linux/mod_devicetable.h index d1581bb64729..311980ec43b4 100644 --- a/include/linux/mod_devicetable.h +++ b/include/linux/mod_devicetable.h @@ -8,10 +8,6 @@ #ifndef LINUX_MOD_DEVICETABLE_H #define LINUX_MOD_DEVICETABLE_H -#ifdef __KERNEL__ -#include <linux/types.h> -#endif - #include "device-id/acpi.h" #include "device-id/amba.h" #include "device-id/ap.h" @@ -69,13 +65,4 @@ #include "device-id/x86_cpu.h" #include "device-id/zorro.h" -/* - * Generic table type for matching CPU features. - * @feature: the bit number of the feature (0 - 65535) - */ - -struct cpu_feature { - __u16 feature; -}; - #endif /* LINUX_MOD_DEVICETABLE_H */ |