tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

Merge tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux

Pull SH updates from Yoshinori Sato.

kprobe fix, defconfig updates and a SH Kconfig fix.

* tag 'for-linus-20190617' of git://git.sourceforge.jp/gitroot/uclinux-h8/linux:
arch/sh: Check for kprobe trap number before trying to handle a kprobe trap
sh: configs: Remove useless UEVENT_HELPER_PATH
Fix allyesconfig output.

Linus Torvalds 415bfd9c 57a8ec38

+5 -59
+3 -11
arch/sh/boards/Kconfig
··· 8 8 bool 9 9 10 10 config SH_DEVICE_TREE 11 - bool "Board Described by Device Tree" 11 + bool 12 12 select OF 13 13 select OF_EARLY_FLATTREE 14 14 select TIMER_OF 15 15 select COMMON_CLK 16 16 select GENERIC_CALIBRATE_DELAY 17 - help 18 - Select Board Described by Device Tree to build a kernel that 19 - does not hard-code any board-specific knowledge but instead uses 20 - a device tree blob provided by the boot-loader. You must enable 21 - drivers for any hardware you want to use separately. At this 22 - time, only boards based on the open-hardware J-Core processors 23 - have sufficient driver coverage to use this option; do not 24 - select it if you are using original SuperH hardware. 25 17 26 18 config SH_JCORE_SOC 27 19 bool "J-Core SoC" 28 - depends on SH_DEVICE_TREE && (CPU_SH2 || CPU_J2) 20 + select SH_DEVICE_TREE 29 21 select CLKSRC_JCORE_PIT 30 22 select JCORE_AIC 31 - default y if CPU_J2 23 + depends on CPU_J2 32 24 help 33 25 Select this option to include drivers core components of the 34 26 J-Core SoC, including interrupt controllers and timers.
-1
arch/sh/configs/ap325rxa_defconfig
··· 28 28 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 29 29 # CONFIG_INET_XFRM_MODE_BEET is not set 30 30 # CONFIG_IPV6 is not set 31 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 32 31 CONFIG_MTD=y 33 32 CONFIG_MTD_CMDLINE_PARTS=y 34 33 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/apsh4a3a_defconfig
··· 29 29 CONFIG_IP_PNP_DHCP=y 30 30 # CONFIG_IPV6 is not set 31 31 # CONFIG_WIRELESS is not set 32 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 33 32 # CONFIG_FW_LOADER is not set 34 33 CONFIG_MTD=y 35 34 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/apsh4ad0a_defconfig
··· 53 53 CONFIG_INET=y 54 54 # CONFIG_IPV6 is not set 55 55 # CONFIG_WIRELESS is not set 56 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 57 56 # CONFIG_FW_LOADER is not set 58 57 CONFIG_MTD=y 59 58 CONFIG_MTD_CFI=y
-1
arch/sh/configs/cayman_defconfig
··· 19 19 CONFIG_INET=y 20 20 CONFIG_IP_PNP=y 21 21 # CONFIG_IPV6 is not set 22 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 23 22 # CONFIG_FW_LOADER is not set 24 23 CONFIG_BLK_DEV_LOOP=y 25 24 CONFIG_BLK_DEV_RAM=y
-1
arch/sh/configs/dreamcast_defconfig
··· 32 32 CONFIG_UNIX=y 33 33 CONFIG_INET=y 34 34 # CONFIG_IPV6 is not set 35 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 36 35 # CONFIG_STANDALONE is not set 37 36 # CONFIG_FW_LOADER is not set 38 37 CONFIG_GDROM=y
-1
arch/sh/configs/ecovec24-romimage_defconfig
··· 26 26 # CONFIG_INET_XFRM_MODE_BEET is not set 27 27 # CONFIG_INET_DIAG is not set 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 CONFIG_SCSI=y 31 30 CONFIG_BLK_DEV_SD=y 32 31 # CONFIG_SCSI_LOWLEVEL is not set
-1
arch/sh/configs/ecovec24_defconfig
··· 31 31 # CONFIG_IPV6 is not set 32 32 CONFIG_IRDA=y 33 33 CONFIG_SH_SIR=y 34 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35 34 CONFIG_MTD=y 36 35 CONFIG_MTD_CMDLINE_PARTS=y 37 36 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/edosk7760_defconfig
··· 31 31 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 32 32 # CONFIG_INET_XFRM_MODE_BEET is not set 33 33 # CONFIG_IPV6 is not set 34 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35 34 # CONFIG_FW_LOADER is not set 36 35 CONFIG_DEBUG_DRIVER=y 37 36 CONFIG_DEBUG_DEVRES=y
-1
arch/sh/configs/espt_defconfig
··· 26 26 CONFIG_IP_PNP_DHCP=y 27 27 CONFIG_IP_PNP_BOOTP=y 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 CONFIG_MTD=y 31 30 CONFIG_MTD_CMDLINE_PARTS=y 32 31 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/hp6xx_defconfig
··· 18 18 CONFIG_PCCARD=y 19 19 CONFIG_PM=y 20 20 CONFIG_APM_EMULATION=y 21 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 22 21 # CONFIG_STANDALONE is not set 23 22 CONFIG_BLK_DEV_SD=y 24 23 CONFIG_ATA=y
-1
arch/sh/configs/kfr2r09-romimage_defconfig
··· 28 28 # CONFIG_INET_DIAG is not set 29 29 # CONFIG_IPV6 is not set 30 30 # CONFIG_WIRELESS is not set 31 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 32 31 # CONFIG_INPUT_MOUSEDEV is not set 33 32 # CONFIG_INPUT_KEYBOARD is not set 34 33 # CONFIG_INPUT_MOUSE is not set
-1
arch/sh/configs/kfr2r09_defconfig
··· 35 35 # CONFIG_INET_DIAG is not set 36 36 # CONFIG_IPV6 is not set 37 37 # CONFIG_WIRELESS is not set 38 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39 38 CONFIG_MTD=y 40 39 CONFIG_MTD_CMDLINE_PARTS=y 41 40 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/landisk_defconfig
··· 26 26 # CONFIG_IPV6 is not set 27 27 CONFIG_NETFILTER=y 28 28 CONFIG_ATALK=m 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 CONFIG_BLK_DEV_LOOP=y 31 30 CONFIG_BLK_DEV_RAM=y 32 31 CONFIG_IDE=y
-1
arch/sh/configs/lboxre2_defconfig
··· 29 29 CONFIG_IP_PNP=y 30 30 # CONFIG_IPV6 is not set 31 31 CONFIG_NETFILTER=y 32 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 33 32 CONFIG_BLK_DEV_LOOP=y 34 33 CONFIG_BLK_DEV_RAM=y 35 34 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/magicpanelr2_defconfig
··· 35 35 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 36 36 # CONFIG_INET_XFRM_MODE_BEET is not set 37 37 # CONFIG_IPV6 is not set 38 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 39 38 # CONFIG_STANDALONE is not set 40 39 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 41 40 CONFIG_MTD=y
-1
arch/sh/configs/microdev_defconfig
··· 19 19 CONFIG_INET=y 20 20 CONFIG_IP_PNP=y 21 21 # CONFIG_IPV6 is not set 22 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 23 22 # CONFIG_FW_LOADER is not set 24 23 CONFIG_BLK_DEV_RAM=y 25 24 CONFIG_IDE=y
-1
arch/sh/configs/migor_defconfig
··· 26 26 CONFIG_IP_PNP=y 27 27 CONFIG_IP_PNP_DHCP=y 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 CONFIG_FW_LOADER=m 31 30 CONFIG_MTD=y 32 31 CONFIG_MTD_CMDLINE_PARTS=y
-1
arch/sh/configs/polaris_defconfig
··· 37 37 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 38 38 # CONFIG_INET_XFRM_MODE_BEET is not set 39 39 # CONFIG_IPV6 is not set 40 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 41 40 CONFIG_MTD=y 42 41 CONFIG_MTD_CMDLINE_PARTS=y 43 42 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/r7780mp_defconfig
··· 36 36 CONFIG_IP_PNP_DHCP=y 37 37 # CONFIG_IPV6 is not set 38 38 CONFIG_BRIDGE=m 39 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40 39 CONFIG_FW_LOADER=m 41 40 CONFIG_MTD=y 42 41 CONFIG_MTD_CFI=y
-1
arch/sh/configs/r7785rp_defconfig
··· 43 43 CONFIG_IP_PNP_DHCP=y 44 44 # CONFIG_IPV6 is not set 45 45 CONFIG_BRIDGE=m 46 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 47 46 CONFIG_FW_LOADER=m 48 47 CONFIG_BLK_DEV_RAM=y 49 48 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/rsk7201_defconfig
··· 31 31 CONFIG_BINFMT_SHARED_FLAT=y 32 32 CONFIG_PM=y 33 33 CONFIG_CPU_IDLE=y 34 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 35 34 # CONFIG_STANDALONE is not set 36 35 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 37 36 # CONFIG_FW_LOADER is not set
-1
arch/sh/configs/rsk7203_defconfig
··· 45 45 # CONFIG_INET_XFRM_MODE_BEET is not set 46 46 # CONFIG_INET_DIAG is not set 47 47 # CONFIG_IPV6 is not set 48 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 49 48 # CONFIG_STANDALONE is not set 50 49 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 51 50 # CONFIG_FW_LOADER is not set
-1
arch/sh/configs/rsk7264_defconfig
··· 36 36 # CONFIG_INET_XFRM_MODE_BEET is not set 37 37 # CONFIG_INET_DIAG is not set 38 38 # CONFIG_IPV6 is not set 39 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 40 39 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 41 40 # CONFIG_FW_LOADER is not set 42 41 CONFIG_BLK_DEV_LOOP=y
-1
arch/sh/configs/rsk7269_defconfig
··· 25 25 # CONFIG_INET_XFRM_MODE_BEET is not set 26 26 # CONFIG_INET_DIAG is not set 27 27 # CONFIG_IPV6 is not set 28 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 29 28 # CONFIG_FW_LOADER is not set 30 29 CONFIG_SCSI=y 31 30 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/rts7751r2d1_defconfig
··· 22 22 CONFIG_UNIX=y 23 23 CONFIG_INET=y 24 24 # CONFIG_IPV6 is not set 25 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26 25 CONFIG_FW_LOADER=m 27 26 CONFIG_BLK_DEV_RAM=y 28 27 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/rts7751r2dplus_defconfig
··· 22 22 CONFIG_UNIX=y 23 23 CONFIG_INET=y 24 24 # CONFIG_IPV6 is not set 25 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 26 25 CONFIG_FW_LOADER=m 27 26 CONFIG_MTD=y 28 27 CONFIG_MTD_CMDLINE_PARTS=y
-1
arch/sh/configs/sdk7780_defconfig
··· 41 41 CONFIG_IPV6=y 42 42 # CONFIG_INET6_XFRM_MODE_BEET is not set 43 43 CONFIG_NET_SCHED=y 44 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 45 44 CONFIG_PARPORT=y 46 45 CONFIG_BLK_DEV_LOOP=y 47 46 CONFIG_BLK_DEV_RAM=y
-1
arch/sh/configs/sdk7786_defconfig
··· 91 91 CONFIG_IP_PNP_DHCP=y 92 92 # CONFIG_IPV6 is not set 93 93 # CONFIG_WIRELESS is not set 94 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 95 94 # CONFIG_FW_LOADER is not set 96 95 CONFIG_MTD=y 97 96 CONFIG_MTD_CMDLINE_PARTS=y
-1
arch/sh/configs/se7206_defconfig
··· 58 58 # CONFIG_INET_XFRM_MODE_BEET is not set 59 59 # CONFIG_INET_DIAG is not set 60 60 # CONFIG_IPV6 is not set 61 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 62 61 # CONFIG_STANDALONE is not set 63 62 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 64 63 # CONFIG_FW_LOADER is not set
-1
arch/sh/configs/se7343_defconfig
··· 28 28 CONFIG_SYN_COOKIES=y 29 29 # CONFIG_INET_DIAG is not set 30 30 # CONFIG_IPV6 is not set 31 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 32 31 CONFIG_MTD=y 33 32 CONFIG_MTD_BLOCK=y 34 33 CONFIG_MTD_CFI=y
-1
arch/sh/configs/se7712_defconfig
··· 63 63 CONFIG_NET_CLS_TCINDEX=y 64 64 CONFIG_NET_CLS_ROUTE4=y 65 65 CONFIG_NET_CLS_FW=y 66 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 67 66 CONFIG_MTD=y 68 67 CONFIG_MTD_BLOCK=y 69 68 CONFIG_MTD_CFI=y
-1
arch/sh/configs/se7721_defconfig
··· 62 62 CONFIG_NET_CLS_TCINDEX=y 63 63 CONFIG_NET_CLS_ROUTE4=y 64 64 CONFIG_NET_CLS_FW=y 65 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 66 65 CONFIG_MTD=y 67 66 CONFIG_MTD_BLOCK=y 68 67 CONFIG_MTD_CFI=y
-1
arch/sh/configs/se7722_defconfig
··· 26 26 CONFIG_UNIX=y 27 27 CONFIG_INET=y 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 # CONFIG_FW_LOADER is not set 31 30 CONFIG_BLK_DEV_RAM=y 32 31 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/se7724_defconfig
··· 30 30 # CONFIG_INET_XFRM_MODE_TUNNEL is not set 31 31 # CONFIG_INET_XFRM_MODE_BEET is not set 32 32 # CONFIG_IPV6 is not set 33 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 34 33 CONFIG_MTD=y 35 34 CONFIG_MTD_CMDLINE_PARTS=y 36 35 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/sh03_defconfig
··· 34 34 CONFIG_IP_PNP_BOOTP=y 35 35 CONFIG_IP_PNP_RARP=y 36 36 # CONFIG_IPV6 is not set 37 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 38 37 # CONFIG_STANDALONE is not set 39 38 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 40 39 # CONFIG_FW_LOADER is not set
-1
arch/sh/configs/sh2007_defconfig
··· 44 44 # CONFIG_IPV6 is not set 45 45 CONFIG_NETWORK_SECMARK=y 46 46 CONFIG_NET_PKTGEN=y 47 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 48 47 CONFIG_BLK_DEV_LOOP=y 49 48 CONFIG_BLK_DEV_RAM=y 50 49 CONFIG_CDROM_PKTCDVD=y
-1
arch/sh/configs/sh7710voipgw_defconfig
··· 32 32 CONFIG_NET_CLS_TCINDEX=y 33 33 CONFIG_NET_CLS_ROUTE4=y 34 34 CONFIG_NET_CLS_U32=y 35 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 36 35 CONFIG_MTD=y 37 36 CONFIG_MTD_BLOCK=y 38 37 CONFIG_MTD_CFI=y
-1
arch/sh/configs/sh7724_generic_defconfig
··· 15 15 CONFIG_KEXEC_JUMP=y 16 16 CONFIG_HIBERNATION=y 17 17 CONFIG_CPU_IDLE=y 18 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 19 18 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 20 19 # CONFIG_INPUT is not set 21 20 # CONFIG_SERIO is not set
-1
arch/sh/configs/sh7757lcr_defconfig
··· 33 33 CONFIG_IP_PNP_DHCP=y 34 34 CONFIG_IPV6=y 35 35 # CONFIG_WIRELESS is not set 36 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37 36 # CONFIG_FW_LOADER is not set 38 37 CONFIG_MTD=y 39 38 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/sh7763rdp_defconfig
··· 26 26 CONFIG_IP_PNP_DHCP=y 27 27 CONFIG_IP_PNP_BOOTP=y 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 CONFIG_MTD=y 31 30 CONFIG_MTD_CMDLINE_PARTS=y 32 31 CONFIG_MTD_BLKDEVS=y
-1
arch/sh/configs/sh7770_generic_defconfig
··· 17 17 CONFIG_PM=y 18 18 CONFIG_HIBERNATION=y 19 19 CONFIG_CPU_IDLE=y 20 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 21 20 # CONFIG_PREVENT_FIRMWARE_BUILD is not set 22 21 # CONFIG_INPUT is not set 23 22 # CONFIG_SERIO is not set
-1
arch/sh/configs/sh7785lcr_32bit_defconfig
··· 43 43 CONFIG_IP_PNP=y 44 44 CONFIG_IP_PNP_DHCP=y 45 45 # CONFIG_IPV6 is not set 46 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 47 46 CONFIG_MTD=y 48 47 CONFIG_MTD_BLOCK=y 49 48 CONFIG_MTD_CFI=y
-1
arch/sh/configs/sh7785lcr_defconfig
··· 26 26 CONFIG_IP_PNP=y 27 27 CONFIG_IP_PNP_DHCP=y 28 28 # CONFIG_IPV6 is not set 29 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 30 29 # CONFIG_FW_LOADER is not set 31 30 CONFIG_MTD=y 32 31 CONFIG_MTD_BLOCK=y
-1
arch/sh/configs/shx3_defconfig
··· 59 59 CONFIG_CAN_RAW=m 60 60 CONFIG_CAN_BCM=m 61 61 CONFIG_CAN_VCAN=m 62 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 63 62 # CONFIG_FW_LOADER is not set 64 63 CONFIG_BLK_DEV_RAM=y 65 64 CONFIG_BLK_DEV_SD=y
-1
arch/sh/configs/titan_defconfig
··· 142 142 CONFIG_NET_ACT_MIRRED=m 143 143 CONFIG_NET_ACT_IPT=m 144 144 CONFIG_NET_ACT_PEDIT=m 145 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 146 145 CONFIG_FW_LOADER=m 147 146 CONFIG_CONNECTOR=m 148 147 CONFIG_MTD=m
-1
arch/sh/configs/ul2_defconfig
··· 33 33 CONFIG_MAC80211=y 34 34 CONFIG_MAC80211_RC_PID=y 35 35 # CONFIG_MAC80211_RC_MINSTREL is not set 36 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 37 36 CONFIG_MTD=y 38 37 CONFIG_MTD_BLOCK=y 39 38 CONFIG_MTD_CFI=y
-1
arch/sh/configs/urquell_defconfig
··· 46 46 CONFIG_IP_PNP=y 47 47 CONFIG_IP_PNP_DHCP=y 48 48 # CONFIG_IPV6 is not set 49 - CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug" 50 49 # CONFIG_FW_LOADER is not set 51 50 CONFIG_MTD=y 52 51 CONFIG_MTD_BLOCK=y
+2 -1
arch/sh/kernel/kprobes.c
··· 485 485 struct kprobe_ctlblk *kcb = get_kprobe_ctlblk(); 486 486 487 487 addr = (kprobe_opcode_t *) (args->regs->pc); 488 - if (val == DIE_TRAP) { 488 + if (val == DIE_TRAP && 489 + args->trapnr == (BREAKPOINT_INSTRUCTION & 0xff)) { 489 490 if (!kprobe_running()) { 490 491 if (kprobe_handler(args->regs)) { 491 492 ret = NOTIFY_STOP;