Skip to content

Commit

Permalink
m68k: Avoid CONFIG_COLDFIRE switch in uapi header
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Thomas Huth authored and Greg Ungerer committed May 6, 2024
1 parent dd5a440 commit a5044ce
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 1 addition & 1 deletion arch/m68k/include/uapi/asm/ptrace.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 0 additions & 1 deletion scripts/headers_install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit a5044ce

Please sign in to comment.