Commit 334e5639 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 54993156 a5044ce7

arch/m68k/include/uapi/asm/ptrace.h

+1 −1
Original line number Diff line number Diff line
@@ -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;

scripts/headers_install.sh

+0 −1
Original line number Diff line number Diff line
@@ -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