History

Merge tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu

Pull m68knommu update from Greg Ungerer: . remove use of kernel config option from uapi header * tag 'm68knommu-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu: m68k: Avoid CONFIG_COLDFIRE switch in uapi header

Linus Torvalds committed 2 years ago

Commit 334e5632 parents 5499315 a5044ce2 files · +1 −2Browse files

Unified · Split

2 files
  1. arch/m68k/include/uapi/asm/ptrace.h +1 −1
  2. scripts/headers_install.sh +0 −1
arch/m68k/include/uapi/asm/ptrace.h+1−1
@@ -39,7 +39,7 @@ struct pt_regs { · 38 unmodified lines
39 long d0;39 long d0;
40 long orig_d0;40 long orig_d0;
41 long stkadj;41 long stkadj;
42#ifdef CONFIG_COLDFIRE42#ifdef __mcoldfire__
43 unsigned format : 4; /* frame format specifier */43 unsigned format : 4; /* frame format specifier */
44 unsigned vector : 12; /* vector offset */44 unsigned vector : 12; /* vector offset */
45 unsigned short sr;45 unsigned short sr;
scripts/headers_install.sh+0−1
@@ -74,7 +74,6 @@ arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_16K · 73 unmodified lines
74arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K74arch/arc/include/uapi/asm/page.h:CONFIG_ARC_PAGE_SIZE_4K
75arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE75arch/arc/include/uapi/asm/swab.h:CONFIG_ARC_HAS_SWAPE
76arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE876arch/arm/include/uapi/asm/ptrace.h:CONFIG_CPU_ENDIAN_BE8
77arch/m68k/include/uapi/asm/ptrace.h:CONFIG_COLDFIRE
78arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO77arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_NO
79arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT78arch/nios2/include/uapi/asm/swab.h:CONFIG_NIOS2_CI_SWAB_SUPPORT
80arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION79arch/x86/include/uapi/asm/auxvec.h:CONFIG_IA32_EMULATION