aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig12
-rw-r--r--arch/m68k/configs/apollo_defconfig12
-rw-r--r--arch/m68k/configs/atari_defconfig12
-rw-r--r--arch/m68k/configs/bvme6000_defconfig12
-rw-r--r--arch/m68k/configs/hp300_defconfig12
-rw-r--r--arch/m68k/configs/mac_defconfig12
-rw-r--r--arch/m68k/configs/multi_defconfig12
-rw-r--r--arch/m68k/configs/mvme147_defconfig12
-rw-r--r--arch/m68k/configs/mvme16x_defconfig12
-rw-r--r--arch/m68k/configs/q40_defconfig12
-rw-r--r--arch/m68k/configs/sun3_defconfig12
-rw-r--r--arch/m68k/configs/sun3x_defconfig12
-rw-r--r--arch/m68k/kernel/time.c2
-rw-r--r--arch/m68k/mac/baboon.c27
-rw-r--r--arch/m68k/mac/config.c10
-rw-r--r--arch/m68k/mac/misc.c134
-rw-r--r--arch/m68k/mm/init.c27
-rw-r--r--drivers/macintosh/via-pmu68k.c89
-rw-r--r--drivers/zorro/zorro.c12
19 files changed, 296 insertions, 149 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 52fa7fbdefa2..37a8e5ab8728 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -105,6 +105,7 @@ CONFIG_NFT_META=m
105CONFIG_NFT_RT=m 105CONFIG_NFT_RT=m
106CONFIG_NFT_NUMGEN=m 106CONFIG_NFT_NUMGEN=m
107CONFIG_NFT_CT=m 107CONFIG_NFT_CT=m
108CONFIG_NFT_FLOW_OFFLOAD=m
108CONFIG_NFT_SET_RBTREE=m 109CONFIG_NFT_SET_RBTREE=m
109CONFIG_NFT_SET_HASH=m 110CONFIG_NFT_SET_HASH=m
110CONFIG_NFT_SET_BITMAP=m 111CONFIG_NFT_SET_BITMAP=m
@@ -124,6 +125,8 @@ CONFIG_NFT_FIB_INET=m
124CONFIG_NFT_DUP_NETDEV=m 125CONFIG_NFT_DUP_NETDEV=m
125CONFIG_NFT_FWD_NETDEV=m 126CONFIG_NFT_FWD_NETDEV=m
126CONFIG_NFT_FIB_NETDEV=m 127CONFIG_NFT_FIB_NETDEV=m
128CONFIG_NF_FLOW_TABLE_INET=m
129CONFIG_NF_FLOW_TABLE=m
127CONFIG_NETFILTER_XT_SET=m 130CONFIG_NETFILTER_XT_SET=m
128CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 131CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
129CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 132CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -202,6 +205,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
202CONFIG_NFT_DUP_IPV4=m 205CONFIG_NFT_DUP_IPV4=m
203CONFIG_NFT_FIB_IPV4=m 206CONFIG_NFT_FIB_IPV4=m
204CONFIG_NF_TABLES_ARP=m 207CONFIG_NF_TABLES_ARP=m
208CONFIG_NF_FLOW_TABLE_IPV4=m
205CONFIG_NF_LOG_ARP=m 209CONFIG_NF_LOG_ARP=m
206CONFIG_NFT_CHAIN_NAT_IPV4=m 210CONFIG_NFT_CHAIN_NAT_IPV4=m
207CONFIG_NFT_MASQ_IPV4=m 211CONFIG_NFT_MASQ_IPV4=m
@@ -231,6 +235,7 @@ CONFIG_NF_SOCKET_IPV6=m
231CONFIG_NFT_CHAIN_ROUTE_IPV6=m 235CONFIG_NFT_CHAIN_ROUTE_IPV6=m
232CONFIG_NFT_DUP_IPV6=m 236CONFIG_NFT_DUP_IPV6=m
233CONFIG_NFT_FIB_IPV6=m 237CONFIG_NFT_FIB_IPV6=m
238CONFIG_NF_FLOW_TABLE_IPV6=m
234CONFIG_NFT_CHAIN_NAT_IPV6=m 239CONFIG_NFT_CHAIN_NAT_IPV6=m
235CONFIG_NFT_MASQ_IPV6=m 240CONFIG_NFT_MASQ_IPV6=m
236CONFIG_NFT_REDIR_IPV6=m 241CONFIG_NFT_REDIR_IPV6=m
@@ -244,6 +249,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
244CONFIG_IP6_NF_MATCH_MH=m 249CONFIG_IP6_NF_MATCH_MH=m
245CONFIG_IP6_NF_MATCH_RPFILTER=m 250CONFIG_IP6_NF_MATCH_RPFILTER=m
246CONFIG_IP6_NF_MATCH_RT=m 251CONFIG_IP6_NF_MATCH_RT=m
252CONFIG_IP6_NF_MATCH_SRH=m
247CONFIG_IP6_NF_TARGET_HL=m 253CONFIG_IP6_NF_TARGET_HL=m
248CONFIG_IP6_NF_FILTER=m 254CONFIG_IP6_NF_FILTER=m
249CONFIG_IP6_NF_TARGET_REJECT=m 255CONFIG_IP6_NF_TARGET_REJECT=m
@@ -354,6 +360,7 @@ CONFIG_SCSI_ZORRO7XX=y
354CONFIG_MD=y 360CONFIG_MD=y
355CONFIG_MD_LINEAR=m 361CONFIG_MD_LINEAR=m
356CONFIG_BLK_DEV_DM=m 362CONFIG_BLK_DEV_DM=m
363CONFIG_DM_UNSTRIPED=m
357CONFIG_DM_CRYPT=m 364CONFIG_DM_CRYPT=m
358CONFIG_DM_SNAPSHOT=m 365CONFIG_DM_SNAPSHOT=m
359CONFIG_DM_THIN_PROVISIONING=m 366CONFIG_DM_THIN_PROVISIONING=m
@@ -399,6 +406,7 @@ CONFIG_ARIADNE=y
399# CONFIG_NET_CADENCE is not set 406# CONFIG_NET_CADENCE is not set
400# CONFIG_NET_VENDOR_BROADCOM is not set 407# CONFIG_NET_VENDOR_BROADCOM is not set
401# CONFIG_NET_VENDOR_CIRRUS is not set 408# CONFIG_NET_VENDOR_CIRRUS is not set
409# CONFIG_NET_VENDOR_CORTINA is not set
402# CONFIG_NET_VENDOR_EZCHIP is not set 410# CONFIG_NET_VENDOR_EZCHIP is not set
403# CONFIG_NET_VENDOR_HP is not set 411# CONFIG_NET_VENDOR_HP is not set
404# CONFIG_NET_VENDOR_HUAWEI is not set 412# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -416,6 +424,7 @@ CONFIG_ZORRO8390=y
416# CONFIG_NET_VENDOR_SEEQ is not set 424# CONFIG_NET_VENDOR_SEEQ is not set
417# CONFIG_NET_VENDOR_SOLARFLARE is not set 425# CONFIG_NET_VENDOR_SOLARFLARE is not set
418# CONFIG_NET_VENDOR_SMSC is not set 426# CONFIG_NET_VENDOR_SMSC is not set
427# CONFIG_NET_VENDOR_SOCIONEXT is not set
419# CONFIG_NET_VENDOR_STMICRO is not set 428# CONFIG_NET_VENDOR_STMICRO is not set
420# CONFIG_NET_VENDOR_VIA is not set 429# CONFIG_NET_VENDOR_VIA is not set
421# CONFIG_NET_VENDOR_WIZNET is not set 430# CONFIG_NET_VENDOR_WIZNET is not set
@@ -474,6 +483,7 @@ CONFIG_RTC_CLASS=y
474# CONFIG_RTC_NVMEM is not set 483# CONFIG_RTC_NVMEM is not set
475CONFIG_RTC_DRV_MSM6242=m 484CONFIG_RTC_DRV_MSM6242=m
476CONFIG_RTC_DRV_RP5C01=m 485CONFIG_RTC_DRV_RP5C01=m
486# CONFIG_VIRTIO_MENU is not set
477# CONFIG_IOMMU_SUPPORT is not set 487# CONFIG_IOMMU_SUPPORT is not set
478CONFIG_HEARTBEAT=y 488CONFIG_HEARTBEAT=y
479CONFIG_PROC_HARDWARE=y 489CONFIG_PROC_HARDWARE=y
@@ -593,7 +603,7 @@ CONFIG_TEST_RHASHTABLE=m
593CONFIG_TEST_HASH=m 603CONFIG_TEST_HASH=m
594CONFIG_TEST_USER_COPY=m 604CONFIG_TEST_USER_COPY=m
595CONFIG_TEST_BPF=m 605CONFIG_TEST_BPF=m
596CONFIG_TEST_FIND_BIT=m 606CONFIG_FIND_BIT_BENCHMARK=m
597CONFIG_TEST_FIRMWARE=m 607CONFIG_TEST_FIRMWARE=m
598CONFIG_TEST_SYSCTL=m 608CONFIG_TEST_SYSCTL=m
599CONFIG_TEST_UDELAY=m 609CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index b00fe19e1c04..6a466266b852 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m
103CONFIG_NFT_RT=m 103CONFIG_NFT_RT=m
104CONFIG_NFT_NUMGEN=m 104CONFIG_NFT_NUMGEN=m
105CONFIG_NFT_CT=m 105CONFIG_NFT_CT=m
106CONFIG_NFT_FLOW_OFFLOAD=m
106CONFIG_NFT_SET_RBTREE=m 107CONFIG_NFT_SET_RBTREE=m
107CONFIG_NFT_SET_HASH=m 108CONFIG_NFT_SET_HASH=m
108CONFIG_NFT_SET_BITMAP=m 109CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 123CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 124CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m 125CONFIG_NFT_FIB_NETDEV=m
126CONFIG_NF_FLOW_TABLE_INET=m
127CONFIG_NF_FLOW_TABLE=m
125CONFIG_NETFILTER_XT_SET=m 128CONFIG_NETFILTER_XT_SET=m
126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 129CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 130CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
200CONFIG_NFT_DUP_IPV4=m 203CONFIG_NFT_DUP_IPV4=m
201CONFIG_NFT_FIB_IPV4=m 204CONFIG_NFT_FIB_IPV4=m
202CONFIG_NF_TABLES_ARP=m 205CONFIG_NF_TABLES_ARP=m
206CONFIG_NF_FLOW_TABLE_IPV4=m
203CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
204CONFIG_NFT_CHAIN_NAT_IPV4=m 208CONFIG_NFT_CHAIN_NAT_IPV4=m
205CONFIG_NFT_MASQ_IPV4=m 209CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 233CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 234CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 235CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m
232CONFIG_NFT_CHAIN_NAT_IPV6=m 237CONFIG_NFT_CHAIN_NAT_IPV6=m
233CONFIG_NFT_MASQ_IPV6=m 238CONFIG_NFT_MASQ_IPV6=m
234CONFIG_NFT_REDIR_IPV6=m 239CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
242CONFIG_IP6_NF_MATCH_MH=m 247CONFIG_IP6_NF_MATCH_MH=m
243CONFIG_IP6_NF_MATCH_RPFILTER=m 248CONFIG_IP6_NF_MATCH_RPFILTER=m
244CONFIG_IP6_NF_MATCH_RT=m 249CONFIG_IP6_NF_MATCH_RT=m
250CONFIG_IP6_NF_MATCH_SRH=m
245CONFIG_IP6_NF_TARGET_HL=m 251CONFIG_IP6_NF_TARGET_HL=m
246CONFIG_IP6_NF_FILTER=m 252CONFIG_IP6_NF_FILTER=m
247CONFIG_IP6_NF_TARGET_REJECT=m 253CONFIG_IP6_NF_TARGET_REJECT=m
@@ -336,6 +342,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
336CONFIG_MD=y 342CONFIG_MD=y
337CONFIG_MD_LINEAR=m 343CONFIG_MD_LINEAR=m
338CONFIG_BLK_DEV_DM=m 344CONFIG_BLK_DEV_DM=m
345CONFIG_DM_UNSTRIPED=m
339CONFIG_DM_CRYPT=m 346CONFIG_DM_CRYPT=m
340CONFIG_DM_SNAPSHOT=m 347CONFIG_DM_SNAPSHOT=m
341CONFIG_DM_THIN_PROVISIONING=m 348CONFIG_DM_THIN_PROVISIONING=m
@@ -377,6 +384,7 @@ CONFIG_VETH=m
377# CONFIG_NET_VENDOR_ARC is not set 384# CONFIG_NET_VENDOR_ARC is not set
378# CONFIG_NET_CADENCE is not set 385# CONFIG_NET_CADENCE is not set
379# CONFIG_NET_VENDOR_BROADCOM is not set 386# CONFIG_NET_VENDOR_BROADCOM is not set
387# CONFIG_NET_VENDOR_CORTINA is not set
380# CONFIG_NET_VENDOR_EZCHIP is not set 388# CONFIG_NET_VENDOR_EZCHIP is not set
381# CONFIG_NET_VENDOR_HUAWEI is not set 389# CONFIG_NET_VENDOR_HUAWEI is not set
382# CONFIG_NET_VENDOR_INTEL is not set 390# CONFIG_NET_VENDOR_INTEL is not set
@@ -390,6 +398,7 @@ CONFIG_VETH=m
390# CONFIG_NET_VENDOR_SAMSUNG is not set 398# CONFIG_NET_VENDOR_SAMSUNG is not set
391# CONFIG_NET_VENDOR_SEEQ is not set 399# CONFIG_NET_VENDOR_SEEQ is not set
392# CONFIG_NET_VENDOR_SOLARFLARE is not set 400# CONFIG_NET_VENDOR_SOLARFLARE is not set
401# CONFIG_NET_VENDOR_SOCIONEXT is not set
393# CONFIG_NET_VENDOR_STMICRO is not set 402# CONFIG_NET_VENDOR_STMICRO is not set
394# CONFIG_NET_VENDOR_VIA is not set 403# CONFIG_NET_VENDOR_VIA is not set
395# CONFIG_NET_VENDOR_WIZNET is not set 404# CONFIG_NET_VENDOR_WIZNET is not set
@@ -435,6 +444,7 @@ CONFIG_UHID=m
435CONFIG_RTC_CLASS=y 444CONFIG_RTC_CLASS=y
436# CONFIG_RTC_NVMEM is not set 445# CONFIG_RTC_NVMEM is not set
437CONFIG_RTC_DRV_GENERIC=m 446CONFIG_RTC_DRV_GENERIC=m
447# CONFIG_VIRTIO_MENU is not set
438# CONFIG_IOMMU_SUPPORT is not set 448# CONFIG_IOMMU_SUPPORT is not set
439CONFIG_HEARTBEAT=y 449CONFIG_HEARTBEAT=y
440CONFIG_PROC_HARDWARE=y 450CONFIG_PROC_HARDWARE=y
@@ -552,7 +562,7 @@ CONFIG_TEST_RHASHTABLE=m
552CONFIG_TEST_HASH=m 562CONFIG_TEST_HASH=m
553CONFIG_TEST_USER_COPY=m 563CONFIG_TEST_USER_COPY=m
554CONFIG_TEST_BPF=m 564CONFIG_TEST_BPF=m
555CONFIG_TEST_FIND_BIT=m 565CONFIG_FIND_BIT_BENCHMARK=m
556CONFIG_TEST_FIRMWARE=m 566CONFIG_TEST_FIRMWARE=m
557CONFIG_TEST_SYSCTL=m 567CONFIG_TEST_SYSCTL=m
558CONFIG_TEST_UDELAY=m 568CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 2871d75b912f..b0691a7a3345 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m
103CONFIG_NFT_RT=m 103CONFIG_NFT_RT=m
104CONFIG_NFT_NUMGEN=m 104CONFIG_NFT_NUMGEN=m
105CONFIG_NFT_CT=m 105CONFIG_NFT_CT=m
106CONFIG_NFT_FLOW_OFFLOAD=m
106CONFIG_NFT_SET_RBTREE=m 107CONFIG_NFT_SET_RBTREE=m
107CONFIG_NFT_SET_HASH=m 108CONFIG_NFT_SET_HASH=m
108CONFIG_NFT_SET_BITMAP=m 109CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 123CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 124CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m 125CONFIG_NFT_FIB_NETDEV=m
126CONFIG_NF_FLOW_TABLE_INET=m
127CONFIG_NF_FLOW_TABLE=m
125CONFIG_NETFILTER_XT_SET=m 128CONFIG_NETFILTER_XT_SET=m
126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 129CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 130CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
200CONFIG_NFT_DUP_IPV4=m 203CONFIG_NFT_DUP_IPV4=m
201CONFIG_NFT_FIB_IPV4=m 204CONFIG_NFT_FIB_IPV4=m
202CONFIG_NF_TABLES_ARP=m 205CONFIG_NF_TABLES_ARP=m
206CONFIG_NF_FLOW_TABLE_IPV4=m
203CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
204CONFIG_NFT_CHAIN_NAT_IPV4=m 208CONFIG_NFT_CHAIN_NAT_IPV4=m
205CONFIG_NFT_MASQ_IPV4=m 209CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 233CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 234CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 235CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m
232CONFIG_NFT_CHAIN_NAT_IPV6=m 237CONFIG_NFT_CHAIN_NAT_IPV6=m
233CONFIG_NFT_MASQ_IPV6=m 238CONFIG_NFT_MASQ_IPV6=m
234CONFIG_NFT_REDIR_IPV6=m 239CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
242CONFIG_IP6_NF_MATCH_MH=m 247CONFIG_IP6_NF_MATCH_MH=m
243CONFIG_IP6_NF_MATCH_RPFILTER=m 248CONFIG_IP6_NF_MATCH_RPFILTER=m
244CONFIG_IP6_NF_MATCH_RT=m 249CONFIG_IP6_NF_MATCH_RT=m
250CONFIG_IP6_NF_MATCH_SRH=m
245CONFIG_IP6_NF_TARGET_HL=m 251CONFIG_IP6_NF_TARGET_HL=m
246CONFIG_IP6_NF_FILTER=m 252CONFIG_IP6_NF_FILTER=m
247CONFIG_IP6_NF_TARGET_REJECT=m 253CONFIG_IP6_NF_TARGET_REJECT=m
@@ -345,6 +351,7 @@ CONFIG_ATARI_SCSI=y
345CONFIG_MD=y 351CONFIG_MD=y
346CONFIG_MD_LINEAR=m 352CONFIG_MD_LINEAR=m
347CONFIG_BLK_DEV_DM=m 353CONFIG_BLK_DEV_DM=m
354CONFIG_DM_UNSTRIPED=m
348CONFIG_DM_CRYPT=m 355CONFIG_DM_CRYPT=m
349CONFIG_DM_SNAPSHOT=m 356CONFIG_DM_SNAPSHOT=m
350CONFIG_DM_THIN_PROVISIONING=m 357CONFIG_DM_THIN_PROVISIONING=m
@@ -387,6 +394,7 @@ CONFIG_ATARILANCE=y
387# CONFIG_NET_VENDOR_ARC is not set 394# CONFIG_NET_VENDOR_ARC is not set
388# CONFIG_NET_CADENCE is not set 395# CONFIG_NET_CADENCE is not set
389# CONFIG_NET_VENDOR_BROADCOM is not set 396# CONFIG_NET_VENDOR_BROADCOM is not set
397# CONFIG_NET_VENDOR_CORTINA is not set
390# CONFIG_NET_VENDOR_EZCHIP is not set 398# CONFIG_NET_VENDOR_EZCHIP is not set
391# CONFIG_NET_VENDOR_HUAWEI is not set 399# CONFIG_NET_VENDOR_HUAWEI is not set
392# CONFIG_NET_VENDOR_INTEL is not set 400# CONFIG_NET_VENDOR_INTEL is not set
@@ -401,6 +409,7 @@ CONFIG_NE2000=y
401# CONFIG_NET_VENDOR_SEEQ is not set 409# CONFIG_NET_VENDOR_SEEQ is not set
402# CONFIG_NET_VENDOR_SOLARFLARE is not set 410# CONFIG_NET_VENDOR_SOLARFLARE is not set
403CONFIG_SMC91X=y 411CONFIG_SMC91X=y
412# CONFIG_NET_VENDOR_SOCIONEXT is not set
404# CONFIG_NET_VENDOR_STMICRO is not set 413# CONFIG_NET_VENDOR_STMICRO is not set
405# CONFIG_NET_VENDOR_VIA is not set 414# CONFIG_NET_VENDOR_VIA is not set
406# CONFIG_NET_VENDOR_WIZNET is not set 415# CONFIG_NET_VENDOR_WIZNET is not set
@@ -450,6 +459,7 @@ CONFIG_UHID=m
450CONFIG_RTC_CLASS=y 459CONFIG_RTC_CLASS=y
451# CONFIG_RTC_NVMEM is not set 460# CONFIG_RTC_NVMEM is not set
452CONFIG_RTC_DRV_GENERIC=m 461CONFIG_RTC_DRV_GENERIC=m
462# CONFIG_VIRTIO_MENU is not set
453# CONFIG_IOMMU_SUPPORT is not set 463# CONFIG_IOMMU_SUPPORT is not set
454CONFIG_HEARTBEAT=y 464CONFIG_HEARTBEAT=y
455CONFIG_PROC_HARDWARE=y 465CONFIG_PROC_HARDWARE=y
@@ -574,7 +584,7 @@ CONFIG_TEST_RHASHTABLE=m
574CONFIG_TEST_HASH=m 584CONFIG_TEST_HASH=m
575CONFIG_TEST_USER_COPY=m 585CONFIG_TEST_USER_COPY=m
576CONFIG_TEST_BPF=m 586CONFIG_TEST_BPF=m
577CONFIG_TEST_FIND_BIT=m 587CONFIG_FIND_BIT_BENCHMARK=m
578CONFIG_TEST_FIRMWARE=m 588CONFIG_TEST_FIRMWARE=m
579CONFIG_TEST_SYSCTL=m 589CONFIG_TEST_SYSCTL=m
580CONFIG_TEST_UDELAY=m 590CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 2c90328433bf..6f6470fa9a50 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -101,6 +101,7 @@ CONFIG_NFT_META=m
101CONFIG_NFT_RT=m 101CONFIG_NFT_RT=m
102CONFIG_NFT_NUMGEN=m 102CONFIG_NFT_NUMGEN=m
103CONFIG_NFT_CT=m 103CONFIG_NFT_CT=m
104CONFIG_NFT_FLOW_OFFLOAD=m
104CONFIG_NFT_SET_RBTREE=m 105CONFIG_NFT_SET_RBTREE=m
105CONFIG_NFT_SET_HASH=m 106CONFIG_NFT_SET_HASH=m
106CONFIG_NFT_SET_BITMAP=m 107CONFIG_NFT_SET_BITMAP=m
@@ -120,6 +121,8 @@ CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 121CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 122CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m 123CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NF_FLOW_TABLE_INET=m
125CONFIG_NF_FLOW_TABLE=m
123CONFIG_NETFILTER_XT_SET=m 126CONFIG_NETFILTER_XT_SET=m
124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 127CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 128CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -198,6 +201,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
198CONFIG_NFT_DUP_IPV4=m 201CONFIG_NFT_DUP_IPV4=m
199CONFIG_NFT_FIB_IPV4=m 202CONFIG_NFT_FIB_IPV4=m
200CONFIG_NF_TABLES_ARP=m 203CONFIG_NF_TABLES_ARP=m
204CONFIG_NF_FLOW_TABLE_IPV4=m
201CONFIG_NF_LOG_ARP=m 205CONFIG_NF_LOG_ARP=m
202CONFIG_NFT_CHAIN_NAT_IPV4=m 206CONFIG_NFT_CHAIN_NAT_IPV4=m
203CONFIG_NFT_MASQ_IPV4=m 207CONFIG_NFT_MASQ_IPV4=m
@@ -227,6 +231,7 @@ CONFIG_NF_SOCKET_IPV6=m
227CONFIG_NFT_CHAIN_ROUTE_IPV6=m 231CONFIG_NFT_CHAIN_ROUTE_IPV6=m
228CONFIG_NFT_DUP_IPV6=m 232CONFIG_NFT_DUP_IPV6=m
229CONFIG_NFT_FIB_IPV6=m 233CONFIG_NFT_FIB_IPV6=m
234CONFIG_NF_FLOW_TABLE_IPV6=m
230CONFIG_NFT_CHAIN_NAT_IPV6=m 235CONFIG_NFT_CHAIN_NAT_IPV6=m
231CONFIG_NFT_MASQ_IPV6=m 236CONFIG_NFT_MASQ_IPV6=m
232CONFIG_NFT_REDIR_IPV6=m 237CONFIG_NFT_REDIR_IPV6=m
@@ -240,6 +245,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
240CONFIG_IP6_NF_MATCH_MH=m 245CONFIG_IP6_NF_MATCH_MH=m
241CONFIG_IP6_NF_MATCH_RPFILTER=m 246CONFIG_IP6_NF_MATCH_RPFILTER=m
242CONFIG_IP6_NF_MATCH_RT=m 247CONFIG_IP6_NF_MATCH_RT=m
248CONFIG_IP6_NF_MATCH_SRH=m
243CONFIG_IP6_NF_TARGET_HL=m 249CONFIG_IP6_NF_TARGET_HL=m
244CONFIG_IP6_NF_FILTER=m 250CONFIG_IP6_NF_FILTER=m
245CONFIG_IP6_NF_TARGET_REJECT=m 251CONFIG_IP6_NF_TARGET_REJECT=m
@@ -335,6 +341,7 @@ CONFIG_BVME6000_SCSI=y
335CONFIG_MD=y 341CONFIG_MD=y
336CONFIG_MD_LINEAR=m 342CONFIG_MD_LINEAR=m
337CONFIG_BLK_DEV_DM=m 343CONFIG_BLK_DEV_DM=m
344CONFIG_DM_UNSTRIPED=m
338CONFIG_DM_CRYPT=m 345CONFIG_DM_CRYPT=m
339CONFIG_DM_SNAPSHOT=m 346CONFIG_DM_SNAPSHOT=m
340CONFIG_DM_THIN_PROVISIONING=m 347CONFIG_DM_THIN_PROVISIONING=m
@@ -376,6 +383,7 @@ CONFIG_VETH=m
376# CONFIG_NET_VENDOR_ARC is not set 383# CONFIG_NET_VENDOR_ARC is not set
377# CONFIG_NET_CADENCE is not set 384# CONFIG_NET_CADENCE is not set
378# CONFIG_NET_VENDOR_BROADCOM is not set 385# CONFIG_NET_VENDOR_BROADCOM is not set
386# CONFIG_NET_VENDOR_CORTINA is not set
379# CONFIG_NET_VENDOR_EZCHIP is not set 387# CONFIG_NET_VENDOR_EZCHIP is not set
380# CONFIG_NET_VENDOR_HUAWEI is not set 388# CONFIG_NET_VENDOR_HUAWEI is not set
381CONFIG_BVME6000_NET=y 389CONFIG_BVME6000_NET=y
@@ -389,6 +397,7 @@ CONFIG_BVME6000_NET=y
389# CONFIG_NET_VENDOR_SAMSUNG is not set 397# CONFIG_NET_VENDOR_SAMSUNG is not set
390# CONFIG_NET_VENDOR_SEEQ is not set 398# CONFIG_NET_VENDOR_SEEQ is not set
391# CONFIG_NET_VENDOR_SOLARFLARE is not set 399# CONFIG_NET_VENDOR_SOLARFLARE is not set
400# CONFIG_NET_VENDOR_SOCIONEXT is not set
392# CONFIG_NET_VENDOR_STMICRO is not set 401# CONFIG_NET_VENDOR_STMICRO is not set
393# CONFIG_NET_VENDOR_VIA is not set 402# CONFIG_NET_VENDOR_VIA is not set
394# CONFIG_NET_VENDOR_WIZNET is not set 403# CONFIG_NET_VENDOR_WIZNET is not set
@@ -428,6 +437,7 @@ CONFIG_UHID=m
428CONFIG_RTC_CLASS=y 437CONFIG_RTC_CLASS=y
429# CONFIG_RTC_NVMEM is not set 438# CONFIG_RTC_NVMEM is not set
430CONFIG_RTC_DRV_GENERIC=m 439CONFIG_RTC_DRV_GENERIC=m
440# CONFIG_VIRTIO_MENU is not set
431# CONFIG_IOMMU_SUPPORT is not set 441# CONFIG_IOMMU_SUPPORT is not set
432CONFIG_PROC_HARDWARE=y 442CONFIG_PROC_HARDWARE=y
433CONFIG_EXT4_FS=y 443CONFIG_EXT4_FS=y
@@ -544,7 +554,7 @@ CONFIG_TEST_RHASHTABLE=m
544CONFIG_TEST_HASH=m 554CONFIG_TEST_HASH=m
545CONFIG_TEST_USER_COPY=m 555CONFIG_TEST_USER_COPY=m
546CONFIG_TEST_BPF=m 556CONFIG_TEST_BPF=m
547CONFIG_TEST_FIND_BIT=m 557CONFIG_FIND_BIT_BENCHMARK=m
548CONFIG_TEST_FIRMWARE=m 558CONFIG_TEST_FIRMWARE=m
549CONFIG_TEST_SYSCTL=m 559CONFIG_TEST_SYSCTL=m
550CONFIG_TEST_UDELAY=m 560CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 177c91d63826..31a1a2b5e860 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -103,6 +103,7 @@ CONFIG_NFT_META=m
103CONFIG_NFT_RT=m 103CONFIG_NFT_RT=m
104CONFIG_NFT_NUMGEN=m 104CONFIG_NFT_NUMGEN=m
105CONFIG_NFT_CT=m 105CONFIG_NFT_CT=m
106CONFIG_NFT_FLOW_OFFLOAD=m
106CONFIG_NFT_SET_RBTREE=m 107CONFIG_NFT_SET_RBTREE=m
107CONFIG_NFT_SET_HASH=m 108CONFIG_NFT_SET_HASH=m
108CONFIG_NFT_SET_BITMAP=m 109CONFIG_NFT_SET_BITMAP=m
@@ -122,6 +123,8 @@ CONFIG_NFT_FIB_INET=m
122CONFIG_NFT_DUP_NETDEV=m 123CONFIG_NFT_DUP_NETDEV=m
123CONFIG_NFT_FWD_NETDEV=m 124CONFIG_NFT_FWD_NETDEV=m
124CONFIG_NFT_FIB_NETDEV=m 125CONFIG_NFT_FIB_NETDEV=m
126CONFIG_NF_FLOW_TABLE_INET=m
127CONFIG_NF_FLOW_TABLE=m
125CONFIG_NETFILTER_XT_SET=m 128CONFIG_NETFILTER_XT_SET=m
126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 129CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 130CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -200,6 +203,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
200CONFIG_NFT_DUP_IPV4=m 203CONFIG_NFT_DUP_IPV4=m
201CONFIG_NFT_FIB_IPV4=m 204CONFIG_NFT_FIB_IPV4=m
202CONFIG_NF_TABLES_ARP=m 205CONFIG_NF_TABLES_ARP=m
206CONFIG_NF_FLOW_TABLE_IPV4=m
203CONFIG_NF_LOG_ARP=m 207CONFIG_NF_LOG_ARP=m
204CONFIG_NFT_CHAIN_NAT_IPV4=m 208CONFIG_NFT_CHAIN_NAT_IPV4=m
205CONFIG_NFT_MASQ_IPV4=m 209CONFIG_NFT_MASQ_IPV4=m
@@ -229,6 +233,7 @@ CONFIG_NF_SOCKET_IPV6=m
229CONFIG_NFT_CHAIN_ROUTE_IPV6=m 233CONFIG_NFT_CHAIN_ROUTE_IPV6=m
230CONFIG_NFT_DUP_IPV6=m 234CONFIG_NFT_DUP_IPV6=m
231CONFIG_NFT_FIB_IPV6=m 235CONFIG_NFT_FIB_IPV6=m
236CONFIG_NF_FLOW_TABLE_IPV6=m
232CONFIG_NFT_CHAIN_NAT_IPV6=m 237CONFIG_NFT_CHAIN_NAT_IPV6=m
233CONFIG_NFT_MASQ_IPV6=m 238CONFIG_NFT_MASQ_IPV6=m
234CONFIG_NFT_REDIR_IPV6=m 239CONFIG_NFT_REDIR_IPV6=m
@@ -242,6 +247,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
242CONFIG_IP6_NF_MATCH_MH=m 247CONFIG_IP6_NF_MATCH_MH=m
243CONFIG_IP6_NF_MATCH_RPFILTER=m 248CONFIG_IP6_NF_MATCH_RPFILTER=m
244CONFIG_IP6_NF_MATCH_RT=m 249CONFIG_IP6_NF_MATCH_RT=m
250CONFIG_IP6_NF_MATCH_SRH=m
245CONFIG_IP6_NF_TARGET_HL=m 251CONFIG_IP6_NF_TARGET_HL=m
246CONFIG_IP6_NF_FILTER=m 252CONFIG_IP6_NF_FILTER=m
247CONFIG_IP6_NF_TARGET_REJECT=m 253CONFIG_IP6_NF_TARGET_REJECT=m
@@ -336,6 +342,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
336CONFIG_MD=y 342CONFIG_MD=y
337CONFIG_MD_LINEAR=m 343CONFIG_MD_LINEAR=m
338CONFIG_BLK_DEV_DM=m 344CONFIG_BLK_DEV_DM=m
345CONFIG_DM_UNSTRIPED=m
339CONFIG_DM_CRYPT=m 346CONFIG_DM_CRYPT=m
340CONFIG_DM_SNAPSHOT=m 347CONFIG_DM_SNAPSHOT=m
341CONFIG_DM_THIN_PROVISIONING=m 348CONFIG_DM_THIN_PROVISIONING=m
@@ -378,6 +385,7 @@ CONFIG_HPLANCE=y
378# CONFIG_NET_VENDOR_ARC is not set 385# CONFIG_NET_VENDOR_ARC is not set
379# CONFIG_NET_CADENCE is not set 386# CONFIG_NET_CADENCE is not set
380# CONFIG_NET_VENDOR_BROADCOM is not set 387# CONFIG_NET_VENDOR_BROADCOM is not set
388# CONFIG_NET_VENDOR_CORTINA is not set
381# CONFIG_NET_VENDOR_EZCHIP is not set 389# CONFIG_NET_VENDOR_EZCHIP is not set
382# CONFIG_NET_VENDOR_HUAWEI is not set 390# CONFIG_NET_VENDOR_HUAWEI is not set
383# CONFIG_NET_VENDOR_INTEL is not set 391# CONFIG_NET_VENDOR_INTEL is not set
@@ -391,6 +399,7 @@ CONFIG_HPLANCE=y
391# CONFIG_NET_VENDOR_SAMSUNG is not set 399# CONFIG_NET_VENDOR_SAMSUNG is not set
392# CONFIG_NET_VENDOR_SEEQ is not set 400# CONFIG_NET_VENDOR_SEEQ is not set
393# CONFIG_NET_VENDOR_SOLARFLARE is not set 401# CONFIG_NET_VENDOR_SOLARFLARE is not set
402# CONFIG_NET_VENDOR_SOCIONEXT is not set
394# CONFIG_NET_VENDOR_STMICRO is not set 403# CONFIG_NET_VENDOR_STMICRO is not set
395# CONFIG_NET_VENDOR_VIA is not set 404# CONFIG_NET_VENDOR_VIA is not set
396# CONFIG_NET_VENDOR_WIZNET is not set 405# CONFIG_NET_VENDOR_WIZNET is not set
@@ -438,6 +447,7 @@ CONFIG_UHID=m
438CONFIG_RTC_CLASS=y 447CONFIG_RTC_CLASS=y
439# CONFIG_RTC_NVMEM is not set 448# CONFIG_RTC_NVMEM is not set
440CONFIG_RTC_DRV_GENERIC=m 449CONFIG_RTC_DRV_GENERIC=m
450# CONFIG_VIRTIO_MENU is not set
441# CONFIG_IOMMU_SUPPORT is not set 451# CONFIG_IOMMU_SUPPORT is not set
442CONFIG_PROC_HARDWARE=y 452CONFIG_PROC_HARDWARE=y
443CONFIG_EXT4_FS=y 453CONFIG_EXT4_FS=y
@@ -554,7 +564,7 @@ CONFIG_TEST_RHASHTABLE=m
554CONFIG_TEST_HASH=m 564CONFIG_TEST_HASH=m
555CONFIG_TEST_USER_COPY=m 565CONFIG_TEST_USER_COPY=m
556CONFIG_TEST_BPF=m 566CONFIG_TEST_BPF=m
557CONFIG_TEST_FIND_BIT=m 567CONFIG_FIND_BIT_BENCHMARK=m
558CONFIG_TEST_FIRMWARE=m 568CONFIG_TEST_FIRMWARE=m
559CONFIG_TEST_SYSCTL=m 569CONFIG_TEST_SYSCTL=m
560CONFIG_TEST_UDELAY=m 570CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index efbcaffa30ed..390d4a87441c 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -102,6 +102,7 @@ CONFIG_NFT_META=m
102CONFIG_NFT_RT=m 102CONFIG_NFT_RT=m
103CONFIG_NFT_NUMGEN=m 103CONFIG_NFT_NUMGEN=m
104CONFIG_NFT_CT=m 104CONFIG_NFT_CT=m
105CONFIG_NFT_FLOW_OFFLOAD=m
105CONFIG_NFT_SET_RBTREE=m 106CONFIG_NFT_SET_RBTREE=m
106CONFIG_NFT_SET_HASH=m 107CONFIG_NFT_SET_HASH=m
107CONFIG_NFT_SET_BITMAP=m 108CONFIG_NFT_SET_BITMAP=m
@@ -121,6 +122,8 @@ CONFIG_NFT_FIB_INET=m
121CONFIG_NFT_DUP_NETDEV=m 122CONFIG_NFT_DUP_NETDEV=m
122CONFIG_NFT_FWD_NETDEV=m 123CONFIG_NFT_FWD_NETDEV=m
123CONFIG_NFT_FIB_NETDEV=m 124CONFIG_NFT_FIB_NETDEV=m
125CONFIG_NF_FLOW_TABLE_INET=m
126CONFIG_NF_FLOW_TABLE=m
124CONFIG_NETFILTER_XT_SET=m 127CONFIG_NETFILTER_XT_SET=m
125CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 128CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
126CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 129CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -199,6 +202,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
199CONFIG_NFT_DUP_IPV4=m 202CONFIG_NFT_DUP_IPV4=m
200CONFIG_NFT_FIB_IPV4=m 203CONFIG_NFT_FIB_IPV4=m
201CONFIG_NF_TABLES_ARP=m 204CONFIG_NF_TABLES_ARP=m
205CONFIG_NF_FLOW_TABLE_IPV4=m
202CONFIG_NF_LOG_ARP=m 206CONFIG_NF_LOG_ARP=m
203CONFIG_NFT_CHAIN_NAT_IPV4=m 207CONFIG_NFT_CHAIN_NAT_IPV4=m
204CONFIG_NFT_MASQ_IPV4=m 208CONFIG_NFT_MASQ_IPV4=m
@@ -228,6 +232,7 @@ CONFIG_NF_SOCKET_IPV6=m
228CONFIG_NFT_CHAIN_ROUTE_IPV6=m 232CONFIG_NFT_CHAIN_ROUTE_IPV6=m
229CONFIG_NFT_DUP_IPV6=m 233CONFIG_NFT_DUP_IPV6=m
230CONFIG_NFT_FIB_IPV6=m 234CONFIG_NFT_FIB_IPV6=m
235CONFIG_NF_FLOW_TABLE_IPV6=m
231CONFIG_NFT_CHAIN_NAT_IPV6=m 236CONFIG_NFT_CHAIN_NAT_IPV6=m
232CONFIG_NFT_MASQ_IPV6=m 237CONFIG_NFT_MASQ_IPV6=m
233CONFIG_NFT_REDIR_IPV6=m 238CONFIG_NFT_REDIR_IPV6=m
@@ -241,6 +246,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
241CONFIG_IP6_NF_MATCH_MH=m 246CONFIG_IP6_NF_MATCH_MH=m
242CONFIG_IP6_NF_MATCH_RPFILTER=m 247CONFIG_IP6_NF_MATCH_RPFILTER=m
243CONFIG_IP6_NF_MATCH_RT=m 248CONFIG_IP6_NF_MATCH_RT=m
249CONFIG_IP6_NF_MATCH_SRH=m
244CONFIG_IP6_NF_TARGET_HL=m 250CONFIG_IP6_NF_TARGET_HL=m
245CONFIG_IP6_NF_FILTER=m 251CONFIG_IP6_NF_FILTER=m
246CONFIG_IP6_NF_TARGET_REJECT=m 252CONFIG_IP6_NF_TARGET_REJECT=m
@@ -345,6 +351,7 @@ CONFIG_SCSI_MAC_ESP=y
345CONFIG_MD=y 351CONFIG_MD=y
346CONFIG_MD_LINEAR=m 352CONFIG_MD_LINEAR=m
347CONFIG_BLK_DEV_DM=m 353CONFIG_BLK_DEV_DM=m
354CONFIG_DM_UNSTRIPED=m
348CONFIG_DM_CRYPT=m 355CONFIG_DM_CRYPT=m
349CONFIG_DM_SNAPSHOT=m 356CONFIG_DM_SNAPSHOT=m
350CONFIG_DM_THIN_PROVISIONING=m 357CONFIG_DM_THIN_PROVISIONING=m
@@ -395,6 +402,7 @@ CONFIG_MACMACE=y
395# CONFIG_NET_CADENCE is not set 402# CONFIG_NET_CADENCE is not set
396# CONFIG_NET_VENDOR_BROADCOM is not set 403# CONFIG_NET_VENDOR_BROADCOM is not set
397CONFIG_MAC89x0=y 404CONFIG_MAC89x0=y
405# CONFIG_NET_VENDOR_CORTINA is not set
398# CONFIG_NET_VENDOR_EZCHIP is not set 406# CONFIG_NET_VENDOR_EZCHIP is not set
399# CONFIG_NET_VENDOR_HUAWEI is not set 407# CONFIG_NET_VENDOR_HUAWEI is not set
400# CONFIG_NET_VENDOR_INTEL is not set 408# CONFIG_NET_VENDOR_INTEL is not set
@@ -410,6 +418,7 @@ CONFIG_MAC8390=y
410# CONFIG_NET_VENDOR_SEEQ is not set 418# CONFIG_NET_VENDOR_SEEQ is not set
411# CONFIG_NET_VENDOR_SOLARFLARE is not set 419# CONFIG_NET_VENDOR_SOLARFLARE is not set
412# CONFIG_NET_VENDOR_SMSC is not set 420# CONFIG_NET_VENDOR_SMSC is not set
421# CONFIG_NET_VENDOR_SOCIONEXT is not set
413# CONFIG_NET_VENDOR_STMICRO is not set 422# CONFIG_NET_VENDOR_STMICRO is not set
414# CONFIG_NET_VENDOR_VIA is not set 423# CONFIG_NET_VENDOR_VIA is not set
415# CONFIG_NET_VENDOR_WIZNET is not set 424# CONFIG_NET_VENDOR_WIZNET is not set
@@ -460,6 +469,7 @@ CONFIG_UHID=m
460CONFIG_RTC_CLASS=y 469CONFIG_RTC_CLASS=y
461# CONFIG_RTC_NVMEM is not set 470# CONFIG_RTC_NVMEM is not set
462CONFIG_RTC_DRV_GENERIC=m 471CONFIG_RTC_DRV_GENERIC=m
472# CONFIG_VIRTIO_MENU is not set
463# CONFIG_IOMMU_SUPPORT is not set 473# CONFIG_IOMMU_SUPPORT is not set
464CONFIG_PROC_HARDWARE=y 474CONFIG_PROC_HARDWARE=y
465CONFIG_EXT4_FS=y 475CONFIG_EXT4_FS=y
@@ -576,7 +586,7 @@ CONFIG_TEST_RHASHTABLE=m
576CONFIG_TEST_HASH=m 586CONFIG_TEST_HASH=m
577CONFIG_TEST_USER_COPY=m 587CONFIG_TEST_USER_COPY=m
578CONFIG_TEST_BPF=m 588CONFIG_TEST_BPF=m
579CONFIG_TEST_FIND_BIT=m 589CONFIG_FIND_BIT_BENCHMARK=m
580CONFIG_TEST_FIRMWARE=m 590CONFIG_TEST_FIRMWARE=m
581CONFIG_TEST_SYSCTL=m 591CONFIG_TEST_SYSCTL=m
582CONFIG_TEST_UDELAY=m 592CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index e78a205d266a..77be97d82dc3 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -112,6 +112,7 @@ CONFIG_NFT_META=m
112CONFIG_NFT_RT=m 112CONFIG_NFT_RT=m
113CONFIG_NFT_NUMGEN=m 113CONFIG_NFT_NUMGEN=m
114CONFIG_NFT_CT=m 114CONFIG_NFT_CT=m
115CONFIG_NFT_FLOW_OFFLOAD=m
115CONFIG_NFT_SET_RBTREE=m 116CONFIG_NFT_SET_RBTREE=m
116CONFIG_NFT_SET_HASH=m 117CONFIG_NFT_SET_HASH=m
117CONFIG_NFT_SET_BITMAP=m 118CONFIG_NFT_SET_BITMAP=m
@@ -131,6 +132,8 @@ CONFIG_NFT_FIB_INET=m
131CONFIG_NFT_DUP_NETDEV=m 132CONFIG_NFT_DUP_NETDEV=m
132CONFIG_NFT_FWD_NETDEV=m 133CONFIG_NFT_FWD_NETDEV=m
133CONFIG_NFT_FIB_NETDEV=m 134CONFIG_NFT_FIB_NETDEV=m
135CONFIG_NF_FLOW_TABLE_INET=m
136CONFIG_NF_FLOW_TABLE=m
134CONFIG_NETFILTER_XT_SET=m 137CONFIG_NETFILTER_XT_SET=m
135CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 138CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
136CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 139CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -209,6 +212,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
209CONFIG_NFT_DUP_IPV4=m 212CONFIG_NFT_DUP_IPV4=m
210CONFIG_NFT_FIB_IPV4=m 213CONFIG_NFT_FIB_IPV4=m
211CONFIG_NF_TABLES_ARP=m 214CONFIG_NF_TABLES_ARP=m
215CONFIG_NF_FLOW_TABLE_IPV4=m
212CONFIG_NF_LOG_ARP=m 216CONFIG_NF_LOG_ARP=m
213CONFIG_NFT_CHAIN_NAT_IPV4=m 217CONFIG_NFT_CHAIN_NAT_IPV4=m
214CONFIG_NFT_MASQ_IPV4=m 218CONFIG_NFT_MASQ_IPV4=m
@@ -238,6 +242,7 @@ CONFIG_NF_SOCKET_IPV6=m
238CONFIG_NFT_CHAIN_ROUTE_IPV6=m 242CONFIG_NFT_CHAIN_ROUTE_IPV6=m
239CONFIG_NFT_DUP_IPV6=m 243CONFIG_NFT_DUP_IPV6=m
240CONFIG_NFT_FIB_IPV6=m 244CONFIG_NFT_FIB_IPV6=m
245CONFIG_NF_FLOW_TABLE_IPV6=m
241CONFIG_NFT_CHAIN_NAT_IPV6=m 246CONFIG_NFT_CHAIN_NAT_IPV6=m
242CONFIG_NFT_MASQ_IPV6=m 247CONFIG_NFT_MASQ_IPV6=m
243CONFIG_NFT_REDIR_IPV6=m 248CONFIG_NFT_REDIR_IPV6=m
@@ -251,6 +256,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
251CONFIG_IP6_NF_MATCH_MH=m 256CONFIG_IP6_NF_MATCH_MH=m
252CONFIG_IP6_NF_MATCH_RPFILTER=m 257CONFIG_IP6_NF_MATCH_RPFILTER=m
253CONFIG_IP6_NF_MATCH_RT=m 258CONFIG_IP6_NF_MATCH_RT=m
259CONFIG_IP6_NF_MATCH_SRH=m
254CONFIG_IP6_NF_TARGET_HL=m 260CONFIG_IP6_NF_TARGET_HL=m
255CONFIG_IP6_NF_FILTER=m 261CONFIG_IP6_NF_FILTER=m
256CONFIG_IP6_NF_TARGET_REJECT=m 262CONFIG_IP6_NF_TARGET_REJECT=m
@@ -378,6 +384,7 @@ CONFIG_SUN3X_ESP=y
378CONFIG_MD=y 384CONFIG_MD=y
379CONFIG_MD_LINEAR=m 385CONFIG_MD_LINEAR=m
380CONFIG_BLK_DEV_DM=m 386CONFIG_BLK_DEV_DM=m
387CONFIG_DM_UNSTRIPED=m
381CONFIG_DM_CRYPT=m 388CONFIG_DM_CRYPT=m
382CONFIG_DM_SNAPSHOT=m 389CONFIG_DM_SNAPSHOT=m
383CONFIG_DM_THIN_PROVISIONING=m 390CONFIG_DM_THIN_PROVISIONING=m
@@ -435,6 +442,7 @@ CONFIG_MACMACE=y
435# CONFIG_NET_CADENCE is not set 442# CONFIG_NET_CADENCE is not set
436# CONFIG_NET_VENDOR_BROADCOM is not set 443# CONFIG_NET_VENDOR_BROADCOM is not set
437CONFIG_MAC89x0=y 444CONFIG_MAC89x0=y
445# CONFIG_NET_VENDOR_CORTINA is not set
438# CONFIG_NET_VENDOR_EZCHIP is not set 446# CONFIG_NET_VENDOR_EZCHIP is not set
439# CONFIG_NET_VENDOR_HP is not set 447# CONFIG_NET_VENDOR_HP is not set
440# CONFIG_NET_VENDOR_HUAWEI is not set 448# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -456,6 +464,7 @@ CONFIG_ZORRO8390=y
456# CONFIG_NET_VENDOR_SEEQ is not set 464# CONFIG_NET_VENDOR_SEEQ is not set
457# CONFIG_NET_VENDOR_SOLARFLARE is not set 465# CONFIG_NET_VENDOR_SOLARFLARE is not set
458CONFIG_SMC91X=y 466CONFIG_SMC91X=y
467# CONFIG_NET_VENDOR_SOCIONEXT is not set
459# CONFIG_NET_VENDOR_STMICRO is not set 468# CONFIG_NET_VENDOR_STMICRO is not set
460# CONFIG_NET_VENDOR_VIA is not set 469# CONFIG_NET_VENDOR_VIA is not set
461# CONFIG_NET_VENDOR_WIZNET is not set 470# CONFIG_NET_VENDOR_WIZNET is not set
@@ -530,6 +539,7 @@ CONFIG_RTC_CLASS=y
530CONFIG_RTC_DRV_MSM6242=m 539CONFIG_RTC_DRV_MSM6242=m
531CONFIG_RTC_DRV_RP5C01=m 540CONFIG_RTC_DRV_RP5C01=m
532CONFIG_RTC_DRV_GENERIC=m 541CONFIG_RTC_DRV_GENERIC=m
542# CONFIG_VIRTIO_MENU is not set
533# CONFIG_IOMMU_SUPPORT is not set 543# CONFIG_IOMMU_SUPPORT is not set
534CONFIG_HEARTBEAT=y 544CONFIG_HEARTBEAT=y
535CONFIG_PROC_HARDWARE=y 545CONFIG_PROC_HARDWARE=y
@@ -656,7 +666,7 @@ CONFIG_TEST_RHASHTABLE=m
656CONFIG_TEST_HASH=m 666CONFIG_TEST_HASH=m
657CONFIG_TEST_USER_COPY=m 667CONFIG_TEST_USER_COPY=m
658CONFIG_TEST_BPF=m 668CONFIG_TEST_BPF=m
659CONFIG_TEST_FIND_BIT=m 669CONFIG_FIND_BIT_BENCHMARK=m
660CONFIG_TEST_FIRMWARE=m 670CONFIG_TEST_FIRMWARE=m
661CONFIG_TEST_SYSCTL=m 671CONFIG_TEST_SYSCTL=m
662CONFIG_TEST_UDELAY=m 672CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 0d42ecacfd7a..2ca140757b0f 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -100,6 +100,7 @@ CONFIG_NFT_META=m
100CONFIG_NFT_RT=m 100CONFIG_NFT_RT=m
101CONFIG_NFT_NUMGEN=m 101CONFIG_NFT_NUMGEN=m
102CONFIG_NFT_CT=m 102CONFIG_NFT_CT=m
103CONFIG_NFT_FLOW_OFFLOAD=m
103CONFIG_NFT_SET_RBTREE=m 104CONFIG_NFT_SET_RBTREE=m
104CONFIG_NFT_SET_HASH=m 105CONFIG_NFT_SET_HASH=m
105CONFIG_NFT_SET_BITMAP=m 106CONFIG_NFT_SET_BITMAP=m
@@ -119,6 +120,8 @@ CONFIG_NFT_FIB_INET=m
119CONFIG_NFT_DUP_NETDEV=m 120CONFIG_NFT_DUP_NETDEV=m
120CONFIG_NFT_FWD_NETDEV=m 121CONFIG_NFT_FWD_NETDEV=m
121CONFIG_NFT_FIB_NETDEV=m 122CONFIG_NFT_FIB_NETDEV=m
123CONFIG_NF_FLOW_TABLE_INET=m
124CONFIG_NF_FLOW_TABLE=m
122CONFIG_NETFILTER_XT_SET=m 125CONFIG_NETFILTER_XT_SET=m
123CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 126CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
124CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 127CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -197,6 +200,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
197CONFIG_NFT_DUP_IPV4=m 200CONFIG_NFT_DUP_IPV4=m
198CONFIG_NFT_FIB_IPV4=m 201CONFIG_NFT_FIB_IPV4=m
199CONFIG_NF_TABLES_ARP=m 202CONFIG_NF_TABLES_ARP=m
203CONFIG_NF_FLOW_TABLE_IPV4=m
200CONFIG_NF_LOG_ARP=m 204CONFIG_NF_LOG_ARP=m
201CONFIG_NFT_CHAIN_NAT_IPV4=m 205CONFIG_NFT_CHAIN_NAT_IPV4=m
202CONFIG_NFT_MASQ_IPV4=m 206CONFIG_NFT_MASQ_IPV4=m
@@ -226,6 +230,7 @@ CONFIG_NF_SOCKET_IPV6=m
226CONFIG_NFT_CHAIN_ROUTE_IPV6=m 230CONFIG_NFT_CHAIN_ROUTE_IPV6=m
227CONFIG_NFT_DUP_IPV6=m 231CONFIG_NFT_DUP_IPV6=m
228CONFIG_NFT_FIB_IPV6=m 232CONFIG_NFT_FIB_IPV6=m
233CONFIG_NF_FLOW_TABLE_IPV6=m
229CONFIG_NFT_CHAIN_NAT_IPV6=m 234CONFIG_NFT_CHAIN_NAT_IPV6=m
230CONFIG_NFT_MASQ_IPV6=m 235CONFIG_NFT_MASQ_IPV6=m
231CONFIG_NFT_REDIR_IPV6=m 236CONFIG_NFT_REDIR_IPV6=m
@@ -239,6 +244,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
239CONFIG_IP6_NF_MATCH_MH=m 244CONFIG_IP6_NF_MATCH_MH=m
240CONFIG_IP6_NF_MATCH_RPFILTER=m 245CONFIG_IP6_NF_MATCH_RPFILTER=m
241CONFIG_IP6_NF_MATCH_RT=m 246CONFIG_IP6_NF_MATCH_RT=m
247CONFIG_IP6_NF_MATCH_SRH=m
242CONFIG_IP6_NF_TARGET_HL=m 248CONFIG_IP6_NF_TARGET_HL=m
243CONFIG_IP6_NF_FILTER=m 249CONFIG_IP6_NF_FILTER=m
244CONFIG_IP6_NF_TARGET_REJECT=m 250CONFIG_IP6_NF_TARGET_REJECT=m
@@ -334,6 +340,7 @@ CONFIG_MVME147_SCSI=y
334CONFIG_MD=y 340CONFIG_MD=y
335CONFIG_MD_LINEAR=m 341CONFIG_MD_LINEAR=m
336CONFIG_BLK_DEV_DM=m 342CONFIG_BLK_DEV_DM=m
343CONFIG_DM_UNSTRIPED=m
337CONFIG_DM_CRYPT=m 344CONFIG_DM_CRYPT=m
338CONFIG_DM_SNAPSHOT=m 345CONFIG_DM_SNAPSHOT=m
339CONFIG_DM_THIN_PROVISIONING=m 346CONFIG_DM_THIN_PROVISIONING=m
@@ -376,6 +383,7 @@ CONFIG_MVME147_NET=y
376# CONFIG_NET_VENDOR_ARC is not set 383# CONFIG_NET_VENDOR_ARC is not set
377# CONFIG_NET_CADENCE is not set 384# CONFIG_NET_CADENCE is not set
378# CONFIG_NET_VENDOR_BROADCOM is not set 385# CONFIG_NET_VENDOR_BROADCOM is not set
386# CONFIG_NET_VENDOR_CORTINA is not set
379# CONFIG_NET_VENDOR_EZCHIP is not set 387# CONFIG_NET_VENDOR_EZCHIP is not set
380# CONFIG_NET_VENDOR_HUAWEI is not set 388# CONFIG_NET_VENDOR_HUAWEI is not set
381# CONFIG_NET_VENDOR_INTEL is not set 389# CONFIG_NET_VENDOR_INTEL is not set
@@ -389,6 +397,7 @@ CONFIG_MVME147_NET=y
389# CONFIG_NET_VENDOR_SAMSUNG is not set 397# CONFIG_NET_VENDOR_SAMSUNG is not set
390# CONFIG_NET_VENDOR_SEEQ is not set 398# CONFIG_NET_VENDOR_SEEQ is not set
391# CONFIG_NET_VENDOR_SOLARFLARE is not set 399# CONFIG_NET_VENDOR_SOLARFLARE is not set
400# CONFIG_NET_VENDOR_SOCIONEXT is not set
392# CONFIG_NET_VENDOR_STMICRO is not set 401# CONFIG_NET_VENDOR_STMICRO is not set
393# CONFIG_NET_VENDOR_VIA is not set 402# CONFIG_NET_VENDOR_VIA is not set
394# CONFIG_NET_VENDOR_WIZNET is not set 403# CONFIG_NET_VENDOR_WIZNET is not set
@@ -428,6 +437,7 @@ CONFIG_UHID=m
428CONFIG_RTC_CLASS=y 437CONFIG_RTC_CLASS=y
429# CONFIG_RTC_NVMEM is not set 438# CONFIG_RTC_NVMEM is not set
430CONFIG_RTC_DRV_GENERIC=m 439CONFIG_RTC_DRV_GENERIC=m
440# CONFIG_VIRTIO_MENU is not set
431# CONFIG_IOMMU_SUPPORT is not set 441# CONFIG_IOMMU_SUPPORT is not set
432CONFIG_PROC_HARDWARE=y 442CONFIG_PROC_HARDWARE=y
433CONFIG_EXT4_FS=y 443CONFIG_EXT4_FS=y
@@ -544,7 +554,7 @@ CONFIG_TEST_RHASHTABLE=m
544CONFIG_TEST_HASH=m 554CONFIG_TEST_HASH=m
545CONFIG_TEST_USER_COPY=m 555CONFIG_TEST_USER_COPY=m
546CONFIG_TEST_BPF=m 556CONFIG_TEST_BPF=m
547CONFIG_TEST_FIND_BIT=m 557CONFIG_FIND_BIT_BENCHMARK=m
548CONFIG_TEST_FIRMWARE=m 558CONFIG_TEST_FIRMWARE=m
549CONFIG_TEST_SYSCTL=m 559CONFIG_TEST_SYSCTL=m
550CONFIG_TEST_UDELAY=m 560CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 8dc609c5b8aa..6a3b4dcc5aab 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -101,6 +101,7 @@ CONFIG_NFT_META=m
101CONFIG_NFT_RT=m 101CONFIG_NFT_RT=m
102CONFIG_NFT_NUMGEN=m 102CONFIG_NFT_NUMGEN=m
103CONFIG_NFT_CT=m 103CONFIG_NFT_CT=m
104CONFIG_NFT_FLOW_OFFLOAD=m
104CONFIG_NFT_SET_RBTREE=m 105CONFIG_NFT_SET_RBTREE=m
105CONFIG_NFT_SET_HASH=m 106CONFIG_NFT_SET_HASH=m
106CONFIG_NFT_SET_BITMAP=m 107CONFIG_NFT_SET_BITMAP=m
@@ -120,6 +121,8 @@ CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 121CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 122CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m 123CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NF_FLOW_TABLE_INET=m
125CONFIG_NF_FLOW_TABLE=m
123CONFIG_NETFILTER_XT_SET=m 126CONFIG_NETFILTER_XT_SET=m
124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 127CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 128CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -198,6 +201,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
198CONFIG_NFT_DUP_IPV4=m 201CONFIG_NFT_DUP_IPV4=m
199CONFIG_NFT_FIB_IPV4=m 202CONFIG_NFT_FIB_IPV4=m
200CONFIG_NF_TABLES_ARP=m 203CONFIG_NF_TABLES_ARP=m
204CONFIG_NF_FLOW_TABLE_IPV4=m
201CONFIG_NF_LOG_ARP=m 205CONFIG_NF_LOG_ARP=m
202CONFIG_NFT_CHAIN_NAT_IPV4=m 206CONFIG_NFT_CHAIN_NAT_IPV4=m
203CONFIG_NFT_MASQ_IPV4=m 207CONFIG_NFT_MASQ_IPV4=m
@@ -227,6 +231,7 @@ CONFIG_NF_SOCKET_IPV6=m
227CONFIG_NFT_CHAIN_ROUTE_IPV6=m 231CONFIG_NFT_CHAIN_ROUTE_IPV6=m
228CONFIG_NFT_DUP_IPV6=m 232CONFIG_NFT_DUP_IPV6=m
229CONFIG_NFT_FIB_IPV6=m 233CONFIG_NFT_FIB_IPV6=m
234CONFIG_NF_FLOW_TABLE_IPV6=m
230CONFIG_NFT_CHAIN_NAT_IPV6=m 235CONFIG_NFT_CHAIN_NAT_IPV6=m
231CONFIG_NFT_MASQ_IPV6=m 236CONFIG_NFT_MASQ_IPV6=m
232CONFIG_NFT_REDIR_IPV6=m 237CONFIG_NFT_REDIR_IPV6=m
@@ -240,6 +245,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
240CONFIG_IP6_NF_MATCH_MH=m 245CONFIG_IP6_NF_MATCH_MH=m
241CONFIG_IP6_NF_MATCH_RPFILTER=m 246CONFIG_IP6_NF_MATCH_RPFILTER=m
242CONFIG_IP6_NF_MATCH_RT=m 247CONFIG_IP6_NF_MATCH_RT=m
248CONFIG_IP6_NF_MATCH_SRH=m
243CONFIG_IP6_NF_TARGET_HL=m 249CONFIG_IP6_NF_TARGET_HL=m
244CONFIG_IP6_NF_FILTER=m 250CONFIG_IP6_NF_FILTER=m
245CONFIG_IP6_NF_TARGET_REJECT=m 251CONFIG_IP6_NF_TARGET_REJECT=m
@@ -335,6 +341,7 @@ CONFIG_MVME16x_SCSI=y
335CONFIG_MD=y 341CONFIG_MD=y
336CONFIG_MD_LINEAR=m 342CONFIG_MD_LINEAR=m
337CONFIG_BLK_DEV_DM=m 343CONFIG_BLK_DEV_DM=m
344CONFIG_DM_UNSTRIPED=m
338CONFIG_DM_CRYPT=m 345CONFIG_DM_CRYPT=m
339CONFIG_DM_SNAPSHOT=m 346CONFIG_DM_SNAPSHOT=m
340CONFIG_DM_THIN_PROVISIONING=m 347CONFIG_DM_THIN_PROVISIONING=m
@@ -376,6 +383,7 @@ CONFIG_VETH=m
376# CONFIG_NET_VENDOR_ARC is not set 383# CONFIG_NET_VENDOR_ARC is not set
377# CONFIG_NET_CADENCE is not set 384# CONFIG_NET_CADENCE is not set
378# CONFIG_NET_VENDOR_BROADCOM is not set 385# CONFIG_NET_VENDOR_BROADCOM is not set
386# CONFIG_NET_VENDOR_CORTINA is not set
379# CONFIG_NET_VENDOR_EZCHIP is not set 387# CONFIG_NET_VENDOR_EZCHIP is not set
380# CONFIG_NET_VENDOR_HUAWEI is not set 388# CONFIG_NET_VENDOR_HUAWEI is not set
381CONFIG_MVME16x_NET=y 389CONFIG_MVME16x_NET=y
@@ -389,6 +397,7 @@ CONFIG_MVME16x_NET=y
389# CONFIG_NET_VENDOR_SAMSUNG is not set 397# CONFIG_NET_VENDOR_SAMSUNG is not set
390# CONFIG_NET_VENDOR_SEEQ is not set 398# CONFIG_NET_VENDOR_SEEQ is not set
391# CONFIG_NET_VENDOR_SOLARFLARE is not set 399# CONFIG_NET_VENDOR_SOLARFLARE is not set
400# CONFIG_NET_VENDOR_SOCIONEXT is not set
392# CONFIG_NET_VENDOR_STMICRO is not set 401# CONFIG_NET_VENDOR_STMICRO is not set
393# CONFIG_NET_VENDOR_VIA is not set 402# CONFIG_NET_VENDOR_VIA is not set
394# CONFIG_NET_VENDOR_WIZNET is not set 403# CONFIG_NET_VENDOR_WIZNET is not set
@@ -428,6 +437,7 @@ CONFIG_UHID=m
428CONFIG_RTC_CLASS=y 437CONFIG_RTC_CLASS=y
429# CONFIG_RTC_NVMEM is not set 438# CONFIG_RTC_NVMEM is not set
430CONFIG_RTC_DRV_GENERIC=m 439CONFIG_RTC_DRV_GENERIC=m
440# CONFIG_VIRTIO_MENU is not set
431# CONFIG_IOMMU_SUPPORT is not set 441# CONFIG_IOMMU_SUPPORT is not set
432CONFIG_PROC_HARDWARE=y 442CONFIG_PROC_HARDWARE=y
433CONFIG_EXT4_FS=y 443CONFIG_EXT4_FS=y
@@ -544,7 +554,7 @@ CONFIG_TEST_RHASHTABLE=m
544CONFIG_TEST_HASH=m 554CONFIG_TEST_HASH=m
545CONFIG_TEST_USER_COPY=m 555CONFIG_TEST_USER_COPY=m
546CONFIG_TEST_BPF=m 556CONFIG_TEST_BPF=m
547CONFIG_TEST_FIND_BIT=m 557CONFIG_FIND_BIT_BENCHMARK=m
548CONFIG_TEST_FIRMWARE=m 558CONFIG_TEST_FIRMWARE=m
549CONFIG_TEST_SYSCTL=m 559CONFIG_TEST_SYSCTL=m
550CONFIG_TEST_UDELAY=m 560CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 11c96087fc5d..2a3e29c97652 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -101,6 +101,7 @@ CONFIG_NFT_META=m
101CONFIG_NFT_RT=m 101CONFIG_NFT_RT=m
102CONFIG_NFT_NUMGEN=m 102CONFIG_NFT_NUMGEN=m
103CONFIG_NFT_CT=m 103CONFIG_NFT_CT=m
104CONFIG_NFT_FLOW_OFFLOAD=m
104CONFIG_NFT_SET_RBTREE=m 105CONFIG_NFT_SET_RBTREE=m
105CONFIG_NFT_SET_HASH=m 106CONFIG_NFT_SET_HASH=m
106CONFIG_NFT_SET_BITMAP=m 107CONFIG_NFT_SET_BITMAP=m
@@ -120,6 +121,8 @@ CONFIG_NFT_FIB_INET=m
120CONFIG_NFT_DUP_NETDEV=m 121CONFIG_NFT_DUP_NETDEV=m
121CONFIG_NFT_FWD_NETDEV=m 122CONFIG_NFT_FWD_NETDEV=m
122CONFIG_NFT_FIB_NETDEV=m 123CONFIG_NFT_FIB_NETDEV=m
124CONFIG_NF_FLOW_TABLE_INET=m
125CONFIG_NF_FLOW_TABLE=m
123CONFIG_NETFILTER_XT_SET=m 126CONFIG_NETFILTER_XT_SET=m
124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 127CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 128CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -198,6 +201,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
198CONFIG_NFT_DUP_IPV4=m 201CONFIG_NFT_DUP_IPV4=m
199CONFIG_NFT_FIB_IPV4=m 202CONFIG_NFT_FIB_IPV4=m
200CONFIG_NF_TABLES_ARP=m 203CONFIG_NF_TABLES_ARP=m
204CONFIG_NF_FLOW_TABLE_IPV4=m
201CONFIG_NF_LOG_ARP=m 205CONFIG_NF_LOG_ARP=m
202CONFIG_NFT_CHAIN_NAT_IPV4=m 206CONFIG_NFT_CHAIN_NAT_IPV4=m
203CONFIG_NFT_MASQ_IPV4=m 207CONFIG_NFT_MASQ_IPV4=m
@@ -227,6 +231,7 @@ CONFIG_NF_SOCKET_IPV6=m
227CONFIG_NFT_CHAIN_ROUTE_IPV6=m 231CONFIG_NFT_CHAIN_ROUTE_IPV6=m
228CONFIG_NFT_DUP_IPV6=m 232CONFIG_NFT_DUP_IPV6=m
229CONFIG_NFT_FIB_IPV6=m 233CONFIG_NFT_FIB_IPV6=m
234CONFIG_NF_FLOW_TABLE_IPV6=m
230CONFIG_NFT_CHAIN_NAT_IPV6=m 235CONFIG_NFT_CHAIN_NAT_IPV6=m
231CONFIG_NFT_MASQ_IPV6=m 236CONFIG_NFT_MASQ_IPV6=m
232CONFIG_NFT_REDIR_IPV6=m 237CONFIG_NFT_REDIR_IPV6=m
@@ -240,6 +245,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
240CONFIG_IP6_NF_MATCH_MH=m 245CONFIG_IP6_NF_MATCH_MH=m
241CONFIG_IP6_NF_MATCH_RPFILTER=m 246CONFIG_IP6_NF_MATCH_RPFILTER=m
242CONFIG_IP6_NF_MATCH_RT=m 247CONFIG_IP6_NF_MATCH_RT=m
248CONFIG_IP6_NF_MATCH_SRH=m
243CONFIG_IP6_NF_TARGET_HL=m 249CONFIG_IP6_NF_TARGET_HL=m
244CONFIG_IP6_NF_FILTER=m 250CONFIG_IP6_NF_FILTER=m
245CONFIG_IP6_NF_TARGET_REJECT=m 251CONFIG_IP6_NF_TARGET_REJECT=m
@@ -341,6 +347,7 @@ CONFIG_ISCSI_BOOT_SYSFS=m
341CONFIG_MD=y 347CONFIG_MD=y
342CONFIG_MD_LINEAR=m 348CONFIG_MD_LINEAR=m
343CONFIG_BLK_DEV_DM=m 349CONFIG_BLK_DEV_DM=m
350CONFIG_DM_UNSTRIPED=m
344CONFIG_DM_CRYPT=m 351CONFIG_DM_CRYPT=m
345CONFIG_DM_SNAPSHOT=m 352CONFIG_DM_SNAPSHOT=m
346CONFIG_DM_THIN_PROVISIONING=m 353CONFIG_DM_THIN_PROVISIONING=m
@@ -385,6 +392,7 @@ CONFIG_VETH=m
385# CONFIG_NET_CADENCE is not set 392# CONFIG_NET_CADENCE is not set
386# CONFIG_NET_VENDOR_BROADCOM is not set 393# CONFIG_NET_VENDOR_BROADCOM is not set
387# CONFIG_NET_VENDOR_CIRRUS is not set 394# CONFIG_NET_VENDOR_CIRRUS is not set
395# CONFIG_NET_VENDOR_CORTINA is not set
388# CONFIG_NET_VENDOR_EZCHIP is not set 396# CONFIG_NET_VENDOR_EZCHIP is not set
389# CONFIG_NET_VENDOR_HP is not set 397# CONFIG_NET_VENDOR_HP is not set
390# CONFIG_NET_VENDOR_HUAWEI is not set 398# CONFIG_NET_VENDOR_HUAWEI is not set
@@ -400,6 +408,7 @@ CONFIG_NE2000=y
400# CONFIG_NET_VENDOR_SEEQ is not set 408# CONFIG_NET_VENDOR_SEEQ is not set
401# CONFIG_NET_VENDOR_SOLARFLARE is not set 409# CONFIG_NET_VENDOR_SOLARFLARE is not set
402# CONFIG_NET_VENDOR_SMSC is not set 410# CONFIG_NET_VENDOR_SMSC is not set
411# CONFIG_NET_VENDOR_SOCIONEXT is not set
403# CONFIG_NET_VENDOR_STMICRO is not set 412# CONFIG_NET_VENDOR_STMICRO is not set
404# CONFIG_NET_VENDOR_VIA is not set 413# CONFIG_NET_VENDOR_VIA is not set
405# CONFIG_NET_VENDOR_WIZNET is not set 414# CONFIG_NET_VENDOR_WIZNET is not set
@@ -450,6 +459,7 @@ CONFIG_UHID=m
450CONFIG_RTC_CLASS=y 459CONFIG_RTC_CLASS=y
451# CONFIG_RTC_NVMEM is not set 460# CONFIG_RTC_NVMEM is not set
452CONFIG_RTC_DRV_GENERIC=m 461CONFIG_RTC_DRV_GENERIC=m
462# CONFIG_VIRTIO_MENU is not set
453# CONFIG_IOMMU_SUPPORT is not set 463# CONFIG_IOMMU_SUPPORT is not set
454CONFIG_HEARTBEAT=y 464CONFIG_HEARTBEAT=y
455CONFIG_PROC_HARDWARE=y 465CONFIG_PROC_HARDWARE=y
@@ -567,7 +577,7 @@ CONFIG_TEST_RHASHTABLE=m
567CONFIG_TEST_HASH=m 577CONFIG_TEST_HASH=m
568CONFIG_TEST_USER_COPY=m 578CONFIG_TEST_USER_COPY=m
569CONFIG_TEST_BPF=m 579CONFIG_TEST_BPF=m
570CONFIG_TEST_FIND_BIT=m 580CONFIG_FIND_BIT_BENCHMARK=m
571CONFIG_TEST_FIRMWARE=m 581CONFIG_TEST_FIRMWARE=m
572CONFIG_TEST_SYSCTL=m 582CONFIG_TEST_SYSCTL=m
573CONFIG_TEST_UDELAY=m 583CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index ddba205ee1aa..cba2494c99b2 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -98,6 +98,7 @@ CONFIG_NFT_META=m
98CONFIG_NFT_RT=m 98CONFIG_NFT_RT=m
99CONFIG_NFT_NUMGEN=m 99CONFIG_NFT_NUMGEN=m
100CONFIG_NFT_CT=m 100CONFIG_NFT_CT=m
101CONFIG_NFT_FLOW_OFFLOAD=m
101CONFIG_NFT_SET_RBTREE=m 102CONFIG_NFT_SET_RBTREE=m
102CONFIG_NFT_SET_HASH=m 103CONFIG_NFT_SET_HASH=m
103CONFIG_NFT_SET_BITMAP=m 104CONFIG_NFT_SET_BITMAP=m
@@ -117,6 +118,8 @@ CONFIG_NFT_FIB_INET=m
117CONFIG_NFT_DUP_NETDEV=m 118CONFIG_NFT_DUP_NETDEV=m
118CONFIG_NFT_FWD_NETDEV=m 119CONFIG_NFT_FWD_NETDEV=m
119CONFIG_NFT_FIB_NETDEV=m 120CONFIG_NFT_FIB_NETDEV=m
121CONFIG_NF_FLOW_TABLE_INET=m
122CONFIG_NF_FLOW_TABLE=m
120CONFIG_NETFILTER_XT_SET=m 123CONFIG_NETFILTER_XT_SET=m
121CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
122CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -195,6 +198,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
195CONFIG_NFT_DUP_IPV4=m 198CONFIG_NFT_DUP_IPV4=m
196CONFIG_NFT_FIB_IPV4=m 199CONFIG_NFT_FIB_IPV4=m
197CONFIG_NF_TABLES_ARP=m 200CONFIG_NF_TABLES_ARP=m
201CONFIG_NF_FLOW_TABLE_IPV4=m
198CONFIG_NF_LOG_ARP=m 202CONFIG_NF_LOG_ARP=m
199CONFIG_NFT_CHAIN_NAT_IPV4=m 203CONFIG_NFT_CHAIN_NAT_IPV4=m
200CONFIG_NFT_MASQ_IPV4=m 204CONFIG_NFT_MASQ_IPV4=m
@@ -224,6 +228,7 @@ CONFIG_NF_SOCKET_IPV6=m
224CONFIG_NFT_CHAIN_ROUTE_IPV6=m 228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
225CONFIG_NFT_DUP_IPV6=m 229CONFIG_NFT_DUP_IPV6=m
226CONFIG_NFT_FIB_IPV6=m 230CONFIG_NFT_FIB_IPV6=m
231CONFIG_NF_FLOW_TABLE_IPV6=m
227CONFIG_NFT_CHAIN_NAT_IPV6=m 232CONFIG_NFT_CHAIN_NAT_IPV6=m
228CONFIG_NFT_MASQ_IPV6=m 233CONFIG_NFT_MASQ_IPV6=m
229CONFIG_NFT_REDIR_IPV6=m 234CONFIG_NFT_REDIR_IPV6=m
@@ -237,6 +242,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
237CONFIG_IP6_NF_MATCH_MH=m 242CONFIG_IP6_NF_MATCH_MH=m
238CONFIG_IP6_NF_MATCH_RPFILTER=m 243CONFIG_IP6_NF_MATCH_RPFILTER=m
239CONFIG_IP6_NF_MATCH_RT=m 244CONFIG_IP6_NF_MATCH_RT=m
245CONFIG_IP6_NF_MATCH_SRH=m
240CONFIG_IP6_NF_TARGET_HL=m 246CONFIG_IP6_NF_TARGET_HL=m
241CONFIG_IP6_NF_FILTER=m 247CONFIG_IP6_NF_FILTER=m
242CONFIG_IP6_NF_TARGET_REJECT=m 248CONFIG_IP6_NF_TARGET_REJECT=m
@@ -332,6 +338,7 @@ CONFIG_SUN3_SCSI=y
332CONFIG_MD=y 338CONFIG_MD=y
333CONFIG_MD_LINEAR=m 339CONFIG_MD_LINEAR=m
334CONFIG_BLK_DEV_DM=m 340CONFIG_BLK_DEV_DM=m
341CONFIG_DM_UNSTRIPED=m
335CONFIG_DM_CRYPT=m 342CONFIG_DM_CRYPT=m
336CONFIG_DM_SNAPSHOT=m 343CONFIG_DM_SNAPSHOT=m
337CONFIG_DM_THIN_PROVISIONING=m 344CONFIG_DM_THIN_PROVISIONING=m
@@ -373,6 +380,7 @@ CONFIG_SUN3LANCE=y
373# CONFIG_NET_VENDOR_AQUANTIA is not set 380# CONFIG_NET_VENDOR_AQUANTIA is not set
374# CONFIG_NET_VENDOR_ARC is not set 381# CONFIG_NET_VENDOR_ARC is not set
375# CONFIG_NET_CADENCE is not set 382# CONFIG_NET_CADENCE is not set
383# CONFIG_NET_VENDOR_CORTINA is not set
376# CONFIG_NET_VENDOR_EZCHIP is not set 384# CONFIG_NET_VENDOR_EZCHIP is not set
377# CONFIG_NET_VENDOR_HUAWEI is not set 385# CONFIG_NET_VENDOR_HUAWEI is not set
378CONFIG_SUN3_82586=y 386CONFIG_SUN3_82586=y
@@ -386,6 +394,7 @@ CONFIG_SUN3_82586=y
386# CONFIG_NET_VENDOR_SAMSUNG is not set 394# CONFIG_NET_VENDOR_SAMSUNG is not set
387# CONFIG_NET_VENDOR_SEEQ is not set 395# CONFIG_NET_VENDOR_SEEQ is not set
388# CONFIG_NET_VENDOR_SOLARFLARE is not set 396# CONFIG_NET_VENDOR_SOLARFLARE is not set
397# CONFIG_NET_VENDOR_SOCIONEXT is not set
389# CONFIG_NET_VENDOR_STMICRO is not set 398# CONFIG_NET_VENDOR_STMICRO is not set
390# CONFIG_NET_VENDOR_SUN is not set 399# CONFIG_NET_VENDOR_SUN is not set
391# CONFIG_NET_VENDOR_VIA is not set 400# CONFIG_NET_VENDOR_VIA is not set
@@ -430,6 +439,7 @@ CONFIG_UHID=m
430CONFIG_RTC_CLASS=y 439CONFIG_RTC_CLASS=y
431# CONFIG_RTC_NVMEM is not set 440# CONFIG_RTC_NVMEM is not set
432CONFIG_RTC_DRV_GENERIC=m 441CONFIG_RTC_DRV_GENERIC=m
442# CONFIG_VIRTIO_MENU is not set
433# CONFIG_IOMMU_SUPPORT is not set 443# CONFIG_IOMMU_SUPPORT is not set
434CONFIG_PROC_HARDWARE=y 444CONFIG_PROC_HARDWARE=y
435CONFIG_EXT4_FS=y 445CONFIG_EXT4_FS=y
@@ -546,7 +556,7 @@ CONFIG_TEST_RHASHTABLE=m
546CONFIG_TEST_HASH=m 556CONFIG_TEST_HASH=m
547CONFIG_TEST_USER_COPY=m 557CONFIG_TEST_USER_COPY=m
548CONFIG_TEST_BPF=m 558CONFIG_TEST_BPF=m
549CONFIG_TEST_FIND_BIT=m 559CONFIG_FIND_BIT_BENCHMARK=m
550CONFIG_TEST_FIRMWARE=m 560CONFIG_TEST_FIRMWARE=m
551CONFIG_TEST_SYSCTL=m 561CONFIG_TEST_SYSCTL=m
552CONFIG_TEST_UDELAY=m 562CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 88d09a14c684..d911561137fd 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -98,6 +98,7 @@ CONFIG_NFT_META=m
98CONFIG_NFT_RT=m 98CONFIG_NFT_RT=m
99CONFIG_NFT_NUMGEN=m 99CONFIG_NFT_NUMGEN=m
100CONFIG_NFT_CT=m 100CONFIG_NFT_CT=m
101CONFIG_NFT_FLOW_OFFLOAD=m
101CONFIG_NFT_SET_RBTREE=m 102CONFIG_NFT_SET_RBTREE=m
102CONFIG_NFT_SET_HASH=m 103CONFIG_NFT_SET_HASH=m
103CONFIG_NFT_SET_BITMAP=m 104CONFIG_NFT_SET_BITMAP=m
@@ -117,6 +118,8 @@ CONFIG_NFT_FIB_INET=m
117CONFIG_NFT_DUP_NETDEV=m 118CONFIG_NFT_DUP_NETDEV=m
118CONFIG_NFT_FWD_NETDEV=m 119CONFIG_NFT_FWD_NETDEV=m
119CONFIG_NFT_FIB_NETDEV=m 120CONFIG_NFT_FIB_NETDEV=m
121CONFIG_NF_FLOW_TABLE_INET=m
122CONFIG_NF_FLOW_TABLE=m
120CONFIG_NETFILTER_XT_SET=m 123CONFIG_NETFILTER_XT_SET=m
121CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 124CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
122CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 125CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -195,6 +198,7 @@ CONFIG_NFT_CHAIN_ROUTE_IPV4=m
195CONFIG_NFT_DUP_IPV4=m 198CONFIG_NFT_DUP_IPV4=m
196CONFIG_NFT_FIB_IPV4=m 199CONFIG_NFT_FIB_IPV4=m
197CONFIG_NF_TABLES_ARP=m 200CONFIG_NF_TABLES_ARP=m
201CONFIG_NF_FLOW_TABLE_IPV4=m
198CONFIG_NF_LOG_ARP=m 202CONFIG_NF_LOG_ARP=m
199CONFIG_NFT_CHAIN_NAT_IPV4=m 203CONFIG_NFT_CHAIN_NAT_IPV4=m
200CONFIG_NFT_MASQ_IPV4=m 204CONFIG_NFT_MASQ_IPV4=m
@@ -224,6 +228,7 @@ CONFIG_NF_SOCKET_IPV6=m
224CONFIG_NFT_CHAIN_ROUTE_IPV6=m 228CONFIG_NFT_CHAIN_ROUTE_IPV6=m
225CONFIG_NFT_DUP_IPV6=m 229CONFIG_NFT_DUP_IPV6=m
226CONFIG_NFT_FIB_IPV6=m 230CONFIG_NFT_FIB_IPV6=m
231CONFIG_NF_FLOW_TABLE_IPV6=m
227CONFIG_NFT_CHAIN_NAT_IPV6=m 232CONFIG_NFT_CHAIN_NAT_IPV6=m
228CONFIG_NFT_MASQ_IPV6=m 233CONFIG_NFT_MASQ_IPV6=m
229CONFIG_NFT_REDIR_IPV6=m 234CONFIG_NFT_REDIR_IPV6=m
@@ -237,6 +242,7 @@ CONFIG_IP6_NF_MATCH_IPV6HEADER=m
237CONFIG_IP6_NF_MATCH_MH=m 242CONFIG_IP6_NF_MATCH_MH=m
238CONFIG_IP6_NF_MATCH_RPFILTER=m 243CONFIG_IP6_NF_MATCH_RPFILTER=m
239CONFIG_IP6_NF_MATCH_RT=m 244CONFIG_IP6_NF_MATCH_RT=m
245CONFIG_IP6_NF_MATCH_SRH=m
240CONFIG_IP6_NF_TARGET_HL=m 246CONFIG_IP6_NF_TARGET_HL=m
241CONFIG_IP6_NF_FILTER=m 247CONFIG_IP6_NF_FILTER=m
242CONFIG_IP6_NF_TARGET_REJECT=m 248CONFIG_IP6_NF_TARGET_REJECT=m
@@ -332,6 +338,7 @@ CONFIG_SUN3X_ESP=y
332CONFIG_MD=y 338CONFIG_MD=y
333CONFIG_MD_LINEAR=m 339CONFIG_MD_LINEAR=m
334CONFIG_BLK_DEV_DM=m 340CONFIG_BLK_DEV_DM=m
341CONFIG_DM_UNSTRIPED=m
335CONFIG_DM_CRYPT=m 342CONFIG_DM_CRYPT=m
336CONFIG_DM_SNAPSHOT=m 343CONFIG_DM_SNAPSHOT=m
337CONFIG_DM_THIN_PROVISIONING=m 344CONFIG_DM_THIN_PROVISIONING=m
@@ -374,6 +381,7 @@ CONFIG_SUN3LANCE=y
374# CONFIG_NET_VENDOR_ARC is not set 381# CONFIG_NET_VENDOR_ARC is not set
375# CONFIG_NET_CADENCE is not set 382# CONFIG_NET_CADENCE is not set
376# CONFIG_NET_VENDOR_BROADCOM is not set 383# CONFIG_NET_VENDOR_BROADCOM is not set
384# CONFIG_NET_VENDOR_CORTINA is not set
377# CONFIG_NET_VENDOR_EZCHIP is not set 385# CONFIG_NET_VENDOR_EZCHIP is not set
378# CONFIG_NET_VENDOR_HUAWEI is not set 386# CONFIG_NET_VENDOR_HUAWEI is not set
379# CONFIG_NET_VENDOR_INTEL is not set 387# CONFIG_NET_VENDOR_INTEL is not set
@@ -387,6 +395,7 @@ CONFIG_SUN3LANCE=y
387# CONFIG_NET_VENDOR_SAMSUNG is not set 395# CONFIG_NET_VENDOR_SAMSUNG is not set
388# CONFIG_NET_VENDOR_SEEQ is not set 396# CONFIG_NET_VENDOR_SEEQ is not set
389# CONFIG_NET_VENDOR_SOLARFLARE is not set 397# CONFIG_NET_VENDOR_SOLARFLARE is not set
398# CONFIG_NET_VENDOR_SOCIONEXT is not set
390# CONFIG_NET_VENDOR_STMICRO is not set 399# CONFIG_NET_VENDOR_STMICRO is not set
391# CONFIG_NET_VENDOR_VIA is not set 400# CONFIG_NET_VENDOR_VIA is not set
392# CONFIG_NET_VENDOR_WIZNET is not set 401# CONFIG_NET_VENDOR_WIZNET is not set
@@ -430,6 +439,7 @@ CONFIG_UHID=m
430CONFIG_RTC_CLASS=y 439CONFIG_RTC_CLASS=y
431# CONFIG_RTC_NVMEM is not set 440# CONFIG_RTC_NVMEM is not set
432CONFIG_RTC_DRV_GENERIC=m 441CONFIG_RTC_DRV_GENERIC=m
442# CONFIG_VIRTIO_MENU is not set
433# CONFIG_IOMMU_SUPPORT is not set 443# CONFIG_IOMMU_SUPPORT is not set
434CONFIG_PROC_HARDWARE=y 444CONFIG_PROC_HARDWARE=y
435CONFIG_EXT4_FS=y 445CONFIG_EXT4_FS=y
@@ -546,7 +556,7 @@ CONFIG_TEST_RHASHTABLE=m
546CONFIG_TEST_HASH=m 556CONFIG_TEST_HASH=m
547CONFIG_TEST_USER_COPY=m 557CONFIG_TEST_USER_COPY=m
548CONFIG_TEST_BPF=m 558CONFIG_TEST_BPF=m
549CONFIG_TEST_FIND_BIT=m 559CONFIG_FIND_BIT_BENCHMARK=m
550CONFIG_TEST_FIRMWARE=m 560CONFIG_TEST_FIRMWARE=m
551CONFIG_TEST_SYSCTL=m 561CONFIG_TEST_SYSCTL=m
552CONFIG_TEST_UDELAY=m 562CONFIG_TEST_UDELAY=m
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index 87160b4415fb..97dd4e26f234 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -91,7 +91,7 @@ void read_persistent_clock(struct timespec *ts)
91static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm) 91static int rtc_generic_get_time(struct device *dev, struct rtc_time *tm)
92{ 92{
93 mach_hwclk(0, tm); 93 mach_hwclk(0, tm);
94 return rtc_valid_tm(tm); 94 return 0;
95} 95}
96 96
97static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm) 97static int rtc_generic_set_time(struct device *dev, struct rtc_time *tm)
diff --git a/arch/m68k/mac/baboon.c b/arch/m68k/mac/baboon.c
index c7ea6475ef9b..a7d280220662 100644
--- a/arch/m68k/mac/baboon.c
+++ b/arch/m68k/mac/baboon.c
@@ -18,10 +18,6 @@
18int baboon_present; 18int baboon_present;
19static volatile struct baboon *baboon; 19static volatile struct baboon *baboon;
20 20
21#if 0
22extern int macide_ack_intr(struct ata_channel *);
23#endif
24
25/* 21/*
26 * Baboon initialization. 22 * Baboon initialization.
27 */ 23 */
@@ -41,33 +37,26 @@ void __init baboon_init(void)
41} 37}
42 38
43/* 39/*
44 * Baboon interrupt handler. This works a lot like a VIA. 40 * Baboon interrupt handler.
41 * XXX how do you clear a pending IRQ? is it even necessary?
45 */ 42 */
46 43
47static void baboon_irq(struct irq_desc *desc) 44static void baboon_irq(struct irq_desc *desc)
48{ 45{
49 int irq_bit, irq_num; 46 short events, irq_bit;
50 unsigned char events; 47 int irq_num;
51 48
52 events = baboon->mb_ifr & 0x07; 49 events = baboon->mb_ifr & 0x07;
53 if (!events)
54 return;
55
56 irq_num = IRQ_BABOON_0; 50 irq_num = IRQ_BABOON_0;
57 irq_bit = 1; 51 irq_bit = 1;
58 do { 52 do {
59 if (events & irq_bit) { 53 if (events & irq_bit) {
60 baboon->mb_ifr &= ~irq_bit; 54 events &= ~irq_bit;
61 generic_handle_irq(irq_num); 55 generic_handle_irq(irq_num);
62 } 56 }
57 ++irq_num;
63 irq_bit <<= 1; 58 irq_bit <<= 1;
64 irq_num++; 59 } while (events);
65 } while(events >= irq_bit);
66#if 0
67 if (baboon->mb_ifr & 0x02) macide_ack_intr(NULL);
68 /* for now we need to smash all interrupts */
69 baboon->mb_ifr &= ~events;
70#endif
71} 60}
72 61
73/* 62/*
diff --git a/arch/m68k/mac/config.c b/arch/m68k/mac/config.c
index d3d435248a24..36086cceb537 100644
--- a/arch/m68k/mac/config.c
+++ b/arch/m68k/mac/config.c
@@ -26,6 +26,7 @@
26#include <linux/platform_device.h> 26#include <linux/platform_device.h>
27#include <linux/adb.h> 27#include <linux/adb.h>
28#include <linux/cuda.h> 28#include <linux/cuda.h>
29#include <linux/pmu.h>
29#include <linux/rtc.h> 30#include <linux/rtc.h>
30 31
31#include <asm/setup.h> 32#include <asm/setup.h>
@@ -699,7 +700,7 @@ static struct mac_model mac_data_table[] = {
699 .name = "PowerBook 190", 700 .name = "PowerBook 190",
700 .adb_type = MAC_ADB_PB2, 701 .adb_type = MAC_ADB_PB2,
701 .via_type = MAC_VIA_QUADRA, 702 .via_type = MAC_VIA_QUADRA,
702 .scsi_type = MAC_SCSI_LATE, 703 .scsi_type = MAC_SCSI_OLD,
703 .ide_type = MAC_IDE_BABOON, 704 .ide_type = MAC_IDE_BABOON,
704 .scc_type = MAC_SCC_QUADRA, 705 .scc_type = MAC_SCC_QUADRA,
705 .floppy_type = MAC_FLOPPY_SWIM_ADDR2, 706 .floppy_type = MAC_FLOPPY_SWIM_ADDR2,
@@ -890,6 +891,9 @@ static void __init mac_identify(void)
890#ifdef CONFIG_ADB_CUDA 891#ifdef CONFIG_ADB_CUDA
891 find_via_cuda(); 892 find_via_cuda();
892#endif 893#endif
894#ifdef CONFIG_ADB_PMU68K
895 find_via_pmu();
896#endif
893} 897}
894 898
895static void __init mac_report_hardware(void) 899static void __init mac_report_hardware(void)
@@ -1061,9 +1065,7 @@ int __init mac_platform_init(void)
1061 mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc)); 1065 mac_scsi_old_rsrc, ARRAY_SIZE(mac_scsi_old_rsrc));
1062 break; 1066 break;
1063 case MAC_SCSI_LATE: 1067 case MAC_SCSI_LATE:
1064 /* PDMA logic in 68040 PowerBooks is somehow different to 1068 /* XXX PDMA support for PowerBook 500 series needs testing */
1065 * '030 models. It's probably more like Quadras (see mac_esp).
1066 */
1067 platform_device_register_simple("mac_scsi", 0, 1069 platform_device_register_simple("mac_scsi", 0,
1068 mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc)); 1070 mac_scsi_late_rsrc, ARRAY_SIZE(mac_scsi_late_rsrc));
1069 break; 1071 break;
diff --git a/arch/m68k/mac/misc.c b/arch/m68k/mac/misc.c
index 4956edaac926..c68054361615 100644
--- a/arch/m68k/mac/misc.c
+++ b/arch/m68k/mac/misc.c
@@ -43,18 +43,19 @@ static long cuda_read_time(void)
43 while (!req.complete) 43 while (!req.complete)
44 cuda_poll(); 44 cuda_poll();
45 45
46 time = (req.reply[3] << 24) | (req.reply[4] << 16) 46 time = (req.reply[3] << 24) | (req.reply[4] << 16) |
47 | (req.reply[5] << 8) | req.reply[6]; 47 (req.reply[5] << 8) | req.reply[6];
48 return time - RTC_OFFSET; 48 return time - RTC_OFFSET;
49} 49}
50 50
51static void cuda_write_time(long data) 51static void cuda_write_time(long data)
52{ 52{
53 struct adb_request req; 53 struct adb_request req;
54
54 data += RTC_OFFSET; 55 data += RTC_OFFSET;
55 if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME, 56 if (cuda_request(&req, NULL, 6, CUDA_PACKET, CUDA_SET_TIME,
56 (data >> 24) & 0xFF, (data >> 16) & 0xFF, 57 (data >> 24) & 0xFF, (data >> 16) & 0xFF,
57 (data >> 8) & 0xFF, data & 0xFF) < 0) 58 (data >> 8) & 0xFF, data & 0xFF) < 0)
58 return; 59 return;
59 while (!req.complete) 60 while (!req.complete)
60 cuda_poll(); 61 cuda_poll();
@@ -63,8 +64,9 @@ static void cuda_write_time(long data)
63static __u8 cuda_read_pram(int offset) 64static __u8 cuda_read_pram(int offset)
64{ 65{
65 struct adb_request req; 66 struct adb_request req;
67
66 if (cuda_request(&req, NULL, 4, CUDA_PACKET, CUDA_GET_PRAM, 68 if (cuda_request(&req, NULL, 4, CUDA_PACKET, CUDA_GET_PRAM,
67 (offset >> 8) & 0xFF, offset & 0xFF) < 0) 69 (offset >> 8) & 0xFF, offset & 0xFF) < 0)
68 return 0; 70 return 0;
69 while (!req.complete) 71 while (!req.complete)
70 cuda_poll(); 72 cuda_poll();
@@ -74,18 +76,14 @@ static __u8 cuda_read_pram(int offset)
74static void cuda_write_pram(int offset, __u8 data) 76static void cuda_write_pram(int offset, __u8 data)
75{ 77{
76 struct adb_request req; 78 struct adb_request req;
79
77 if (cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_SET_PRAM, 80 if (cuda_request(&req, NULL, 5, CUDA_PACKET, CUDA_SET_PRAM,
78 (offset >> 8) & 0xFF, offset & 0xFF, data) < 0) 81 (offset >> 8) & 0xFF, offset & 0xFF, data) < 0)
79 return; 82 return;
80 while (!req.complete) 83 while (!req.complete)
81 cuda_poll(); 84 cuda_poll();
82} 85}
83#else 86#endif /* CONFIG_ADB_CUDA */
84#define cuda_read_time() 0
85#define cuda_write_time(n)
86#define cuda_read_pram NULL
87#define cuda_write_pram NULL
88#endif
89 87
90#ifdef CONFIG_ADB_PMU68K 88#ifdef CONFIG_ADB_PMU68K
91static long pmu_read_time(void) 89static long pmu_read_time(void)
@@ -98,14 +96,15 @@ static long pmu_read_time(void)
98 while (!req.complete) 96 while (!req.complete)
99 pmu_poll(); 97 pmu_poll();
100 98
101 time = (req.reply[1] << 24) | (req.reply[2] << 16) 99 time = (req.reply[1] << 24) | (req.reply[2] << 16) |
102 | (req.reply[3] << 8) | req.reply[4]; 100 (req.reply[3] << 8) | req.reply[4];
103 return time - RTC_OFFSET; 101 return time - RTC_OFFSET;
104} 102}
105 103
106static void pmu_write_time(long data) 104static void pmu_write_time(long data)
107{ 105{
108 struct adb_request req; 106 struct adb_request req;
107
109 data += RTC_OFFSET; 108 data += RTC_OFFSET;
110 if (pmu_request(&req, NULL, 5, PMU_SET_RTC, 109 if (pmu_request(&req, NULL, 5, PMU_SET_RTC,
111 (data >> 24) & 0xFF, (data >> 16) & 0xFF, 110 (data >> 24) & 0xFF, (data >> 16) & 0xFF,
@@ -118,6 +117,7 @@ static void pmu_write_time(long data)
118static __u8 pmu_read_pram(int offset) 117static __u8 pmu_read_pram(int offset)
119{ 118{
120 struct adb_request req; 119 struct adb_request req;
120
121 if (pmu_request(&req, NULL, 3, PMU_READ_NVRAM, 121 if (pmu_request(&req, NULL, 3, PMU_READ_NVRAM,
122 (offset >> 8) & 0xFF, offset & 0xFF) < 0) 122 (offset >> 8) & 0xFF, offset & 0xFF) < 0)
123 return 0; 123 return 0;
@@ -129,18 +129,14 @@ static __u8 pmu_read_pram(int offset)
129static void pmu_write_pram(int offset, __u8 data) 129static void pmu_write_pram(int offset, __u8 data)
130{ 130{
131 struct adb_request req; 131 struct adb_request req;
132
132 if (pmu_request(&req, NULL, 4, PMU_WRITE_NVRAM, 133 if (pmu_request(&req, NULL, 4, PMU_WRITE_NVRAM,
133 (offset >> 8) & 0xFF, offset & 0xFF, data) < 0) 134 (offset >> 8) & 0xFF, offset & 0xFF, data) < 0)
134 return; 135 return;
135 while (!req.complete) 136 while (!req.complete)
136 pmu_poll(); 137 pmu_poll();
137} 138}
138#else 139#endif /* CONFIG_ADB_PMU68K */
139#define pmu_read_time() 0
140#define pmu_write_time(n)
141#define pmu_read_pram NULL
142#define pmu_write_pram NULL
143#endif
144 140
145/* 141/*
146 * VIA PRAM/RTC access routines 142 * VIA PRAM/RTC access routines
@@ -151,8 +147,8 @@ static void pmu_write_pram(int offset, __u8 data)
151 147
152static __u8 via_pram_readbyte(void) 148static __u8 via_pram_readbyte(void)
153{ 149{
154 int i,reg; 150 int i, reg;
155 __u8 data; 151 __u8 data;
156 152
157 reg = via1[vBufB] & ~VIA1B_vRTCClk; 153 reg = via1[vBufB] & ~VIA1B_vRTCClk;
158 154
@@ -178,7 +174,7 @@ static __u8 via_pram_readbyte(void)
178 174
179static void via_pram_writebyte(__u8 data) 175static void via_pram_writebyte(__u8 data)
180{ 176{
181 int i,reg,bit; 177 int i, reg, bit;
182 178
183 reg = via1[vBufB] & ~(VIA1B_vRTCClk | VIA1B_vRTCData); 179 reg = via1[vBufB] & ~(VIA1B_vRTCClk | VIA1B_vRTCData);
184 180
@@ -204,7 +200,7 @@ static void via_pram_writebyte(__u8 data)
204static void via_pram_command(int command, __u8 *data) 200static void via_pram_command(int command, __u8 *data)
205{ 201{
206 unsigned long flags; 202 unsigned long flags;
207 int is_read; 203 int is_read;
208 204
209 local_irq_save(flags); 205 local_irq_save(flags);
210 206
@@ -298,10 +294,10 @@ static long via_read_time(void)
298static void via_write_time(long time) 294static void via_write_time(long time)
299{ 295{
300 union { 296 union {
301 __u8 cdata[4]; 297 __u8 cdata[4];
302 long idata; 298 long idata;
303 } data; 299 } data;
304 __u8 temp; 300 __u8 temp;
305 301
306 /* Clear the write protect bit */ 302 /* Clear the write protect bit */
307 303
@@ -333,20 +329,16 @@ static void via_shutdown(void)
333 } 329 }
334} 330}
335 331
336/*
337 * FIXME: not sure how this is supposed to work exactly...
338 */
339
340static void oss_shutdown(void) 332static void oss_shutdown(void)
341{ 333{
342 oss->rom_ctrl = OSS_POWEROFF; 334 oss->rom_ctrl = OSS_POWEROFF;
343} 335}
344 336
345#ifdef CONFIG_ADB_CUDA 337#ifdef CONFIG_ADB_CUDA
346
347static void cuda_restart(void) 338static void cuda_restart(void)
348{ 339{
349 struct adb_request req; 340 struct adb_request req;
341
350 if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM) < 0) 342 if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_RESET_SYSTEM) < 0)
351 return; 343 return;
352 while (!req.complete) 344 while (!req.complete)
@@ -356,6 +348,7 @@ static void cuda_restart(void)
356static void cuda_shutdown(void) 348static void cuda_shutdown(void)
357{ 349{
358 struct adb_request req; 350 struct adb_request req;
351
359 if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN) < 0) 352 if (cuda_request(&req, NULL, 2, CUDA_PACKET, CUDA_POWERDOWN) < 0)
360 return; 353 return;
361 354
@@ -372,7 +365,6 @@ static void cuda_shutdown(void)
372 while (!req.complete) 365 while (!req.complete)
373 cuda_poll(); 366 cuda_poll();
374} 367}
375
376#endif /* CONFIG_ADB_CUDA */ 368#endif /* CONFIG_ADB_CUDA */
377 369
378#ifdef CONFIG_ADB_PMU68K 370#ifdef CONFIG_ADB_PMU68K
@@ -419,18 +411,26 @@ void mac_pram_read(int offset, __u8 *buffer, int len)
419 __u8 (*func)(int); 411 __u8 (*func)(int);
420 int i; 412 int i;
421 413
422 switch(macintosh_config->adb_type) { 414 switch (macintosh_config->adb_type) {
415 case MAC_ADB_IOP:
416 case MAC_ADB_II:
423 case MAC_ADB_PB1: 417 case MAC_ADB_PB1:
424 case MAC_ADB_PB2: 418 func = via_read_pram;
425 func = pmu_read_pram; break; 419 break;
420#ifdef CONFIG_ADB_CUDA
426 case MAC_ADB_EGRET: 421 case MAC_ADB_EGRET:
427 case MAC_ADB_CUDA: 422 case MAC_ADB_CUDA:
428 func = cuda_read_pram; break; 423 func = cuda_read_pram;
424 break;
425#endif
426#ifdef CONFIG_ADB_PMU68K
427 case MAC_ADB_PB2:
428 func = pmu_read_pram;
429 break;
430#endif
429 default: 431 default:
430 func = via_read_pram;
431 }
432 if (!func)
433 return; 432 return;
433 }
434 for (i = 0 ; i < len ; i++) { 434 for (i = 0 ; i < len ; i++) {
435 buffer[i] = (*func)(offset++); 435 buffer[i] = (*func)(offset++);
436 } 436 }
@@ -441,18 +441,26 @@ void mac_pram_write(int offset, __u8 *buffer, int len)
441 void (*func)(int, __u8); 441 void (*func)(int, __u8);
442 int i; 442 int i;
443 443
444 switch(macintosh_config->adb_type) { 444 switch (macintosh_config->adb_type) {
445 case MAC_ADB_IOP:
446 case MAC_ADB_II:
445 case MAC_ADB_PB1: 447 case MAC_ADB_PB1:
446 case MAC_ADB_PB2: 448 func = via_write_pram;
447 func = pmu_write_pram; break; 449 break;
450#ifdef CONFIG_ADB_CUDA
448 case MAC_ADB_EGRET: 451 case MAC_ADB_EGRET:
449 case MAC_ADB_CUDA: 452 case MAC_ADB_CUDA:
450 func = cuda_write_pram; break; 453 func = cuda_write_pram;
454 break;
455#endif
456#ifdef CONFIG_ADB_PMU68K
457 case MAC_ADB_PB2:
458 func = pmu_write_pram;
459 break;
460#endif
451 default: 461 default:
452 func = via_write_pram;
453 }
454 if (!func)
455 return; 462 return;
463 }
456 for (i = 0 ; i < len ; i++) { 464 for (i = 0 ; i < len ; i++) {
457 (*func)(offset++, buffer[i]); 465 (*func)(offset++, buffer[i]);
458 } 466 }
@@ -531,6 +539,7 @@ void mac_reset(void)
531 unsigned long phys = virt_to_phys(mac_reset); 539 unsigned long phys = virt_to_phys(mac_reset);
532 unsigned long addr = (phys&0xFF000000)|0x8777; 540 unsigned long addr = (phys&0xFF000000)|0x8777;
533 unsigned long offset = phys-virt; 541 unsigned long offset = phys-virt;
542
534 local_irq_disable(); /* lets not screw this up, ok? */ 543 local_irq_disable(); /* lets not screw this up, ok? */
535 __asm__ __volatile__(".chip 68030\n\t" 544 __asm__ __volatile__(".chip 68030\n\t"
536 "pmove %0,%/tt0\n\t" 545 "pmove %0,%/tt0\n\t"
@@ -538,7 +547,7 @@ void mac_reset(void)
538 : : "m" (addr)); 547 : : "m" (addr));
539 /* Now jump to physical address so we can disable MMU */ 548 /* Now jump to physical address so we can disable MMU */
540 __asm__ __volatile__( 549 __asm__ __volatile__(
541 ".chip 68030\n\t" 550 ".chip 68030\n\t"
542 "lea %/pc@(1f),%/a0\n\t" 551 "lea %/pc@(1f),%/a0\n\t"
543 "addl %0,%/a0\n\t"/* fixup target address and stack ptr */ 552 "addl %0,%/a0\n\t"/* fixup target address and stack ptr */
544 "addl %0,%/sp\n\t" 553 "addl %0,%/sp\n\t"
@@ -627,9 +636,8 @@ static void unmktime(unsigned long time, long offset,
627 long int yg = y + days / 365 - (days % 365 < 0); 636 long int yg = y + days / 365 - (days % 365 < 0);
628 637
629 /* Adjust DAYS and Y to match the guessed year. */ 638 /* Adjust DAYS and Y to match the guessed year. */
630 days -= ((yg - y) * 365 639 days -= (yg - y) * 365 +
631 + LEAPS_THRU_END_OF (yg - 1) 640 LEAPS_THRU_END_OF(yg - 1) - LEAPS_THRU_END_OF(y - 1);
632 - LEAPS_THRU_END_OF (y - 1));
633 y = yg; 641 y = yg;
634 } 642 }
635 *yearp = y - 1900; 643 *yearp = y - 1900;
@@ -653,18 +661,22 @@ int mac_hwclk(int op, struct rtc_time *t)
653 661
654 if (!op) { /* read */ 662 if (!op) { /* read */
655 switch (macintosh_config->adb_type) { 663 switch (macintosh_config->adb_type) {
656 case MAC_ADB_II:
657 case MAC_ADB_IOP: 664 case MAC_ADB_IOP:
658 now = via_read_time(); 665 case MAC_ADB_II:
659 break;
660 case MAC_ADB_PB1: 666 case MAC_ADB_PB1:
661 case MAC_ADB_PB2: 667 now = via_read_time();
662 now = pmu_read_time();
663 break; 668 break;
669#ifdef CONFIG_ADB_CUDA
664 case MAC_ADB_EGRET: 670 case MAC_ADB_EGRET:
665 case MAC_ADB_CUDA: 671 case MAC_ADB_CUDA:
666 now = cuda_read_time(); 672 now = cuda_read_time();
667 break; 673 break;
674#endif
675#ifdef CONFIG_ADB_PMU68K
676 case MAC_ADB_PB2:
677 now = pmu_read_time();
678 break;
679#endif
668 default: 680 default:
669 now = 0; 681 now = 0;
670 } 682 }
@@ -685,18 +697,24 @@ int mac_hwclk(int op, struct rtc_time *t)
685 t->tm_hour, t->tm_min, t->tm_sec); 697 t->tm_hour, t->tm_min, t->tm_sec);
686 698
687 switch (macintosh_config->adb_type) { 699 switch (macintosh_config->adb_type) {
688 case MAC_ADB_II:
689 case MAC_ADB_IOP: 700 case MAC_ADB_IOP:
701 case MAC_ADB_II:
702 case MAC_ADB_PB1:
690 via_write_time(now); 703 via_write_time(now);
691 break; 704 break;
705#ifdef CONFIG_ADB_CUDA
692 case MAC_ADB_EGRET: 706 case MAC_ADB_EGRET:
693 case MAC_ADB_CUDA: 707 case MAC_ADB_CUDA:
694 cuda_write_time(now); 708 cuda_write_time(now);
695 break; 709 break;
696 case MAC_ADB_PB1: 710#endif
711#ifdef CONFIG_ADB_PMU68K
697 case MAC_ADB_PB2: 712 case MAC_ADB_PB2:
698 pmu_write_time(now); 713 pmu_write_time(now);
699 break; 714 break;
715#endif
716 default:
717 return -ENODEV;
700 } 718 }
701 } 719 }
702 return 0; 720 return 0;
diff --git a/arch/m68k/mm/init.c b/arch/m68k/mm/init.c
index e85acd131fa8..8827b7f91402 100644
--- a/arch/m68k/mm/init.c
+++ b/arch/m68k/mm/init.c
@@ -120,32 +120,6 @@ void free_initmem(void)
120#define VECTORS _ramvec 120#define VECTORS _ramvec
121#endif 121#endif
122 122
123void __init print_memmap(void)
124{
125#define UL(x) ((unsigned long) (x))
126#define MLK(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 10
127#define MLM(b, t) UL(b), UL(t), (UL(t) - UL(b)) >> 20
128#define MLK_ROUNDUP(b, t) b, t, DIV_ROUND_UP(((t) - (b)), 1024)
129
130 pr_notice("Virtual kernel memory layout:\n"
131 " vector : 0x%08lx - 0x%08lx (%4ld KiB)\n"
132 " kmap : 0x%08lx - 0x%08lx (%4ld MiB)\n"
133 " vmalloc : 0x%08lx - 0x%08lx (%4ld MiB)\n"
134 " lowmem : 0x%08lx - 0x%08lx (%4ld MiB)\n"
135 " .init : 0x%p" " - 0x%p" " (%4d KiB)\n"
136 " .text : 0x%p" " - 0x%p" " (%4d KiB)\n"
137 " .data : 0x%p" " - 0x%p" " (%4d KiB)\n"
138 " .bss : 0x%p" " - 0x%p" " (%4d KiB)\n",
139 MLK(VECTORS, VECTORS + 256),
140 MLM(KMAP_START, KMAP_END),
141 MLM(VMALLOC_START, VMALLOC_END),
142 MLM(PAGE_OFFSET, (unsigned long)high_memory),
143 MLK_ROUNDUP(__init_begin, __init_end),
144 MLK_ROUNDUP(_stext, _etext),
145 MLK_ROUNDUP(_sdata, _edata),
146 MLK_ROUNDUP(__bss_start, __bss_stop));
147}
148
149static inline void init_pointer_tables(void) 123static inline void init_pointer_tables(void)
150{ 124{
151#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE) 125#if defined(CONFIG_MMU) && !defined(CONFIG_SUN3) && !defined(CONFIG_COLDFIRE)
@@ -170,7 +144,6 @@ void __init mem_init(void)
170 free_all_bootmem(); 144 free_all_bootmem();
171 init_pointer_tables(); 145 init_pointer_tables();
172 mem_init_print_info(NULL); 146 mem_init_print_info(NULL);
173 print_memmap();
174} 147}
175 148
176#ifdef CONFIG_BLK_DEV_INITRD 149#ifdef CONFIG_BLK_DEV_INITRD
diff --git a/drivers/macintosh/via-pmu68k.c b/drivers/macintosh/via-pmu68k.c
index 25465fb91ec9..7d9c4baf8c11 100644
--- a/drivers/macintosh/via-pmu68k.c
+++ b/drivers/macintosh/via-pmu68k.c
@@ -109,6 +109,7 @@ static int pmu_autopoll(int devs);
109void pmu_poll(void); 109void pmu_poll(void);
110static int pmu_reset_bus(void); 110static int pmu_reset_bus(void);
111 111
112static int init_pmu(void);
112static void pmu_start(void); 113static void pmu_start(void);
113static void send_byte(int x); 114static void send_byte(int x);
114static void recv_byte(void); 115static void recv_byte(void);
@@ -171,23 +172,76 @@ static s8 pmu_data_len[256][2] = {
171/*f8*/ {-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1}, 172/*f8*/ {-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},{-1,-1},
172}; 173};
173 174
174int pmu_probe(void) 175int __init find_via_pmu(void)
175{ 176{
176 if (macintosh_config->adb_type == MAC_ADB_PB1) { 177 switch (macintosh_config->adb_type) {
178 case MAC_ADB_PB1:
177 pmu_kind = PMU_68K_V1; 179 pmu_kind = PMU_68K_V1;
178 } else if (macintosh_config->adb_type == MAC_ADB_PB2) { 180 break;
181 case MAC_ADB_PB2:
179 pmu_kind = PMU_68K_V2; 182 pmu_kind = PMU_68K_V2;
180 } else { 183 break;
184 default:
185 pmu_kind = PMU_UNKNOWN;
181 return -ENODEV; 186 return -ENODEV;
182 } 187 }
183 188
184 pmu_state = idle; 189 pmu_state = idle;
185 190
191 if (!init_pmu())
192 goto fail_init;
193
194 pr_info("adb: PMU 68K driver v0.5 for Unified ADB\n");
195
196 return 1;
197
198fail_init:
199 pmu_kind = PMU_UNKNOWN;
186 return 0; 200 return 0;
187} 201}
188 202
189static int 203static int pmu_probe(void)
190pmu_init(void) 204{
205 if (pmu_kind == PMU_UNKNOWN)
206 return -ENODEV;
207 return 0;
208}
209
210static int pmu_init(void)
211{
212 if (pmu_kind == PMU_UNKNOWN)
213 return -ENODEV;
214 return 0;
215}
216
217static int __init via_pmu_start(void)
218{
219 if (pmu_kind == PMU_UNKNOWN)
220 return -ENODEV;
221
222 if (request_irq(IRQ_MAC_ADB_SR, pmu_interrupt, 0, "PMU_SR",
223 pmu_interrupt)) {
224 pr_err("%s: can't get SR irq\n", __func__);
225 return -ENODEV;
226 }
227 if (request_irq(IRQ_MAC_ADB_CL, pmu_interrupt, 0, "PMU_CL",
228 pmu_interrupt)) {
229 pr_err("%s: can't get CL irq\n", __func__);
230 free_irq(IRQ_MAC_ADB_SR, pmu_interrupt);
231 return -ENODEV;
232 }
233
234 pmu_fully_inited = 1;
235
236 /* Enable backlight */
237 pmu_enable_backlight(1);
238
239 return 0;
240}
241
242arch_initcall(via_pmu_start);
243
244static int __init init_pmu(void)
191{ 245{
192 int timeout; 246 int timeout;
193 volatile struct adb_request req; 247 volatile struct adb_request req;
@@ -238,28 +292,7 @@ pmu_init(void)
238 bright_req_2.complete = 1; 292 bright_req_2.complete = 1;
239 bright_req_3.complete = 1; 293 bright_req_3.complete = 1;
240 294
241 if (request_irq(IRQ_MAC_ADB_SR, pmu_interrupt, 0, "pmu-shift", 295 return 1;
242 pmu_interrupt)) {
243 printk(KERN_ERR "pmu_init: can't get irq %d\n",
244 IRQ_MAC_ADB_SR);
245 return -EAGAIN;
246 }
247 if (request_irq(IRQ_MAC_ADB_CL, pmu_interrupt, 0, "pmu-clock",
248 pmu_interrupt)) {
249 printk(KERN_ERR "pmu_init: can't get irq %d\n",
250 IRQ_MAC_ADB_CL);
251 free_irq(IRQ_MAC_ADB_SR, pmu_interrupt);
252 return -EAGAIN;
253 }
254
255 pmu_fully_inited = 1;
256
257 /* Enable backlight */
258 pmu_enable_backlight(1);
259
260 printk("adb: PMU 68K driver v0.5 for Unified ADB.\n");
261
262 return 0;
263} 296}
264 297
265int 298int
diff --git a/drivers/zorro/zorro.c b/drivers/zorro/zorro.c
index cc1b1ac57d61..47728477297e 100644
--- a/drivers/zorro/zorro.c
+++ b/drivers/zorro/zorro.c
@@ -16,6 +16,7 @@
16#include <linux/bitops.h> 16#include <linux/bitops.h>
17#include <linux/string.h> 17#include <linux/string.h>
18#include <linux/platform_device.h> 18#include <linux/platform_device.h>
19#include <linux/dma-mapping.h>
19#include <linux/slab.h> 20#include <linux/slab.h>
20 21
21#include <asm/byteorder.h> 22#include <asm/byteorder.h>
@@ -185,6 +186,17 @@ static int __init amiga_zorro_probe(struct platform_device *pdev)
185 z->dev.parent = &bus->dev; 186 z->dev.parent = &bus->dev;
186 z->dev.bus = &zorro_bus_type; 187 z->dev.bus = &zorro_bus_type;
187 z->dev.id = i; 188 z->dev.id = i;
189 switch (z->rom.er_Type & ERT_TYPEMASK) {
190 case ERT_ZORROIII:
191 z->dev.coherent_dma_mask = DMA_BIT_MASK(32);
192 break;
193
194 case ERT_ZORROII:
195 default:
196 z->dev.coherent_dma_mask = DMA_BIT_MASK(24);
197 break;
198 }
199 z->dev.dma_mask = &z->dev.coherent_dma_mask;
188 } 200 }
189 201
190 /* ... then register them */ 202 /* ... then register them */
generated by cgit v1.2.2 (git 2.25.0) at 2026-04-26 07:47:05 -0400