diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-04-29 08:37:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-04-29 08:37:05 +1000 |
| commit | 7c6389d49abeb1d991de11714b2c7a864eb84f1b (patch) | |
| tree | 90b43b02bb9780fba22a9b92b7886de75d3bb3a1 | |
| parent | ebc3e4cec5a7f7cebb69caee0336bc98a2ac83f1 (diff) | |
| parent | 2a92aed559426f6dcc86fd7be9b8618ca1256662 (diff) | |
| download | linux-next-history-7c6389d49abeb1d991de11714b2c7a864eb84f1b.tar.gz | |
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git
Notice: this object is not reachable from any branch.
Notice: this object is not reachable from any branch.
| -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 5b50ea592e002d..ebd9fccb3d11f7 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 f7d9b114de8f7d..6bbccb43f7e72b 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 |