diff options
| author | Thomas Huth <thuth@redhat.com> | 2023-11-10 11:31:20 +0100 |
|---|---|---|
| committer | Greg Ungerer <gerg@linux-m68k.org> | 2024-05-07 08:55:23 +1000 |
| commit | a5044ce7d1d94cd37be99e86964aa054f7e5564c (patch) | |
| tree | f8be7c797775b4d4e6e0f4134d64bb17a7f0e5f3 | |
| parent | dd5a440a31fae6e459c0d6271dddd62825505361 (diff) | |
| download | lwn-a5044ce7d1d94cd37be99e86964aa054f7e5564c.tar.gz lwn-a5044ce7d1d94cd37be99e86964aa054f7e5564c.zip | |
m68k: Avoid CONFIG_COLDFIRE switch in uapi header
We should not use any CONFIG switches in uapi headers since
these only work during kernel compilation. They are not defined
for userspace. Let's use the __mcoldfire__ switch from the
compiler here instead.
Signed-off-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Greg Ungerer <gerg@linux-m68k.org>
| -rw-r--r-- | arch/m68k/include/uapi/asm/ptrace.h | 2 | ||||
| -rwxr-xr-x | scripts/headers_install.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/include/uapi/asm/ptrace.h b/arch/m68k/include/uapi/asm/ptrace.h index 5b50ea592e00..ebd9fccb3d11 100644 --- a/arch/m68k/include/uapi/asm/ptrace.h +++ b/arch/m68k/include/uapi/asm/ptrace.h @@ -39,7 +39,7 @@ struct pt_regs { long d0; long orig_d0; long stkadj; -#ifdef CONFIG_COLDFIRE +#ifdef __mcoldfire__ unsigned format : 4; /* frame format specifier */ unsigned vector : 12; /* vector offset */ unsigned short sr; diff --git a/scripts/headers_install.sh b/scripts/headers_install.sh index f7d9b114de8f..6bbccb43f7e7 100755 --- a/scripts/headers_install.sh +++ b/scripts/headers_install.sh @@ -74,7 +74,6 @@ arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8 -arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION |