diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 15:22:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-06 15:22:01 -0700 |
| commit | 3b69e8b4571125bec1f77f886174fe6cab6b9d75 (patch) | |
| tree | 4a125694310d161b6cb3097c4bf7542e97919987 /arch/sh/include/uapi/asm/ptrace.h | |
| parent | b170290c2836c40ab565736ba37681eb3dfd79b8 (diff) | |
| parent | 37744feebc086908fd89760650f458ab19071750 (diff) | |
Merge tag 'sh-for-5.8' of git://git.libc.org/linux-sh
Pull arch/sh updates from Rich Felker:
"Fix for arch/sh build regression with newer binutils, removal of SH5,
fixes for module exports, and misc cleanup"
* tag 'sh-for-5.8' of git://git.libc.org/linux-sh:
sh: remove sh5 support
sh: add missing EXPORT_SYMBOL() for __delay
sh: Convert ins[bwl]/outs[bwl] macros to inline functions
sh: Convert iounmap() macros to inline functions
sh: Add missing DECLARE_EXPORT() for __ashiftrt_r4_xx
sh: configs: Cleanup old Kconfig IO scheduler options
arch/sh: vmlinux.scr
sh: Replace CONFIG_MTD_M25P80 with CONFIG_MTD_SPI_NOR in sh7757lcr_defconfig
sh: sh4a: Bring back tmu3_device early device
Diffstat (limited to 'arch/sh/include/uapi/asm/ptrace.h')
| -rw-r--r-- | arch/sh/include/uapi/asm/ptrace.h | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/arch/sh/include/uapi/asm/ptrace.h b/arch/sh/include/uapi/asm/ptrace.h index 4ec9c2b65fdb..5c88e46b7773 100644 --- a/arch/sh/include/uapi/asm/ptrace.h +++ b/arch/sh/include/uapi/asm/ptrace.h @@ -25,11 +25,6 @@ #define PT_DATA_ADDR 248 /* &(struct user)->start_data */ #define PT_TEXT_LEN 252 -#if defined(__SH5__) || defined(CONFIG_CPU_SH5) -#include <asm/ptrace_64.h> -#else #include <asm/ptrace_32.h> -#endif - #endif /* _UAPI__ASM_SH_PTRACE_H */ |