Skip to content

L
linux
Commit 3ee3723b authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

Pull m68k updates from Geert Uytterhoeven:

 - several Mac fixes

 - defconfig updates

 - minor cleanups and fixes

* tag 'm68k-for-v5.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: tools: Replace zero-length array with flexible-array member
  m68k: Add missing __user annotation in get_user()
  m68k: mac: Avoid stuck ISM IOP interrupt on Quadra 900/950
  m68k: mac: Remove misleading comment
  m68k: mac: Don't call via_flush_cache() on Mac IIfx
  m68k: defconfig: Update defconfigs for v5.7-rc1
  m68k: amiga: config: Replace zero-length array with flexible-array member
  m68k: amiga: config: Mark expected switch fall-through
parents 4e909124 3381df09
Show whitespace changes
Inline Side-by-side
Showing with 102 additions and 60 deletions
arch/m68k/amiga/config.c
View file @ 3ee3723b
...@@ -221,6 +221,7 @@ static void __init amiga_identify(void) ...@@ -221,6 +221,7 @@ static void __init amiga_identify(void)
case AMI_1200: case AMI_1200:
AMIGAHW_SET(A1200_IDE); AMIGAHW_SET(A1200_IDE);
AMIGAHW_SET(PCMCIA); AMIGAHW_SET(PCMCIA);
fallthrough;
case AMI_500: case AMI_500:
case AMI_500PLUS: case AMI_500PLUS:
case AMI_1000: case AMI_1000:
...@@ -233,7 +234,7 @@ static void __init amiga_identify(void) ...@@ -233,7 +234,7 @@ static void __init amiga_identify(void)
case AMI_3000T: case AMI_3000T:
AMIGAHW_SET(AMBER_FF); AMIGAHW_SET(AMBER_FF);
AMIGAHW_SET(MAGIC_REKICK); AMIGAHW_SET(MAGIC_REKICK);
/* fall through */ fallthrough;
case AMI_3000PLUS: case AMI_3000PLUS:
AMIGAHW_SET(A3000_SCSI); AMIGAHW_SET(A3000_SCSI);
AMIGAHW_SET(A3000_CLK); AMIGAHW_SET(A3000_CLK);
...@@ -242,7 +243,7 @@ static void __init amiga_identify(void) ...@@ -242,7 +243,7 @@ static void __init amiga_identify(void)
case AMI_4000T: case AMI_4000T:
AMIGAHW_SET(A4000_SCSI); AMIGAHW_SET(A4000_SCSI);
/* fall through */ fallthrough;
case AMI_4000: case AMI_4000:
AMIGAHW_SET(A4000_IDE); AMIGAHW_SET(A4000_IDE);
AMIGAHW_SET(A3000_CLK); AMIGAHW_SET(A3000_CLK);
...@@ -628,7 +629,7 @@ struct savekmsg { ...@@ -628,7 +629,7 @@ struct savekmsg {
unsigned long magic2; /* SAVEKMSG_MAGIC2 */ unsigned long magic2; /* SAVEKMSG_MAGIC2 */
unsigned long magicptr; /* address of magic1 */ unsigned long magicptr; /* address of magic1 */
unsigned long size; unsigned long size;
char data[0]; char data[];
}; };
static struct savekmsg *savekmsg; static struct savekmsg *savekmsg;
......
arch/m68k/configs/amiga_defconfig
View file @ 3ee3723b
...@@ -100,7 +100,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -100,7 +100,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -381,6 +380,7 @@ CONFIG_IPVLAN=m ...@@ -381,6 +380,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -452,6 +452,7 @@ CONFIG_RTC_CLASS=y ...@@ -452,6 +452,7 @@ CONFIG_RTC_CLASS=y
CONFIG_RTC_DRV_MSM6242=m CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_RP5C01=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -472,6 +473,7 @@ CONFIG_ZISOFS=y ...@@ -472,6 +473,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -619,9 +621,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -619,9 +621,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/apollo_defconfig
View file @ 3ee3723b
...@@ -96,7 +96,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -96,7 +96,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -360,6 +359,7 @@ CONFIG_IPVLAN=m ...@@ -360,6 +359,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -408,6 +408,7 @@ CONFIG_RTC_CLASS=y ...@@ -408,6 +408,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -428,6 +429,7 @@ CONFIG_ZISOFS=y ...@@ -428,6 +429,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -575,9 +577,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -575,9 +577,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/atari_defconfig
View file @ 3ee3723b
...@@ -103,7 +103,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -103,7 +103,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -376,6 +375,7 @@ CONFIG_IPVLAN=m ...@@ -376,6 +375,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -430,6 +430,7 @@ CONFIG_RTC_CLASS=y ...@@ -430,6 +430,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -450,6 +451,7 @@ CONFIG_ZISOFS=y ...@@ -450,6 +451,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -597,9 +599,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -597,9 +599,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 3ee3723b
...@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m ...@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y ...@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y ...@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/hp300_defconfig
View file @ 3ee3723b
...@@ -95,7 +95,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -95,7 +95,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -359,6 +358,7 @@ CONFIG_IPVLAN=m ...@@ -359,6 +358,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -410,6 +410,7 @@ CONFIG_RTC_CLASS=y ...@@ -410,6 +410,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -430,6 +431,7 @@ CONFIG_ZISOFS=y ...@@ -430,6 +431,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -577,9 +579,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -577,9 +579,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/mac_defconfig
View file @ 3ee3723b
...@@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -375,6 +374,7 @@ CONFIG_IPVLAN=m ...@@ -375,6 +374,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -432,6 +432,7 @@ CONFIG_RTC_CLASS=y ...@@ -432,6 +432,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -452,6 +453,7 @@ CONFIG_ZISOFS=y ...@@ -452,6 +453,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -599,9 +601,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -599,9 +601,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/multi_defconfig
View file @ 3ee3723b
...@@ -114,7 +114,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -114,7 +114,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -419,6 +418,7 @@ CONFIG_IPVLAN=m ...@@ -419,6 +418,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -518,6 +518,7 @@ CONFIG_RTC_DRV_MSM6242=m ...@@ -518,6 +518,7 @@ CONFIG_RTC_DRV_MSM6242=m
CONFIG_RTC_DRV_RP5C01=m CONFIG_RTC_DRV_RP5C01=m
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -538,6 +539,7 @@ CONFIG_ZISOFS=y ...@@ -538,6 +539,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -685,9 +687,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -685,9 +687,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 3ee3723b
...@@ -92,7 +92,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -92,7 +92,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -357,6 +356,7 @@ CONFIG_IPVLAN=m ...@@ -357,6 +356,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -400,6 +400,7 @@ CONFIG_RTC_CLASS=y ...@@ -400,6 +400,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -420,6 +421,7 @@ CONFIG_ZISOFS=y ...@@ -420,6 +421,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -567,9 +569,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -567,9 +569,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 3ee3723b
...@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -93,7 +93,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m ...@@ -358,6 +357,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y ...@@ -401,6 +401,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y ...@@ -421,6 +422,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -568,9 +570,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/q40_defconfig
View file @ 3ee3723b
...@@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -94,7 +94,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -365,6 +364,7 @@ CONFIG_IPVLAN=m ...@@ -365,6 +364,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -419,6 +419,7 @@ CONFIG_RTC_CLASS=y ...@@ -419,6 +419,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -439,6 +440,7 @@ CONFIG_ZISOFS=y ...@@ -439,6 +440,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -586,9 +588,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -586,9 +588,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/sun3_defconfig
View file @ 3ee3723b
...@@ -90,7 +90,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -90,7 +90,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -355,6 +354,7 @@ CONFIG_IPVLAN=m ...@@ -355,6 +354,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -403,6 +403,7 @@ CONFIG_RTC_CLASS=y ...@@ -403,6 +403,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -423,6 +424,7 @@ CONFIG_ZISOFS=y ...@@ -423,6 +424,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -570,8 +572,10 @@ CONFIG_XZ_DEC_TEST=m ...@@ -570,8 +572,10 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 3ee3723b
...@@ -90,7 +90,6 @@ CONFIG_NF_CONNTRACK_SANE=m ...@@ -90,7 +90,6 @@ CONFIG_NF_CONNTRACK_SANE=m
CONFIG_NF_CONNTRACK_SIP=m CONFIG_NF_CONNTRACK_SIP=m
CONFIG_NF_CONNTRACK_TFTP=m CONFIG_NF_CONNTRACK_TFTP=m
CONFIG_NF_TABLES=m CONFIG_NF_TABLES=m
CONFIG_NF_TABLES_SET=m
CONFIG_NF_TABLES_INET=y CONFIG_NF_TABLES_INET=y
CONFIG_NF_TABLES_NETDEV=y CONFIG_NF_TABLES_NETDEV=y
CONFIG_NFT_NUMGEN=m CONFIG_NFT_NUMGEN=m
...@@ -355,6 +354,7 @@ CONFIG_IPVLAN=m ...@@ -355,6 +354,7 @@ CONFIG_IPVLAN=m
CONFIG_IPVTAP=m CONFIG_IPVTAP=m
CONFIG_VXLAN=m CONFIG_VXLAN=m
CONFIG_GENEVE=m CONFIG_GENEVE=m
CONFIG_BAREUDP=m
CONFIG_GTP=m CONFIG_GTP=m
CONFIG_MACSEC=m CONFIG_MACSEC=m
CONFIG_NETCONSOLE=m CONFIG_NETCONSOLE=m
...@@ -402,6 +402,7 @@ CONFIG_RTC_CLASS=y ...@@ -402,6 +402,7 @@ CONFIG_RTC_CLASS=y
# CONFIG_RTC_NVMEM is not set # CONFIG_RTC_NVMEM is not set
CONFIG_RTC_DRV_GENERIC=m CONFIG_RTC_DRV_GENERIC=m
# CONFIG_VIRTIO_MENU is not set # CONFIG_VIRTIO_MENU is not set
# CONFIG_VHOST_MENU is not set
# CONFIG_IOMMU_SUPPORT is not set # CONFIG_IOMMU_SUPPORT is not set
CONFIG_DAX=m CONFIG_DAX=m
CONFIG_EXT4_FS=y CONFIG_EXT4_FS=y
...@@ -422,6 +423,7 @@ CONFIG_ZISOFS=y ...@@ -422,6 +423,7 @@ CONFIG_ZISOFS=y
CONFIG_UDF_FS=m CONFIG_UDF_FS=m
CONFIG_MSDOS_FS=m CONFIG_MSDOS_FS=m
CONFIG_VFAT_FS=m CONFIG_VFAT_FS=m
CONFIG_EXFAT_FS=m
CONFIG_PROC_KCORE=y CONFIG_PROC_KCORE=y
CONFIG_PROC_CHILDREN=y CONFIG_PROC_CHILDREN=y
CONFIG_TMPFS=y CONFIG_TMPFS=y
...@@ -569,9 +571,11 @@ CONFIG_XZ_DEC_TEST=m ...@@ -569,9 +571,11 @@ CONFIG_XZ_DEC_TEST=m
CONFIG_STRING_SELFTEST=m CONFIG_STRING_SELFTEST=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_TEST_LOCKUP=m
CONFIG_WW_MUTEX_SELFTEST=m CONFIG_WW_MUTEX_SELFTEST=m
CONFIG_EARLY_PRINTK=y CONFIG_EARLY_PRINTK=y
CONFIG_TEST_LIST_SORT=m CONFIG_TEST_LIST_SORT=m
CONFIG_TEST_MIN_HEAP=m
CONFIG_TEST_SORT=m CONFIG_TEST_SORT=m
CONFIG_REED_SOLOMON_TEST=m CONFIG_REED_SOLOMON_TEST=m
CONFIG_ATOMIC64_SELFTEST=m CONFIG_ATOMIC64_SELFTEST=m
......
arch/m68k/include/asm/mac_via.h
View file @ 3ee3723b
...@@ -257,6 +257,7 @@ extern int rbv_present,via_alt_mapping; ...@@ -257,6 +257,7 @@ extern int rbv_present,via_alt_mapping;
struct irq_desc; struct irq_desc;
extern void via_l2_flush(int writeback);
extern void via_register_interrupts(void); extern void via_register_interrupts(void);
extern void via_irq_enable(int); extern void via_irq_enable(int);
extern void via_irq_disable(int); extern void via_irq_disable(int);
......
arch/m68k/include/asm/uaccess_mm.h
View file @ 3ee3723b
...@@ -142,7 +142,7 @@ asm volatile ("\n" \ ...@@ -142,7 +142,7 @@ asm volatile ("\n" \
__get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \ __get_user_asm(__gu_err, x, ptr, u32, l, r, -EFAULT); \
break; \ break; \
case 8: { \ case 8: { \
const void *__gu_ptr = (ptr); \ const void __user *__gu_ptr = (ptr); \
union { \ union { \
u64 l; \ u64 l; \
__typeof__(*(ptr)) t; \ __typeof__(*(ptr)) t; \
......
arch/m68k/mac/config.c
View file @ 3ee3723b
...@@ -59,7 +59,6 @@ extern void iop_preinit(void); ...@@ -59,7 +59,6 @@ extern void iop_preinit(void);
extern void iop_init(void); extern void iop_init(void);
extern void via_init(void); extern void via_init(void);
extern void via_init_clock(irq_handler_t func); extern void via_init_clock(irq_handler_t func);
extern void via_flush_cache(void);
extern void oss_init(void); extern void oss_init(void);
extern void psc_init(void); extern void psc_init(void);
extern void baboon_init(void); extern void baboon_init(void);
...@@ -130,21 +129,6 @@ int __init mac_parse_bootinfo(const struct bi_record *record) ...@@ -130,21 +129,6 @@ int __init mac_parse_bootinfo(const struct bi_record *record)
return unknown; return unknown;
} }
/*
* Flip into 24bit mode for an instant - flushes the L2 cache card. We
* have to disable interrupts for this. Our IRQ handlers will crap
* themselves if they take an IRQ in 24bit mode!
*/
static void mac_cache_card_flush(int writeback)
{
unsigned long flags;
local_irq_save(flags);
via_flush_cache();
local_irq_restore(flags);
}
void __init config_mac(void) void __init config_mac(void)
{ {
if (!MACH_IS_MAC) if (!MACH_IS_MAC)
...@@ -175,9 +159,8 @@ void __init config_mac(void) ...@@ -175,9 +159,8 @@ void __init config_mac(void)
* not. * not.
*/ */
if (macintosh_config->ident == MAC_MODEL_IICI if (macintosh_config->ident == MAC_MODEL_IICI)
|| macintosh_config->ident == MAC_MODEL_IIFX) mach_l2_flush = via_l2_flush;
mach_l2_flush = mac_cache_card_flush;
} }
......
arch/m68k/mac/iop.c
View file @ 3ee3723b
...@@ -299,7 +299,6 @@ void __init iop_init(void) ...@@ -299,7 +299,6 @@ void __init iop_init(void)
/* /*
* Register the interrupt handler for the IOPs. * Register the interrupt handler for the IOPs.
* TODO: might be wrong for non-OSS machines. Anyone?
*/ */
void __init iop_register_interrupts(void) void __init iop_register_interrupts(void)
...@@ -566,36 +565,42 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id) ...@@ -566,36 +565,42 @@ irqreturn_t iop_ism_irq(int irq, void *dev_id)
uint iop_num = (uint) dev_id; uint iop_num = (uint) dev_id;
volatile struct mac_iop *iop = iop_base[iop_num]; volatile struct mac_iop *iop = iop_base[iop_num];
int i,state; int i,state;
u8 events = iop->status_ctrl & (IOP_INT0 | IOP_INT1);
iop_pr_debug("status %02X\n", iop->status_ctrl); iop_pr_debug("status %02X\n", iop->status_ctrl);
/* INT0 indicates a state change on an outgoing message channel */ do {
/* INT0 indicates state change on an outgoing message channel */
if (iop->status_ctrl & IOP_INT0) { if (events & IOP_INT0) {
iop->status_ctrl = IOP_INT0 | IOP_RUN | IOP_AUTOINC; iop->status_ctrl = IOP_INT0 | IOP_RUN | IOP_AUTOINC;
iop_pr_debug("new status %02X, send states", iop->status_ctrl); iop_pr_debug("new status %02X, send states",
for (i = 0 ; i < NUM_IOP_CHAN ; i++) { iop->status_ctrl);
for (i = 0; i < NUM_IOP_CHAN; i++) {
state = iop_readb(iop, IOP_ADDR_SEND_STATE + i); state = iop_readb(iop, IOP_ADDR_SEND_STATE + i);
iop_pr_cont(" %02X", state); iop_pr_cont(" %02X", state);
if (state == IOP_MSG_COMPLETE) { if (state == IOP_MSG_COMPLETE)
iop_handle_send(iop_num, i); iop_handle_send(iop_num, i);
} }
}
iop_pr_cont("\n"); iop_pr_cont("\n");
} }
if (iop->status_ctrl & IOP_INT1) { /* INT1 for incoming msgs */ /* INT1 for incoming messages */
if (events & IOP_INT1) {
iop->status_ctrl = IOP_INT1 | IOP_RUN | IOP_AUTOINC; iop->status_ctrl = IOP_INT1 | IOP_RUN | IOP_AUTOINC;
iop_pr_debug("new status %02X, recv states", iop->status_ctrl); iop_pr_debug("new status %02X, recv states",
for (i = 0 ; i < NUM_IOP_CHAN ; i++) { iop->status_ctrl);
for (i = 0; i < NUM_IOP_CHAN; i++) {
state = iop_readb(iop, IOP_ADDR_RECV_STATE + i); state = iop_readb(iop, IOP_ADDR_RECV_STATE + i);
iop_pr_cont(" %02X", state); iop_pr_cont(" %02X", state);
if (state == IOP_MSG_NEW) { if (state == IOP_MSG_NEW)
iop_handle_recv(iop_num, i); iop_handle_recv(iop_num, i);
} }
}
iop_pr_cont("\n"); iop_pr_cont("\n");
} }
events = iop->status_ctrl & (IOP_INT0 | IOP_INT1);
} while (events);
return IRQ_HANDLED; return IRQ_HANDLED;
} }
......
arch/m68k/mac/via.c
View file @ 3ee3723b
...@@ -294,10 +294,14 @@ void via_debug_dump(void) ...@@ -294,10 +294,14 @@ void via_debug_dump(void)
* the system into 24-bit mode for an instant. * the system into 24-bit mode for an instant.
*/ */
void via_flush_cache(void) void via_l2_flush(int writeback)
{ {
unsigned long flags;
local_irq_save(flags);
via2[gBufB] &= ~VIA2B_vMode32; via2[gBufB] &= ~VIA2B_vMode32;
via2[gBufB] |= VIA2B_vMode32; via2[gBufB] |= VIA2B_vMode32;
local_irq_restore(flags);
} }
/* /*
......
arch/m68k/tools/amiga/dmesg.c
View file @ 3ee3723b
...@@ -34,7 +34,7 @@ struct savekmsg { ...@@ -34,7 +34,7 @@ struct savekmsg {
u_long magic2; /* SAVEKMSG_MAGIC2 */ u_long magic2; /* SAVEKMSG_MAGIC2 */
u_long magicptr; /* address of magic1 */ u_long magicptr; /* address of magic1 */
u_long size; u_long size;
char data[0]; char data[];
}; };
......
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