Skip to content

L
linux
Commit 241e5e6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k 

Pull m68k updates from Geert Uytterhoeven:

  - NuBus improvements and cleanups

  - defconfig updates

  - Fix debugger syscall restart interactions, leading to the global
    removal of ptrace_signal_deliver()

* tag 'm68k-for-v4.13-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: Remove ptrace_signal_deliver
  m68k/defconfig: Update defconfigs for v4.12-rc1
  nubus: Fix pointer validation
  nubus: Remove slot zero probe
parents 7a69f9c6 204a2be3
Hide whitespace changes
Inline Side-by-side
Showing with 95 additions and 152 deletions
arch/m68k/configs/amiga_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -349,7 +351,6 @@ CONFIG_SCSI_A4000T=y ...@@ -349,7 +351,6 @@ CONFIG_SCSI_A4000T=y
CONFIG_SCSI_ZORRO7XX=y CONFIG_SCSI_ZORRO7XX=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -361,6 +362,7 @@ CONFIG_DM_ZERO=m ...@@ -361,6 +362,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -414,6 +416,7 @@ CONFIG_ZORRO8390=y ...@@ -414,6 +416,7 @@ CONFIG_ZORRO8390=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -572,6 +575,8 @@ CONFIG_DLM=m ...@@ -572,6 +575,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -590,6 +595,7 @@ CONFIG_TEST_UDELAY=m ...@@ -590,6 +595,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/apollo_defconfig
View file @ 241e5e6f
...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y ...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m ...@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m ...@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -388,6 +390,7 @@ CONFIG_VETH=m ...@@ -388,6 +390,7 @@ CONFIG_VETH=m
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -531,6 +534,8 @@ CONFIG_DLM=m ...@@ -531,6 +534,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -549,6 +554,7 @@ CONFIG_TEST_UDELAY=m ...@@ -549,6 +554,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/atari_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -340,7 +342,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -340,7 +342,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_ATARI_SCSI=y CONFIG_ATARI_SCSI=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -352,6 +353,7 @@ CONFIG_DM_ZERO=m ...@@ -352,6 +353,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -399,6 +401,7 @@ CONFIG_SMC91X=y ...@@ -399,6 +401,7 @@ CONFIG_SMC91X=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -552,6 +555,8 @@ CONFIG_DLM=m ...@@ -552,6 +555,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -570,6 +575,7 @@ CONFIG_TEST_UDELAY=m ...@@ -570,6 +575,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68040=y CONFIG_M68040=y
...@@ -330,7 +332,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -330,7 +332,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_BVME6000_SCSI=y CONFIG_BVME6000_SCSI=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -342,6 +343,7 @@ CONFIG_DM_ZERO=m ...@@ -342,6 +343,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -387,6 +389,7 @@ CONFIG_BVME6000_NET=y ...@@ -387,6 +389,7 @@ CONFIG_BVME6000_NET=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -523,6 +526,8 @@ CONFIG_DLM=m ...@@ -523,6 +526,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m ...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/hp300_defconfig
View file @ 241e5e6f
...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y ...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m ...@@ -331,7 +333,6 @@ CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m ...@@ -343,6 +344,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -389,6 +391,7 @@ CONFIG_HPLANCE=y ...@@ -389,6 +391,7 @@ CONFIG_HPLANCE=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -533,6 +536,8 @@ CONFIG_DLM=m ...@@ -533,6 +536,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -551,6 +556,7 @@ CONFIG_TEST_UDELAY=m ...@@ -551,6 +556,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/mac_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -340,7 +342,6 @@ CONFIG_MAC_SCSI=y ...@@ -340,7 +342,6 @@ CONFIG_MAC_SCSI=y
CONFIG_SCSI_MAC_ESP=y CONFIG_SCSI_MAC_ESP=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -352,6 +353,7 @@ CONFIG_DM_ZERO=m ...@@ -352,6 +353,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -408,6 +410,7 @@ CONFIG_MAC8390=y ...@@ -408,6 +410,7 @@ CONFIG_MAC8390=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -555,6 +558,8 @@ CONFIG_DLM=m ...@@ -555,6 +558,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -573,6 +578,7 @@ CONFIG_TEST_UDELAY=m ...@@ -573,6 +578,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/multi_defconfig
View file @ 241e5e6f
...@@ -22,6 +22,8 @@ CONFIG_UNIXWARE_DISKLABEL=y ...@@ -22,6 +22,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68020=y CONFIG_M68020=y
...@@ -373,7 +375,6 @@ CONFIG_BVME6000_SCSI=y ...@@ -373,7 +375,6 @@ CONFIG_BVME6000_SCSI=y
CONFIG_SUN3X_ESP=y CONFIG_SUN3X_ESP=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -385,6 +386,7 @@ CONFIG_DM_ZERO=m ...@@ -385,6 +386,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -454,6 +456,7 @@ CONFIG_SMC91X=y ...@@ -454,6 +456,7 @@ CONFIG_SMC91X=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -635,6 +638,8 @@ CONFIG_DLM=m ...@@ -635,6 +638,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -653,6 +658,7 @@ CONFIG_TEST_UDELAY=m ...@@ -653,6 +658,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68030=y CONFIG_M68030=y
...@@ -329,7 +331,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -329,7 +331,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_MVME147_SCSI=y CONFIG_MVME147_SCSI=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -341,6 +342,7 @@ CONFIG_DM_ZERO=m ...@@ -341,6 +342,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -387,6 +389,7 @@ CONFIG_MVME147_NET=y ...@@ -387,6 +389,7 @@ CONFIG_MVME147_NET=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -523,6 +526,8 @@ CONFIG_DLM=m ...@@ -523,6 +526,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m ...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y ...@@ -26,6 +26,8 @@ CONFIG_SUN_PARTITION=y
# CONFIG_EFI_PARTITION is not set # CONFIG_EFI_PARTITION is not set
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68040=y CONFIG_M68040=y
...@@ -330,7 +332,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -330,7 +332,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_MVME16x_SCSI=y CONFIG_MVME16x_SCSI=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -342,6 +343,7 @@ CONFIG_DM_ZERO=m ...@@ -342,6 +343,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -387,6 +389,7 @@ CONFIG_MVME16x_NET=y ...@@ -387,6 +389,7 @@ CONFIG_MVME16x_NET=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -523,6 +526,8 @@ CONFIG_DLM=m ...@@ -523,6 +526,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m ...@@ -541,6 +546,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/q40_defconfig
View file @ 241e5e6f
...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y ...@@ -27,6 +27,8 @@ CONFIG_SUN_PARTITION=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_M68040=y CONFIG_M68040=y
...@@ -336,7 +338,6 @@ CONFIG_ISCSI_TCP=m ...@@ -336,7 +338,6 @@ CONFIG_ISCSI_TCP=m
CONFIG_ISCSI_BOOT_SYSFS=m CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -348,6 +349,7 @@ CONFIG_DM_ZERO=m ...@@ -348,6 +349,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -398,6 +400,7 @@ CONFIG_NE2000=y ...@@ -398,6 +400,7 @@ CONFIG_NE2000=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PLIP=m CONFIG_PLIP=m
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
...@@ -546,6 +549,8 @@ CONFIG_DLM=m ...@@ -546,6 +549,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -564,6 +569,7 @@ CONFIG_TEST_UDELAY=m ...@@ -564,6 +569,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/sun3_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_UNIXWARE_DISKLABEL=y ...@@ -26,6 +26,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_SUN3=y CONFIG_SUN3=y
...@@ -327,7 +329,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -327,7 +329,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_SUN3_SCSI=y CONFIG_SUN3_SCSI=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -339,6 +340,7 @@ CONFIG_DM_ZERO=m ...@@ -339,6 +340,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -385,6 +387,7 @@ CONFIG_SUN3_82586=y ...@@ -385,6 +387,7 @@ CONFIG_SUN3_82586=y
# CONFIG_NET_VENDOR_SUN is not set # CONFIG_NET_VENDOR_SUN is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -525,6 +528,8 @@ CONFIG_DLM=m ...@@ -525,6 +528,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -542,6 +547,7 @@ CONFIG_TEST_FIRMWARE=m ...@@ -542,6 +547,7 @@ CONFIG_TEST_FIRMWARE=m
CONFIG_TEST_UDELAY=m CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 241e5e6f
...@@ -26,6 +26,8 @@ CONFIG_UNIXWARE_DISKLABEL=y ...@@ -26,6 +26,8 @@ CONFIG_UNIXWARE_DISKLABEL=y
CONFIG_SYSV68_PARTITION=y CONFIG_SYSV68_PARTITION=y
CONFIG_IOSCHED_DEADLINE=m CONFIG_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_DEADLINE=m CONFIG_MQ_IOSCHED_DEADLINE=m
CONFIG_MQ_IOSCHED_KYBER=m
CONFIG_IOSCHED_BFQ=m
CONFIG_KEXEC=y CONFIG_KEXEC=y
CONFIG_BOOTINFO_PROC=y CONFIG_BOOTINFO_PROC=y
CONFIG_SUN3X=y CONFIG_SUN3X=y
...@@ -327,7 +329,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m ...@@ -327,7 +329,6 @@ CONFIG_ISCSI_BOOT_SYSFS=m
CONFIG_SUN3X_ESP=y CONFIG_SUN3X_ESP=y
CONFIG_MD=y CONFIG_MD=y
CONFIG_MD_LINEAR=m CONFIG_MD_LINEAR=m
CONFIG_MD_RAID0=m
CONFIG_BLK_DEV_DM=m CONFIG_BLK_DEV_DM=m
CONFIG_DM_CRYPT=m CONFIG_DM_CRYPT=m
CONFIG_DM_SNAPSHOT=m CONFIG_DM_SNAPSHOT=m
...@@ -339,6 +340,7 @@ CONFIG_DM_ZERO=m ...@@ -339,6 +340,7 @@ CONFIG_DM_ZERO=m
CONFIG_DM_MULTIPATH=m CONFIG_DM_MULTIPATH=m
CONFIG_DM_UEVENT=y CONFIG_DM_UEVENT=y
CONFIG_DM_LOG_WRITES=m CONFIG_DM_LOG_WRITES=m
CONFIG_DM_INTEGRITY=m
CONFIG_TARGET_CORE=m CONFIG_TARGET_CORE=m
CONFIG_TCM_IBLOCK=m CONFIG_TCM_IBLOCK=m
CONFIG_TCM_FILEIO=m CONFIG_TCM_FILEIO=m
...@@ -385,6 +387,7 @@ CONFIG_SUN3LANCE=y ...@@ -385,6 +387,7 @@ CONFIG_SUN3LANCE=y
# CONFIG_NET_VENDOR_STMICRO is not set # CONFIG_NET_VENDOR_STMICRO is not set
# CONFIG_NET_VENDOR_VIA is not set # CONFIG_NET_VENDOR_VIA is not set
# CONFIG_NET_VENDOR_WIZNET is not set # CONFIG_NET_VENDOR_WIZNET is not set
# CONFIG_NET_VENDOR_SYNOPSYS is not set
CONFIG_PPP=m CONFIG_PPP=m
CONFIG_PPP_BSDCOMP=m CONFIG_PPP_BSDCOMP=m
CONFIG_PPP_DEFLATE=m CONFIG_PPP_DEFLATE=m
...@@ -525,6 +528,8 @@ CONFIG_DLM=m ...@@ -525,6 +528,8 @@ CONFIG_DLM=m
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set # CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_MAGIC_SYSRQ=y CONFIG_MAGIC_SYSRQ=y
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_SORT=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
CONFIG_ASYNC_RAID6_TEST=m CONFIG_ASYNC_RAID6_TEST=m
CONFIG_TEST_HEXDUMP=m CONFIG_TEST_HEXDUMP=m
...@@ -543,6 +548,7 @@ CONFIG_TEST_UDELAY=m ...@@ -543,6 +548,7 @@ CONFIG_TEST_UDELAY=m
CONFIG_TEST_STATIC_KEYS=m CONFIG_TEST_STATIC_KEYS=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_ENCRYPTED_KEYS=m CONFIG_ENCRYPTED_KEYS=m
CONFIG_HARDENED_USERCOPY=y
CONFIG_CRYPTO_RSA=m CONFIG_CRYPTO_RSA=m
CONFIG_CRYPTO_DH=m CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
......
arch/m68k/include/asm/signal.h
View file @ 241e5e6f
...@@ -62,9 +62,4 @@ static inline int __gen_sigismember(sigset_t *set, int _sig) ...@@ -62,9 +62,4 @@ static inline int __gen_sigismember(sigset_t *set, int _sig)
#endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */ #endif /* !CONFIG_CPU_HAS_NO_BITFIELDS */
#ifndef __uClinux__
extern void ptrace_signal_deliver(void);
#define ptrace_signal_deliver ptrace_signal_deliver
#endif /* __uClinux__ */
#endif /* _M68K_SIGNAL_H */ #endif /* _M68K_SIGNAL_H */
arch/m68k/kernel/signal.c
View file @ 241e5e6f
...@@ -109,22 +109,6 @@ int fixup_exception(struct pt_regs *regs) ...@@ -109,22 +109,6 @@ int fixup_exception(struct pt_regs *regs)
return 1; return 1;
} }
void ptrace_signal_deliver(void)
{
struct pt_regs *regs = signal_pt_regs();
if (regs->orig_d0 < 0)
return;
switch (regs->d0) {
case -ERESTARTNOHAND:
case -ERESTARTSYS:
case -ERESTARTNOINTR:
regs->d0 = regs->orig_d0;
regs->orig_d0 = -1;
regs->pc -= 2;
break;
}
}
static inline void push_cache (unsigned long vaddr) static inline void push_cache (unsigned long vaddr)
{ {
/* /*
......
drivers/nubus/nubus.c
View file @ 241e5e6f
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
#include <linux/nubus.h> #include <linux/nubus.h>
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <asm/setup.h> #include <asm/setup.h>
...@@ -34,14 +33,6 @@ extern void oss_nubus_init(void); ...@@ -34,14 +33,6 @@ extern void oss_nubus_init(void);
#define NUBUS_TEST_PATTERN 0x5A932BC7 #define NUBUS_TEST_PATTERN 0x5A932BC7
/* Define this if you like to live dangerously - it is known not to
work on pretty much every machine except the Quadra 630 and the LC
III. */
#undef I_WANT_TO_PROBE_SLOT_ZERO
/* This sometimes helps combat failure to boot */
#undef TRY_TO_DODGE_WSOD
/* Globals */ /* Globals */
struct nubus_dev *nubus_devices; struct nubus_dev *nubus_devices;
...@@ -101,9 +92,6 @@ static void nubus_rewind(unsigned char **ptr, int len, int map) ...@@ -101,9 +92,6 @@ static void nubus_rewind(unsigned char **ptr, int len, int map)
{ {
unsigned char *p = *ptr; unsigned char *p = *ptr;
/* Sanity check */
if (len > 65536)
pr_err("rewind of 0x%08x!\n", len);
while (len) { while (len) {
do { do {
p--; p--;
...@@ -117,8 +105,6 @@ static void nubus_advance(unsigned char **ptr, int len, int map) ...@@ -117,8 +105,6 @@ static void nubus_advance(unsigned char **ptr, int len, int map)
{ {
unsigned char *p = *ptr; unsigned char *p = *ptr;
if (len > 65536)
pr_err("advance of 0x%08x!\n", len);
while (len) { while (len) {
while (not_useful(p, map)) while (not_useful(p, map))
p++; p++;
...@@ -130,10 +116,15 @@ static void nubus_advance(unsigned char **ptr, int len, int map) ...@@ -130,10 +116,15 @@ static void nubus_advance(unsigned char **ptr, int len, int map)
static void nubus_move(unsigned char **ptr, int len, int map) static void nubus_move(unsigned char **ptr, int len, int map)
{ {
unsigned long slot_space = (unsigned long)*ptr & 0xFF000000;
if (len > 0) if (len > 0)
nubus_advance(ptr, len, map); nubus_advance(ptr, len, map);
else if (len < 0) else if (len < 0)
nubus_rewind(ptr, -len, map); nubus_rewind(ptr, -len, map);
if (((unsigned long)*ptr & 0xFF000000) != slot_space)
pr_err("%s: moved out of slot address space!\n", __func__);
} }
/* Now, functions to read the sResource tree */ /* Now, functions to read the sResource tree */
...@@ -454,10 +445,6 @@ nubus_get_functional_resource(struct nubus_board *board, int slot, ...@@ -454,10 +445,6 @@ nubus_get_functional_resource(struct nubus_board *board, int slot,
pr_info(" Function 0x%02x:\n", parent->type); pr_info(" Function 0x%02x:\n", parent->type);
nubus_get_subdir(parent, &dir); nubus_get_subdir(parent, &dir);
/* Apple seems to have botched the ROM on the IIx */
if (slot == 0 && (unsigned long)dir.base % 2)
dir.base += 1;
pr_debug("%s: parent is 0x%p, dir is 0x%p\n", pr_debug("%s: parent is 0x%p, dir is 0x%p\n",
__func__, parent->base, dir.base); __func__, parent->base, dir.base);
...@@ -691,83 +678,6 @@ static int __init nubus_get_board_resource(struct nubus_board *board, int slot, ...@@ -691,83 +678,6 @@ static int __init nubus_get_board_resource(struct nubus_board *board, int slot,
return 0; return 0;
} }
/* Attempt to bypass the somewhat non-obvious arrangement of
sResources in the motherboard ROM */
static void __init nubus_find_rom_dir(struct nubus_board* board)
{
unsigned char *rp;
unsigned char *romdir;
struct nubus_dir dir;
struct nubus_dirent ent;
/* Check for the extra directory just under the format block */
rp = board->fblock;
nubus_rewind(&rp, 4, board->lanes);
if (nubus_get_rom(&rp, 4, board->lanes) != NUBUS_TEST_PATTERN) {
/* OK, the ROM was telling the truth */
board->directory = board->fblock;
nubus_move(&board->directory,
nubus_expand32(board->doffset),
board->lanes);
return;
}
/* On "slot zero", you have to walk down a few more
directories to get to the equivalent of a real card's root
directory. We don't know what they were smoking when they
came up with this. */
romdir = nubus_rom_addr(board->slot);
nubus_rewind(&romdir, ROM_DIR_OFFSET, board->lanes);
dir.base = dir.ptr = romdir;
dir.done = 0;
dir.mask = board->lanes;
/* This one points to an "Unknown Macintosh" directory */
if (nubus_readdir(&dir, &ent) == -1)
goto badrom;
if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_INFO "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* This one takes us to where we want to go. */
if (nubus_readdir(&dir, &ent) == -1)
goto badrom;
if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
nubus_get_subdir(&ent, &dir);
/* Resource ID 01, also an "Unknown Macintosh" */
if (nubus_readdir(&dir, &ent) == -1)
goto badrom;
if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* FIXME: the first one is *not* always the right one. We
suspect this has something to do with the ROM revision.
"The HORROR ROM" (LC-series) uses 0x7e, while "The HORROR
Continues" (Q630) uses 0x7b. The DAFB Macs evidently use
something else. Please run "Slots" on your Mac (see
include/linux/nubus.h for where to get this program) and
tell us where the 'SiDirPtr' for Slot 0 is. If you feel
brave, you should also use MacsBug to walk down the ROM
directories like this function does and try to find the
path to that address... */
if (nubus_readdir(&dir, &ent) == -1)
goto badrom;
if (console_loglevel >= CONSOLE_LOGLEVEL_DEBUG)
printk(KERN_DEBUG "nubus_get_rom_dir: entry %02x %06x\n", ent.type, ent.data);
/* Bwahahahaha... */
nubus_get_subdir(&ent, &dir);
board->directory = dir.base;
return;
/* Even more evil laughter... */
badrom:
board->directory = board->fblock;
nubus_move(&board->directory, nubus_expand32(board->doffset), board->lanes);
printk(KERN_ERR "nubus_get_rom_dir: ROM weirdness! Notify the developers...\n");
}
/* Add a board (might be many devices) to the list */ /* Add a board (might be many devices) to the list */
static struct nubus_board * __init nubus_add_board(int slot, int bytelanes) static struct nubus_board * __init nubus_add_board(int slot, int bytelanes)
{ {
...@@ -828,8 +738,11 @@ static struct nubus_board * __init nubus_add_board(int slot, int bytelanes) ...@@ -828,8 +738,11 @@ static struct nubus_board * __init nubus_add_board(int slot, int bytelanes)
* since the initial Macintosh ROM releases skipped the check. * since the initial Macintosh ROM releases skipped the check.
*/ */
/* Attempt to work around slot zero weirdness */ /* Set up the directory pointer */
nubus_find_rom_dir(board); board->directory = board->fblock;
nubus_move(&board->directory, nubus_expand32(board->doffset),
board->lanes);
nubus_get_root_dir(board, &dir); nubus_get_root_dir(board, &dir);
/* We're ready to rock */ /* We're ready to rock */
...@@ -849,9 +762,6 @@ static struct nubus_board * __init nubus_add_board(int slot, int bytelanes) ...@@ -849,9 +762,6 @@ static struct nubus_board * __init nubus_add_board(int slot, int bytelanes)
nubus_get_board_resource(board, slot, &ent); nubus_get_board_resource(board, slot, &ent);
} }
/* Aaaarrrrgghh! The LC III motherboard has *two* board
resources. I have no idea WTF to do about this. */
while (nubus_readdir(&dir, &ent) != -1) { while (nubus_readdir(&dir, &ent) != -1) {
struct nubus_dev *dev; struct nubus_dev *dev;
struct nubus_dev **devp; struct nubus_dev **devp;
...@@ -898,8 +808,6 @@ void __init nubus_probe_slot(int slot) ...@@ -898,8 +808,6 @@ void __init nubus_probe_slot(int slot)
continue; continue;
dp = *rp; dp = *rp;
if(dp == 0)
continue;
/* The last byte of the format block consists of two /* The last byte of the format block consists of two
nybbles which are "mirror images" of each other. nybbles which are "mirror images" of each other.
...@@ -908,7 +816,7 @@ void __init nubus_probe_slot(int slot) ...@@ -908,7 +816,7 @@ void __init nubus_probe_slot(int slot)
continue; continue;
/* Check that this value is actually *on* one of the /* Check that this value is actually *on* one of the
bytelanes it claims are valid! */ bytelanes it claims are valid! */
if ((dp & 0x0F) >= (1 << i)) if (not_useful(rp, dp))
continue; continue;
/* Looks promising. Let's put it on the list. */ /* Looks promising. Let's put it on the list. */
...@@ -922,10 +830,6 @@ void __init nubus_scan_bus(void) ...@@ -922,10 +830,6 @@ void __init nubus_scan_bus(void)
{ {
int slot; int slot;
/* This might not work on your machine */
#ifdef I_WANT_TO_PROBE_SLOT_ZERO
nubus_probe_slot(0);
#endif
for (slot = 9; slot < 15; slot++) { for (slot = 9; slot < 15; slot++) {
nubus_probe_slot(slot); nubus_probe_slot(slot);
} }
...@@ -943,13 +847,6 @@ static int __init nubus_init(void) ...@@ -943,13 +847,6 @@ static int __init nubus_init(void)
via_nubus_init(); via_nubus_init();
} }
#ifdef TRY_TO_DODGE_WSOD
/* Rogue Ethernet interrupts can kill the machine if we don't
do this. Obviously this is bogus. Hopefully the local VIA
gurus can fix the real cause of the problem. */
mdelay(1000);
#endif
/* And probe */ /* And probe */
pr_info("NuBus: Scanning NuBus slots.\n"); pr_info("NuBus: Scanning NuBus slots.\n");
nubus_devices = NULL; nubus_devices = NULL;
......
include/linux/ptrace.h
View file @ 241e5e6f
...@@ -391,10 +391,6 @@ static inline void user_single_step_siginfo(struct task_struct *tsk, ...@@ -391,10 +391,6 @@ static inline void user_single_step_siginfo(struct task_struct *tsk,
#define current_pt_regs() task_pt_regs(current) #define current_pt_regs() task_pt_regs(current)
#endif #endif
#ifndef ptrace_signal_deliver
#define ptrace_signal_deliver() ((void)0)
#endif
/* /*
* unlike current_pt_regs(), this one is equal to task_pt_regs(current) * unlike current_pt_regs(), this one is equal to task_pt_regs(current)
* on *all* architectures; the only reason to have a per-arch definition * on *all* architectures; the only reason to have a per-arch definition
......
kernel/signal.c
View file @ 241e5e6f
...@@ -2100,7 +2100,6 @@ static void do_jobctl_trap(void) ...@@ -2100,7 +2100,6 @@ static void do_jobctl_trap(void)
static int ptrace_signal(int signr, siginfo_t *info) static int ptrace_signal(int signr, siginfo_t *info)
{ {
ptrace_signal_deliver();
/* /*
* We do not check sig_kernel_stop(signr) but set this marker * We do not check sig_kernel_stop(signr) but set this marker
* unconditionally because we do not know whether debugger will * unconditionally because we do not know whether debugger will
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7