Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Thomas Huth and committed by
Greg Ungerer
a5044ce7 dd5a440a

+1 -2
+1 -1
arch/m68k/include/uapi/asm/ptrace.h
··· 39 39 long d0; 40 40 long orig_d0; 41 41 long stkadj; 42 - #ifdef CONFIG_COLDFIRE 42 + #ifdef __mcoldfire__ 43 43 unsigned format : 4; /* frame format specifier */ 44 44 unsigned vector : 12; /* vector offset */ 45 45 unsigned short sr;
-1
scripts/headers_install.sh
··· 74 74 arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K 75 75 arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE 76 76 arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8 77 - arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE 78 77 arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO 79 78 arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT 80 79 arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION