aboutsummaryrefslogtreecommitdiffstats
path: root/arch/m68k
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 23:32:50 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2015-06-22 23:32:50 -0400
commitdf68770983b7010ab01e68a21ef67fc034715701 (patch)
tree0972e72f98fbcd1dc0bcde3982a900db83960d4b /arch/m68k
parent407a2c720556e8e340e06f6a7174f5d6d80cf9ea (diff)
parent1214c525484cabb27ed37df936c3451682757263 (diff)
Merge branch 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k update from Geert Uytterhoeven. * 'for-4.2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Use for_each_sg() m68k/defconfig: Update defconfigs for v4.1-rc6
Diffstat (limited to 'arch/m68k')
-rw-r--r--arch/m68k/configs/amiga_defconfig8
-rw-r--r--arch/m68k/configs/apollo_defconfig8
-rw-r--r--arch/m68k/configs/atari_defconfig8
-rw-r--r--arch/m68k/configs/bvme6000_defconfig8
-rw-r--r--arch/m68k/configs/hp300_defconfig8
-rw-r--r--arch/m68k/configs/mac_defconfig8
-rw-r--r--arch/m68k/configs/multi_defconfig8
-rw-r--r--arch/m68k/configs/mvme147_defconfig8
-rw-r--r--arch/m68k/configs/mvme16x_defconfig8
-rw-r--r--arch/m68k/configs/q40_defconfig8
-rw-r--r--arch/m68k/configs/sun3_defconfig8
-rw-r--r--arch/m68k/configs/sun3x_defconfig8
-rw-r--r--arch/m68k/kernel/dma.c19
13 files changed, 84 insertions, 31 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index ed1643b4c678..753a6237f99a 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -177,9 +177,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
177CONFIG_IP_SET_HASH_NETIFACE=m 177CONFIG_IP_SET_HASH_NETIFACE=m
178CONFIG_IP_SET_LIST_SET=m 178CONFIG_IP_SET_LIST_SET=m
179CONFIG_NF_CONNTRACK_IPV4=m 179CONFIG_NF_CONNTRACK_IPV4=m
180CONFIG_NF_LOG_ARP=m
181CONFIG_NFT_CHAIN_ROUTE_IPV4=m 180CONFIG_NFT_CHAIN_ROUTE_IPV4=m
182CONFIG_NF_TABLES_ARP=m 181CONFIG_NF_TABLES_ARP=m
182CONFIG_NF_LOG_ARP=m
183CONFIG_NFT_CHAIN_NAT_IPV4=m 183CONFIG_NFT_CHAIN_NAT_IPV4=m
184CONFIG_NFT_MASQ_IPV4=m 184CONFIG_NFT_MASQ_IPV4=m
185CONFIG_NFT_REDIR_IPV4=m 185CONFIG_NFT_REDIR_IPV4=m
@@ -267,7 +267,9 @@ CONFIG_BATMAN_ADV_DAT=y
267CONFIG_BATMAN_ADV_NC=y 267CONFIG_BATMAN_ADV_NC=y
268CONFIG_BATMAN_ADV_MCAST=y 268CONFIG_BATMAN_ADV_MCAST=y
269CONFIG_NETLINK_DIAG=m 269CONFIG_NETLINK_DIAG=m
270CONFIG_MPLS=y
270CONFIG_NET_MPLS_GSO=m 271CONFIG_NET_MPLS_GSO=m
272CONFIG_MPLS_ROUTING=m
271# CONFIG_WIRELESS is not set 273# CONFIG_WIRELESS is not set
272# CONFIG_UEVENT_HELPER is not set 274# CONFIG_UEVENT_HELPER is not set
273CONFIG_DEVTMPFS=y 275CONFIG_DEVTMPFS=y
@@ -285,6 +287,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
285CONFIG_BLK_DEV_DRBD=m 287CONFIG_BLK_DEV_DRBD=m
286CONFIG_BLK_DEV_NBD=m 288CONFIG_BLK_DEV_NBD=m
287CONFIG_BLK_DEV_RAM=y 289CONFIG_BLK_DEV_RAM=y
290CONFIG_BLK_DEV_PMEM=m
288CONFIG_CDROM_PKTCDVD=m 291CONFIG_CDROM_PKTCDVD=m
289CONFIG_ATA_OVER_ETH=m 292CONFIG_ATA_OVER_ETH=m
290CONFIG_DUMMY_IRQ=m 293CONFIG_DUMMY_IRQ=m
@@ -324,6 +327,7 @@ CONFIG_DM_RAID=m
324CONFIG_DM_ZERO=m 327CONFIG_DM_ZERO=m
325CONFIG_DM_MULTIPATH=m 328CONFIG_DM_MULTIPATH=m
326CONFIG_DM_UEVENT=y 329CONFIG_DM_UEVENT=y
330CONFIG_DM_LOG_WRITES=m
327CONFIG_TARGET_CORE=m 331CONFIG_TARGET_CORE=m
328CONFIG_TCM_IBLOCK=m 332CONFIG_TCM_IBLOCK=m
329CONFIG_TCM_FILEIO=m 333CONFIG_TCM_FILEIO=m
@@ -348,6 +352,7 @@ CONFIG_VETH=m
348CONFIG_A2065=y 352CONFIG_A2065=y
349CONFIG_ARIADNE=y 353CONFIG_ARIADNE=y
350# CONFIG_NET_VENDOR_ARC is not set 354# CONFIG_NET_VENDOR_ARC is not set
355# CONFIG_NET_CADENCE is not set
351# CONFIG_NET_VENDOR_BROADCOM is not set 356# CONFIG_NET_VENDOR_BROADCOM is not set
352# CONFIG_NET_VENDOR_CIRRUS is not set 357# CONFIG_NET_VENDOR_CIRRUS is not set
353# CONFIG_NET_VENDOR_HP is not set 358# CONFIG_NET_VENDOR_HP is not set
@@ -414,7 +419,6 @@ CONFIG_HID=m
414CONFIG_HIDRAW=y 419CONFIG_HIDRAW=y
415CONFIG_UHID=m 420CONFIG_UHID=m
416# CONFIG_HID_GENERIC is not set 421# CONFIG_HID_GENERIC is not set
417# CONFIG_HID_PLANTRONICS is not set
418# CONFIG_USB_SUPPORT is not set 422# CONFIG_USB_SUPPORT is not set
419CONFIG_RTC_CLASS=y 423CONFIG_RTC_CLASS=y
420CONFIG_RTC_DRV_MSM6242=m 424CONFIG_RTC_DRV_MSM6242=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index d38822b1847e..1f93dcaf02e5 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
176CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
177CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180CONFIG_NF_TABLES_ARP=m 179CONFIG_NF_TABLES_ARP=m
180CONFIG_NF_LOG_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m 181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m 182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m 183CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265CONFIG_BATMAN_ADV_NC=y 265CONFIG_BATMAN_ADV_NC=y
266CONFIG_BATMAN_ADV_MCAST=y 266CONFIG_BATMAN_ADV_MCAST=y
267CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
268CONFIG_MPLS=y
268CONFIG_NET_MPLS_GSO=m 269CONFIG_NET_MPLS_GSO=m
270CONFIG_MPLS_ROUTING=m
269# CONFIG_WIRELESS is not set 271# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set 272# CONFIG_UEVENT_HELPER is not set
271CONFIG_DEVTMPFS=y 273CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277CONFIG_BLK_DEV_DRBD=m 279CONFIG_BLK_DEV_DRBD=m
278CONFIG_BLK_DEV_NBD=m 280CONFIG_BLK_DEV_NBD=m
279CONFIG_BLK_DEV_RAM=y 281CONFIG_BLK_DEV_RAM=y
282CONFIG_BLK_DEV_PMEM=m
280CONFIG_CDROM_PKTCDVD=m 283CONFIG_CDROM_PKTCDVD=m
281CONFIG_ATA_OVER_ETH=m 284CONFIG_ATA_OVER_ETH=m
282CONFIG_DUMMY_IRQ=m 285CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m
306CONFIG_DM_ZERO=m 309CONFIG_DM_ZERO=m
307CONFIG_DM_MULTIPATH=m 310CONFIG_DM_MULTIPATH=m
308CONFIG_DM_UEVENT=y 311CONFIG_DM_UEVENT=y
312CONFIG_DM_LOG_WRITES=m
309CONFIG_TARGET_CORE=m 313CONFIG_TARGET_CORE=m
310CONFIG_TCM_IBLOCK=m 314CONFIG_TCM_IBLOCK=m
311CONFIG_TCM_FILEIO=m 315CONFIG_TCM_FILEIO=m
@@ -327,6 +331,7 @@ CONFIG_NETCONSOLE=m
327CONFIG_NETCONSOLE_DYNAMIC=y 331CONFIG_NETCONSOLE_DYNAMIC=y
328CONFIG_VETH=m 332CONFIG_VETH=m
329# CONFIG_NET_VENDOR_ARC is not set 333# CONFIG_NET_VENDOR_ARC is not set
334# CONFIG_NET_CADENCE is not set
330# CONFIG_NET_VENDOR_BROADCOM is not set 335# CONFIG_NET_VENDOR_BROADCOM is not set
331# CONFIG_NET_VENDOR_INTEL is not set 336# CONFIG_NET_VENDOR_INTEL is not set
332# CONFIG_NET_VENDOR_MARVELL is not set 337# CONFIG_NET_VENDOR_MARVELL is not set
@@ -375,7 +380,6 @@ CONFIG_HID=m
375CONFIG_HIDRAW=y 380CONFIG_HIDRAW=y
376CONFIG_UHID=m 381CONFIG_UHID=m
377# CONFIG_HID_GENERIC is not set 382# CONFIG_HID_GENERIC is not set
378# CONFIG_HID_PLANTRONICS is not set
379# CONFIG_USB_SUPPORT is not set 383# CONFIG_USB_SUPPORT is not set
380CONFIG_RTC_CLASS=y 384CONFIG_RTC_CLASS=y
381CONFIG_RTC_DRV_GENERIC=m 385CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index c429199cf4a9..831b8b8b92ad 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
176CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
177CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180CONFIG_NF_TABLES_ARP=m 179CONFIG_NF_TABLES_ARP=m
180CONFIG_NF_LOG_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m 181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m 182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m 183CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265CONFIG_BATMAN_ADV_NC=y 265CONFIG_BATMAN_ADV_NC=y
266CONFIG_BATMAN_ADV_MCAST=y 266CONFIG_BATMAN_ADV_MCAST=y
267CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
268CONFIG_MPLS=y
268CONFIG_NET_MPLS_GSO=m 269CONFIG_NET_MPLS_GSO=m
270CONFIG_MPLS_ROUTING=m
269# CONFIG_WIRELESS is not set 271# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set 272# CONFIG_UEVENT_HELPER is not set
271CONFIG_DEVTMPFS=y 273CONFIG_DEVTMPFS=y
@@ -281,6 +283,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
281CONFIG_BLK_DEV_DRBD=m 283CONFIG_BLK_DEV_DRBD=m
282CONFIG_BLK_DEV_NBD=m 284CONFIG_BLK_DEV_NBD=m
283CONFIG_BLK_DEV_RAM=y 285CONFIG_BLK_DEV_RAM=y
286CONFIG_BLK_DEV_PMEM=m
284CONFIG_CDROM_PKTCDVD=m 287CONFIG_CDROM_PKTCDVD=m
285CONFIG_ATA_OVER_ETH=m 288CONFIG_ATA_OVER_ETH=m
286CONFIG_DUMMY_IRQ=m 289CONFIG_DUMMY_IRQ=m
@@ -315,6 +318,7 @@ CONFIG_DM_RAID=m
315CONFIG_DM_ZERO=m 318CONFIG_DM_ZERO=m
316CONFIG_DM_MULTIPATH=m 319CONFIG_DM_MULTIPATH=m
317CONFIG_DM_UEVENT=y 320CONFIG_DM_UEVENT=y
321CONFIG_DM_LOG_WRITES=m
318CONFIG_TARGET_CORE=m 322CONFIG_TARGET_CORE=m
319CONFIG_TCM_IBLOCK=m 323CONFIG_TCM_IBLOCK=m
320CONFIG_TCM_FILEIO=m 324CONFIG_TCM_FILEIO=m
@@ -337,6 +341,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
337CONFIG_VETH=m 341CONFIG_VETH=m
338CONFIG_ATARILANCE=y 342CONFIG_ATARILANCE=y
339# CONFIG_NET_VENDOR_ARC is not set 343# CONFIG_NET_VENDOR_ARC is not set
344# CONFIG_NET_CADENCE is not set
340# CONFIG_NET_VENDOR_BROADCOM is not set 345# CONFIG_NET_VENDOR_BROADCOM is not set
341# CONFIG_NET_VENDOR_INTEL is not set 346# CONFIG_NET_VENDOR_INTEL is not set
342# CONFIG_NET_VENDOR_MARVELL is not set 347# CONFIG_NET_VENDOR_MARVELL is not set
@@ -391,7 +396,6 @@ CONFIG_DMASOUND_ATARI=m
391CONFIG_HID=m 396CONFIG_HID=m
392CONFIG_HIDRAW=y 397CONFIG_HIDRAW=y
393CONFIG_UHID=m 398CONFIG_UHID=m
394# CONFIG_HID_PLANTRONICS is not set
395CONFIG_RTC_CLASS=y 399CONFIG_RTC_CLASS=y
396CONFIG_RTC_DRV_GENERIC=m 400CONFIG_RTC_DRV_GENERIC=m
397# CONFIG_IOMMU_SUPPORT is not set 401# CONFIG_IOMMU_SUPPORT is not set
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 9b880371d642..91fd187c16d5 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -173,9 +173,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
173CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
174CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
175CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
177CONFIG_NFT_CHAIN_ROUTE_IPV4=m 176CONFIG_NFT_CHAIN_ROUTE_IPV4=m
178CONFIG_NF_TABLES_ARP=m 177CONFIG_NF_TABLES_ARP=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m 179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m 180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m 181CONFIG_NFT_REDIR_IPV4=m
@@ -263,7 +263,9 @@ CONFIG_BATMAN_ADV_DAT=y
263CONFIG_BATMAN_ADV_NC=y 263CONFIG_BATMAN_ADV_NC=y
264CONFIG_BATMAN_ADV_MCAST=y 264CONFIG_BATMAN_ADV_MCAST=y
265CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
266CONFIG_MPLS=y
266CONFIG_NET_MPLS_GSO=m 267CONFIG_NET_MPLS_GSO=m
268CONFIG_MPLS_ROUTING=m
267# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set 270# CONFIG_UEVENT_HELPER is not set
269CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
@@ -275,6 +277,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
275CONFIG_BLK_DEV_DRBD=m 277CONFIG_BLK_DEV_DRBD=m
276CONFIG_BLK_DEV_NBD=m 278CONFIG_BLK_DEV_NBD=m
277CONFIG_BLK_DEV_RAM=y 279CONFIG_BLK_DEV_RAM=y
280CONFIG_BLK_DEV_PMEM=m
278CONFIG_CDROM_PKTCDVD=m 281CONFIG_CDROM_PKTCDVD=m
279CONFIG_ATA_OVER_ETH=m 282CONFIG_ATA_OVER_ETH=m
280CONFIG_DUMMY_IRQ=m 283CONFIG_DUMMY_IRQ=m
@@ -305,6 +308,7 @@ CONFIG_DM_RAID=m
305CONFIG_DM_ZERO=m 308CONFIG_DM_ZERO=m
306CONFIG_DM_MULTIPATH=m 309CONFIG_DM_MULTIPATH=m
307CONFIG_DM_UEVENT=y 310CONFIG_DM_UEVENT=y
311CONFIG_DM_LOG_WRITES=m
308CONFIG_TARGET_CORE=m 312CONFIG_TARGET_CORE=m
309CONFIG_TCM_IBLOCK=m 313CONFIG_TCM_IBLOCK=m
310CONFIG_TCM_FILEIO=m 314CONFIG_TCM_FILEIO=m
@@ -326,6 +330,7 @@ CONFIG_NETCONSOLE=m
326CONFIG_NETCONSOLE_DYNAMIC=y 330CONFIG_NETCONSOLE_DYNAMIC=y
327CONFIG_VETH=m 331CONFIG_VETH=m
328# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set
329# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
330CONFIG_BVME6000_NET=y 335CONFIG_BVME6000_NET=y
331# CONFIG_NET_VENDOR_MARVELL is not set 336# CONFIG_NET_VENDOR_MARVELL is not set
@@ -369,7 +374,6 @@ CONFIG_HID=m
369CONFIG_HIDRAW=y 374CONFIG_HIDRAW=y
370CONFIG_UHID=m 375CONFIG_UHID=m
371# CONFIG_HID_GENERIC is not set 376# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
373# CONFIG_USB_SUPPORT is not set 377# CONFIG_USB_SUPPORT is not set
374CONFIG_RTC_CLASS=y 378CONFIG_RTC_CLASS=y
375CONFIG_RTC_DRV_GENERIC=m 379CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 49ae3376e993..9d4934f1d2c3 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -175,9 +175,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
175CONFIG_IP_SET_HASH_NETIFACE=m 175CONFIG_IP_SET_HASH_NETIFACE=m
176CONFIG_IP_SET_LIST_SET=m 176CONFIG_IP_SET_LIST_SET=m
177CONFIG_NF_CONNTRACK_IPV4=m 177CONFIG_NF_CONNTRACK_IPV4=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_ROUTE_IPV4=m 178CONFIG_NFT_CHAIN_ROUTE_IPV4=m
180CONFIG_NF_TABLES_ARP=m 179CONFIG_NF_TABLES_ARP=m
180CONFIG_NF_LOG_ARP=m
181CONFIG_NFT_CHAIN_NAT_IPV4=m 181CONFIG_NFT_CHAIN_NAT_IPV4=m
182CONFIG_NFT_MASQ_IPV4=m 182CONFIG_NFT_MASQ_IPV4=m
183CONFIG_NFT_REDIR_IPV4=m 183CONFIG_NFT_REDIR_IPV4=m
@@ -265,7 +265,9 @@ CONFIG_BATMAN_ADV_DAT=y
265CONFIG_BATMAN_ADV_NC=y 265CONFIG_BATMAN_ADV_NC=y
266CONFIG_BATMAN_ADV_MCAST=y 266CONFIG_BATMAN_ADV_MCAST=y
267CONFIG_NETLINK_DIAG=m 267CONFIG_NETLINK_DIAG=m
268CONFIG_MPLS=y
268CONFIG_NET_MPLS_GSO=m 269CONFIG_NET_MPLS_GSO=m
270CONFIG_MPLS_ROUTING=m
269# CONFIG_WIRELESS is not set 271# CONFIG_WIRELESS is not set
270# CONFIG_UEVENT_HELPER is not set 272# CONFIG_UEVENT_HELPER is not set
271CONFIG_DEVTMPFS=y 273CONFIG_DEVTMPFS=y
@@ -277,6 +279,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
277CONFIG_BLK_DEV_DRBD=m 279CONFIG_BLK_DEV_DRBD=m
278CONFIG_BLK_DEV_NBD=m 280CONFIG_BLK_DEV_NBD=m
279CONFIG_BLK_DEV_RAM=y 281CONFIG_BLK_DEV_RAM=y
282CONFIG_BLK_DEV_PMEM=m
280CONFIG_CDROM_PKTCDVD=m 283CONFIG_CDROM_PKTCDVD=m
281CONFIG_ATA_OVER_ETH=m 284CONFIG_ATA_OVER_ETH=m
282CONFIG_DUMMY_IRQ=m 285CONFIG_DUMMY_IRQ=m
@@ -306,6 +309,7 @@ CONFIG_DM_RAID=m
306CONFIG_DM_ZERO=m 309CONFIG_DM_ZERO=m
307CONFIG_DM_MULTIPATH=m 310CONFIG_DM_MULTIPATH=m
308CONFIG_DM_UEVENT=y 311CONFIG_DM_UEVENT=y
312CONFIG_DM_LOG_WRITES=m
309CONFIG_TARGET_CORE=m 313CONFIG_TARGET_CORE=m
310CONFIG_TCM_IBLOCK=m 314CONFIG_TCM_IBLOCK=m
311CONFIG_TCM_FILEIO=m 315CONFIG_TCM_FILEIO=m
@@ -328,6 +332,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
328CONFIG_VETH=m 332CONFIG_VETH=m
329CONFIG_HPLANCE=y 333CONFIG_HPLANCE=y
330# CONFIG_NET_VENDOR_ARC is not set 334# CONFIG_NET_VENDOR_ARC is not set
335# CONFIG_NET_CADENCE is not set
331# CONFIG_NET_VENDOR_BROADCOM is not set 336# CONFIG_NET_VENDOR_BROADCOM is not set
332# CONFIG_NET_VENDOR_INTEL is not set 337# CONFIG_NET_VENDOR_INTEL is not set
333# CONFIG_NET_VENDOR_MARVELL is not set 338# CONFIG_NET_VENDOR_MARVELL is not set
@@ -378,7 +383,6 @@ CONFIG_HID=m
378CONFIG_HIDRAW=y 383CONFIG_HIDRAW=y
379CONFIG_UHID=m 384CONFIG_UHID=m
380# CONFIG_HID_GENERIC is not set 385# CONFIG_HID_GENERIC is not set
381# CONFIG_HID_PLANTRONICS is not set
382# CONFIG_USB_SUPPORT is not set 386# CONFIG_USB_SUPPORT is not set
383CONFIG_RTC_CLASS=y 387CONFIG_RTC_CLASS=y
384CONFIG_RTC_DRV_GENERIC=m 388CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index ee143a57058c..72bc187ca995 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -174,9 +174,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
174CONFIG_IP_SET_HASH_NETIFACE=m 174CONFIG_IP_SET_HASH_NETIFACE=m
175CONFIG_IP_SET_LIST_SET=m 175CONFIG_IP_SET_LIST_SET=m
176CONFIG_NF_CONNTRACK_IPV4=m 176CONFIG_NF_CONNTRACK_IPV4=m
177CONFIG_NF_LOG_ARP=m
178CONFIG_NFT_CHAIN_ROUTE_IPV4=m 177CONFIG_NFT_CHAIN_ROUTE_IPV4=m
179CONFIG_NF_TABLES_ARP=m 178CONFIG_NF_TABLES_ARP=m
179CONFIG_NF_LOG_ARP=m
180CONFIG_NFT_CHAIN_NAT_IPV4=m 180CONFIG_NFT_CHAIN_NAT_IPV4=m
181CONFIG_NFT_MASQ_IPV4=m 181CONFIG_NFT_MASQ_IPV4=m
182CONFIG_NFT_REDIR_IPV4=m 182CONFIG_NFT_REDIR_IPV4=m
@@ -267,7 +267,9 @@ CONFIG_BATMAN_ADV_DAT=y
267CONFIG_BATMAN_ADV_NC=y 267CONFIG_BATMAN_ADV_NC=y
268CONFIG_BATMAN_ADV_MCAST=y 268CONFIG_BATMAN_ADV_MCAST=y
269CONFIG_NETLINK_DIAG=m 269CONFIG_NETLINK_DIAG=m
270CONFIG_MPLS=y
270CONFIG_NET_MPLS_GSO=m 271CONFIG_NET_MPLS_GSO=m
272CONFIG_MPLS_ROUTING=m
271# CONFIG_WIRELESS is not set 273# CONFIG_WIRELESS is not set
272# CONFIG_UEVENT_HELPER is not set 274# CONFIG_UEVENT_HELPER is not set
273CONFIG_DEVTMPFS=y 275CONFIG_DEVTMPFS=y
@@ -280,6 +282,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
280CONFIG_BLK_DEV_DRBD=m 282CONFIG_BLK_DEV_DRBD=m
281CONFIG_BLK_DEV_NBD=m 283CONFIG_BLK_DEV_NBD=m
282CONFIG_BLK_DEV_RAM=y 284CONFIG_BLK_DEV_RAM=y
285CONFIG_BLK_DEV_PMEM=m
283CONFIG_CDROM_PKTCDVD=m 286CONFIG_CDROM_PKTCDVD=m
284CONFIG_ATA_OVER_ETH=m 287CONFIG_ATA_OVER_ETH=m
285CONFIG_DUMMY_IRQ=m 288CONFIG_DUMMY_IRQ=m
@@ -315,6 +318,7 @@ CONFIG_DM_RAID=m
315CONFIG_DM_ZERO=m 318CONFIG_DM_ZERO=m
316CONFIG_DM_MULTIPATH=m 319CONFIG_DM_MULTIPATH=m
317CONFIG_DM_UEVENT=y 320CONFIG_DM_UEVENT=y
321CONFIG_DM_LOG_WRITES=m
318CONFIG_TARGET_CORE=m 322CONFIG_TARGET_CORE=m
319CONFIG_TCM_IBLOCK=m 323CONFIG_TCM_IBLOCK=m
320CONFIG_TCM_FILEIO=m 324CONFIG_TCM_FILEIO=m
@@ -344,6 +348,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
344CONFIG_VETH=m 348CONFIG_VETH=m
345CONFIG_MACMACE=y 349CONFIG_MACMACE=y
346# CONFIG_NET_VENDOR_ARC is not set 350# CONFIG_NET_VENDOR_ARC is not set
351# CONFIG_NET_CADENCE is not set
347# CONFIG_NET_VENDOR_BROADCOM is not set 352# CONFIG_NET_VENDOR_BROADCOM is not set
348CONFIG_MAC89x0=y 353CONFIG_MAC89x0=y
349# CONFIG_NET_VENDOR_INTEL is not set 354# CONFIG_NET_VENDOR_INTEL is not set
@@ -400,7 +405,6 @@ CONFIG_HID=m
400CONFIG_HIDRAW=y 405CONFIG_HIDRAW=y
401CONFIG_UHID=m 406CONFIG_UHID=m
402# CONFIG_HID_GENERIC is not set 407# CONFIG_HID_GENERIC is not set
403# CONFIG_HID_PLANTRONICS is not set
404# CONFIG_USB_SUPPORT is not set 408# CONFIG_USB_SUPPORT is not set
405CONFIG_RTC_CLASS=y 409CONFIG_RTC_CLASS=y
406CONFIG_RTC_DRV_GENERIC=m 410CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index c777aa05048f..8fb65535597f 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -184,9 +184,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
184CONFIG_IP_SET_HASH_NETIFACE=m 184CONFIG_IP_SET_HASH_NETIFACE=m
185CONFIG_IP_SET_LIST_SET=m 185CONFIG_IP_SET_LIST_SET=m
186CONFIG_NF_CONNTRACK_IPV4=m 186CONFIG_NF_CONNTRACK_IPV4=m
187CONFIG_NF_LOG_ARP=m
188CONFIG_NFT_CHAIN_ROUTE_IPV4=m 187CONFIG_NFT_CHAIN_ROUTE_IPV4=m
189CONFIG_NF_TABLES_ARP=m 188CONFIG_NF_TABLES_ARP=m
189CONFIG_NF_LOG_ARP=m
190CONFIG_NFT_CHAIN_NAT_IPV4=m 190CONFIG_NFT_CHAIN_NAT_IPV4=m
191CONFIG_NFT_MASQ_IPV4=m 191CONFIG_NFT_MASQ_IPV4=m
192CONFIG_NFT_REDIR_IPV4=m 192CONFIG_NFT_REDIR_IPV4=m
@@ -277,7 +277,9 @@ CONFIG_BATMAN_ADV_DAT=y
277CONFIG_BATMAN_ADV_NC=y 277CONFIG_BATMAN_ADV_NC=y
278CONFIG_BATMAN_ADV_MCAST=y 278CONFIG_BATMAN_ADV_MCAST=y
279CONFIG_NETLINK_DIAG=m 279CONFIG_NETLINK_DIAG=m
280CONFIG_MPLS=y
280CONFIG_NET_MPLS_GSO=m 281CONFIG_NET_MPLS_GSO=m
282CONFIG_MPLS_ROUTING=m
281# CONFIG_WIRELESS is not set 283# CONFIG_WIRELESS is not set
282# CONFIG_UEVENT_HELPER is not set 284# CONFIG_UEVENT_HELPER is not set
283CONFIG_DEVTMPFS=y 285CONFIG_DEVTMPFS=y
@@ -299,6 +301,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
299CONFIG_BLK_DEV_DRBD=m 301CONFIG_BLK_DEV_DRBD=m
300CONFIG_BLK_DEV_NBD=m 302CONFIG_BLK_DEV_NBD=m
301CONFIG_BLK_DEV_RAM=y 303CONFIG_BLK_DEV_RAM=y
304CONFIG_BLK_DEV_PMEM=m
302CONFIG_CDROM_PKTCDVD=m 305CONFIG_CDROM_PKTCDVD=m
303CONFIG_ATA_OVER_ETH=m 306CONFIG_ATA_OVER_ETH=m
304CONFIG_DUMMY_IRQ=m 307CONFIG_DUMMY_IRQ=m
@@ -348,6 +351,7 @@ CONFIG_DM_RAID=m
348CONFIG_DM_ZERO=m 351CONFIG_DM_ZERO=m
349CONFIG_DM_MULTIPATH=m 352CONFIG_DM_MULTIPATH=m
350CONFIG_DM_UEVENT=y 353CONFIG_DM_UEVENT=y
354CONFIG_DM_LOG_WRITES=m
351CONFIG_TARGET_CORE=m 355CONFIG_TARGET_CORE=m
352CONFIG_TCM_IBLOCK=m 356CONFIG_TCM_IBLOCK=m
353CONFIG_TCM_FILEIO=m 357CONFIG_TCM_FILEIO=m
@@ -384,6 +388,7 @@ CONFIG_MVME147_NET=y
384CONFIG_SUN3LANCE=y 388CONFIG_SUN3LANCE=y
385CONFIG_MACMACE=y 389CONFIG_MACMACE=y
386# CONFIG_NET_VENDOR_ARC is not set 390# CONFIG_NET_VENDOR_ARC is not set
391# CONFIG_NET_CADENCE is not set
387# CONFIG_NET_VENDOR_BROADCOM is not set 392# CONFIG_NET_VENDOR_BROADCOM is not set
388CONFIG_MAC89x0=y 393CONFIG_MAC89x0=y
389# CONFIG_NET_VENDOR_HP is not set 394# CONFIG_NET_VENDOR_HP is not set
@@ -468,7 +473,6 @@ CONFIG_HID=m
468CONFIG_HIDRAW=y 473CONFIG_HIDRAW=y
469CONFIG_UHID=m 474CONFIG_UHID=m
470# CONFIG_HID_GENERIC is not set 475# CONFIG_HID_GENERIC is not set
471# CONFIG_HID_PLANTRONICS is not set
472# CONFIG_USB_SUPPORT is not set 476# CONFIG_USB_SUPPORT is not set
473CONFIG_RTC_CLASS=y 477CONFIG_RTC_CLASS=y
474CONFIG_RTC_DRV_MSM6242=m 478CONFIG_RTC_DRV_MSM6242=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index a7628a85e260..f34491ec0126 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -172,9 +172,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
172CONFIG_IP_SET_HASH_NETIFACE=m 172CONFIG_IP_SET_HASH_NETIFACE=m
173CONFIG_IP_SET_LIST_SET=m 173CONFIG_IP_SET_LIST_SET=m
174CONFIG_NF_CONNTRACK_IPV4=m 174CONFIG_NF_CONNTRACK_IPV4=m
175CONFIG_NF_LOG_ARP=m
176CONFIG_NFT_CHAIN_ROUTE_IPV4=m 175CONFIG_NFT_CHAIN_ROUTE_IPV4=m
177CONFIG_NF_TABLES_ARP=m 176CONFIG_NF_TABLES_ARP=m
177CONFIG_NF_LOG_ARP=m
178CONFIG_NFT_CHAIN_NAT_IPV4=m 178CONFIG_NFT_CHAIN_NAT_IPV4=m
179CONFIG_NFT_MASQ_IPV4=m 179CONFIG_NFT_MASQ_IPV4=m
180CONFIG_NFT_REDIR_IPV4=m 180CONFIG_NFT_REDIR_IPV4=m
@@ -262,7 +262,9 @@ CONFIG_BATMAN_ADV_DAT=y
262CONFIG_BATMAN_ADV_NC=y 262CONFIG_BATMAN_ADV_NC=y
263CONFIG_BATMAN_ADV_MCAST=y 263CONFIG_BATMAN_ADV_MCAST=y
264CONFIG_NETLINK_DIAG=m 264CONFIG_NETLINK_DIAG=m
265CONFIG_MPLS=y
265CONFIG_NET_MPLS_GSO=m 266CONFIG_NET_MPLS_GSO=m
267CONFIG_MPLS_ROUTING=m
266# CONFIG_WIRELESS is not set 268# CONFIG_WIRELESS is not set
267# CONFIG_UEVENT_HELPER is not set 269# CONFIG_UEVENT_HELPER is not set
268CONFIG_DEVTMPFS=y 270CONFIG_DEVTMPFS=y
@@ -274,6 +276,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
274CONFIG_BLK_DEV_DRBD=m 276CONFIG_BLK_DEV_DRBD=m
275CONFIG_BLK_DEV_NBD=m 277CONFIG_BLK_DEV_NBD=m
276CONFIG_BLK_DEV_RAM=y 278CONFIG_BLK_DEV_RAM=y
279CONFIG_BLK_DEV_PMEM=m
277CONFIG_CDROM_PKTCDVD=m 280CONFIG_CDROM_PKTCDVD=m
278CONFIG_ATA_OVER_ETH=m 281CONFIG_ATA_OVER_ETH=m
279CONFIG_DUMMY_IRQ=m 282CONFIG_DUMMY_IRQ=m
@@ -304,6 +307,7 @@ CONFIG_DM_RAID=m
304CONFIG_DM_ZERO=m 307CONFIG_DM_ZERO=m
305CONFIG_DM_MULTIPATH=m 308CONFIG_DM_MULTIPATH=m
306CONFIG_DM_UEVENT=y 309CONFIG_DM_UEVENT=y
310CONFIG_DM_LOG_WRITES=m
307CONFIG_TARGET_CORE=m 311CONFIG_TARGET_CORE=m
308CONFIG_TCM_IBLOCK=m 312CONFIG_TCM_IBLOCK=m
309CONFIG_TCM_FILEIO=m 313CONFIG_TCM_FILEIO=m
@@ -326,6 +330,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
326CONFIG_VETH=m 330CONFIG_VETH=m
327CONFIG_MVME147_NET=y 331CONFIG_MVME147_NET=y
328# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set
329# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
330# CONFIG_NET_VENDOR_INTEL is not set 335# CONFIG_NET_VENDOR_INTEL is not set
331# CONFIG_NET_VENDOR_MARVELL is not set 336# CONFIG_NET_VENDOR_MARVELL is not set
@@ -369,7 +374,6 @@ CONFIG_HID=m
369CONFIG_HIDRAW=y 374CONFIG_HIDRAW=y
370CONFIG_UHID=m 375CONFIG_UHID=m
371# CONFIG_HID_GENERIC is not set 376# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
373# CONFIG_USB_SUPPORT is not set 377# CONFIG_USB_SUPPORT is not set
374CONFIG_RTC_CLASS=y 378CONFIG_RTC_CLASS=y
375CONFIG_RTC_DRV_GENERIC=m 379CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index ebaa68268a4a..3d3614d1b041 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -173,9 +173,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
173CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
174CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
175CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
177CONFIG_NFT_CHAIN_ROUTE_IPV4=m 176CONFIG_NFT_CHAIN_ROUTE_IPV4=m
178CONFIG_NF_TABLES_ARP=m 177CONFIG_NF_TABLES_ARP=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m 179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m 180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m 181CONFIG_NFT_REDIR_IPV4=m
@@ -263,7 +263,9 @@ CONFIG_BATMAN_ADV_DAT=y
263CONFIG_BATMAN_ADV_NC=y 263CONFIG_BATMAN_ADV_NC=y
264CONFIG_BATMAN_ADV_MCAST=y 264CONFIG_BATMAN_ADV_MCAST=y
265CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
266CONFIG_MPLS=y
266CONFIG_NET_MPLS_GSO=m 267CONFIG_NET_MPLS_GSO=m
268CONFIG_MPLS_ROUTING=m
267# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set 270# CONFIG_UEVENT_HELPER is not set
269CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
@@ -275,6 +277,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
275CONFIG_BLK_DEV_DRBD=m 277CONFIG_BLK_DEV_DRBD=m
276CONFIG_BLK_DEV_NBD=m 278CONFIG_BLK_DEV_NBD=m
277CONFIG_BLK_DEV_RAM=y 279CONFIG_BLK_DEV_RAM=y
280CONFIG_BLK_DEV_PMEM=m
278CONFIG_CDROM_PKTCDVD=m 281CONFIG_CDROM_PKTCDVD=m
279CONFIG_ATA_OVER_ETH=m 282CONFIG_ATA_OVER_ETH=m
280CONFIG_DUMMY_IRQ=m 283CONFIG_DUMMY_IRQ=m
@@ -305,6 +308,7 @@ CONFIG_DM_RAID=m
305CONFIG_DM_ZERO=m 308CONFIG_DM_ZERO=m
306CONFIG_DM_MULTIPATH=m 309CONFIG_DM_MULTIPATH=m
307CONFIG_DM_UEVENT=y 310CONFIG_DM_UEVENT=y
311CONFIG_DM_LOG_WRITES=m
308CONFIG_TARGET_CORE=m 312CONFIG_TARGET_CORE=m
309CONFIG_TCM_IBLOCK=m 313CONFIG_TCM_IBLOCK=m
310CONFIG_TCM_FILEIO=m 314CONFIG_TCM_FILEIO=m
@@ -326,6 +330,7 @@ CONFIG_NETCONSOLE=m
326CONFIG_NETCONSOLE_DYNAMIC=y 330CONFIG_NETCONSOLE_DYNAMIC=y
327CONFIG_VETH=m 331CONFIG_VETH=m
328# CONFIG_NET_VENDOR_ARC is not set 332# CONFIG_NET_VENDOR_ARC is not set
333# CONFIG_NET_CADENCE is not set
329# CONFIG_NET_VENDOR_BROADCOM is not set 334# CONFIG_NET_VENDOR_BROADCOM is not set
330CONFIG_MVME16x_NET=y 335CONFIG_MVME16x_NET=y
331# CONFIG_NET_VENDOR_MARVELL is not set 336# CONFIG_NET_VENDOR_MARVELL is not set
@@ -369,7 +374,6 @@ CONFIG_HID=m
369CONFIG_HIDRAW=y 374CONFIG_HIDRAW=y
370CONFIG_UHID=m 375CONFIG_UHID=m
371# CONFIG_HID_GENERIC is not set 376# CONFIG_HID_GENERIC is not set
372# CONFIG_HID_PLANTRONICS is not set
373# CONFIG_USB_SUPPORT is not set 377# CONFIG_USB_SUPPORT is not set
374CONFIG_RTC_CLASS=y 378CONFIG_RTC_CLASS=y
375CONFIG_RTC_DRV_GENERIC=m 379CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 2c16853aedd3..643e9c93bea7 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -173,9 +173,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
173CONFIG_IP_SET_HASH_NETIFACE=m 173CONFIG_IP_SET_HASH_NETIFACE=m
174CONFIG_IP_SET_LIST_SET=m 174CONFIG_IP_SET_LIST_SET=m
175CONFIG_NF_CONNTRACK_IPV4=m 175CONFIG_NF_CONNTRACK_IPV4=m
176CONFIG_NF_LOG_ARP=m
177CONFIG_NFT_CHAIN_ROUTE_IPV4=m 176CONFIG_NFT_CHAIN_ROUTE_IPV4=m
178CONFIG_NF_TABLES_ARP=m 177CONFIG_NF_TABLES_ARP=m
178CONFIG_NF_LOG_ARP=m
179CONFIG_NFT_CHAIN_NAT_IPV4=m 179CONFIG_NFT_CHAIN_NAT_IPV4=m
180CONFIG_NFT_MASQ_IPV4=m 180CONFIG_NFT_MASQ_IPV4=m
181CONFIG_NFT_REDIR_IPV4=m 181CONFIG_NFT_REDIR_IPV4=m
@@ -263,7 +263,9 @@ CONFIG_BATMAN_ADV_DAT=y
263CONFIG_BATMAN_ADV_NC=y 263CONFIG_BATMAN_ADV_NC=y
264CONFIG_BATMAN_ADV_MCAST=y 264CONFIG_BATMAN_ADV_MCAST=y
265CONFIG_NETLINK_DIAG=m 265CONFIG_NETLINK_DIAG=m
266CONFIG_MPLS=y
266CONFIG_NET_MPLS_GSO=m 267CONFIG_NET_MPLS_GSO=m
268CONFIG_MPLS_ROUTING=m
267# CONFIG_WIRELESS is not set 269# CONFIG_WIRELESS is not set
268# CONFIG_UEVENT_HELPER is not set 270# CONFIG_UEVENT_HELPER is not set
269CONFIG_DEVTMPFS=y 271CONFIG_DEVTMPFS=y
@@ -278,6 +280,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
278CONFIG_BLK_DEV_DRBD=m 280CONFIG_BLK_DEV_DRBD=m
279CONFIG_BLK_DEV_NBD=m 281CONFIG_BLK_DEV_NBD=m
280CONFIG_BLK_DEV_RAM=y 282CONFIG_BLK_DEV_RAM=y
283CONFIG_BLK_DEV_PMEM=m
281CONFIG_CDROM_PKTCDVD=m 284CONFIG_CDROM_PKTCDVD=m
282CONFIG_ATA_OVER_ETH=m 285CONFIG_ATA_OVER_ETH=m
283CONFIG_DUMMY_IRQ=m 286CONFIG_DUMMY_IRQ=m
@@ -311,6 +314,7 @@ CONFIG_DM_RAID=m
311CONFIG_DM_ZERO=m 314CONFIG_DM_ZERO=m
312CONFIG_DM_MULTIPATH=m 315CONFIG_DM_MULTIPATH=m
313CONFIG_DM_UEVENT=y 316CONFIG_DM_UEVENT=y
317CONFIG_DM_LOG_WRITES=m
314CONFIG_TARGET_CORE=m 318CONFIG_TARGET_CORE=m
315CONFIG_TCM_IBLOCK=m 319CONFIG_TCM_IBLOCK=m
316CONFIG_TCM_FILEIO=m 320CONFIG_TCM_FILEIO=m
@@ -334,6 +338,7 @@ CONFIG_VETH=m
334# CONFIG_NET_VENDOR_3COM is not set 338# CONFIG_NET_VENDOR_3COM is not set
335# CONFIG_NET_VENDOR_AMD is not set 339# CONFIG_NET_VENDOR_AMD is not set
336# CONFIG_NET_VENDOR_ARC is not set 340# CONFIG_NET_VENDOR_ARC is not set
341# CONFIG_NET_CADENCE is not set
337# CONFIG_NET_VENDOR_BROADCOM is not set 342# CONFIG_NET_VENDOR_BROADCOM is not set
338# CONFIG_NET_VENDOR_CIRRUS is not set 343# CONFIG_NET_VENDOR_CIRRUS is not set
339# CONFIG_NET_VENDOR_HP is not set 344# CONFIG_NET_VENDOR_HP is not set
@@ -390,7 +395,6 @@ CONFIG_HID=m
390CONFIG_HIDRAW=y 395CONFIG_HIDRAW=y
391CONFIG_UHID=m 396CONFIG_UHID=m
392# CONFIG_HID_GENERIC is not set 397# CONFIG_HID_GENERIC is not set
393# CONFIG_HID_PLANTRONICS is not set
394# CONFIG_USB_SUPPORT is not set 398# CONFIG_USB_SUPPORT is not set
395CONFIG_RTC_CLASS=y 399CONFIG_RTC_CLASS=y
396CONFIG_RTC_DRV_GENERIC=m 400CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index e3056bf0f65b..8fecc5aa166c 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -170,9 +170,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
170CONFIG_IP_SET_HASH_NETIFACE=m 170CONFIG_IP_SET_HASH_NETIFACE=m
171CONFIG_IP_SET_LIST_SET=m 171CONFIG_IP_SET_LIST_SET=m
172CONFIG_NF_CONNTRACK_IPV4=m 172CONFIG_NF_CONNTRACK_IPV4=m
173CONFIG_NF_LOG_ARP=m
174CONFIG_NFT_CHAIN_ROUTE_IPV4=m 173CONFIG_NFT_CHAIN_ROUTE_IPV4=m
175CONFIG_NF_TABLES_ARP=m 174CONFIG_NF_TABLES_ARP=m
175CONFIG_NF_LOG_ARP=m
176CONFIG_NFT_CHAIN_NAT_IPV4=m 176CONFIG_NFT_CHAIN_NAT_IPV4=m
177CONFIG_NFT_MASQ_IPV4=m 177CONFIG_NFT_MASQ_IPV4=m
178CONFIG_NFT_REDIR_IPV4=m 178CONFIG_NFT_REDIR_IPV4=m
@@ -260,7 +260,9 @@ CONFIG_BATMAN_ADV_DAT=y
260CONFIG_BATMAN_ADV_NC=y 260CONFIG_BATMAN_ADV_NC=y
261CONFIG_BATMAN_ADV_MCAST=y 261CONFIG_BATMAN_ADV_MCAST=y
262CONFIG_NETLINK_DIAG=m 262CONFIG_NETLINK_DIAG=m
263CONFIG_MPLS=y
263CONFIG_NET_MPLS_GSO=m 264CONFIG_NET_MPLS_GSO=m
265CONFIG_MPLS_ROUTING=m
264# CONFIG_WIRELESS is not set 266# CONFIG_WIRELESS is not set
265# CONFIG_UEVENT_HELPER is not set 267# CONFIG_UEVENT_HELPER is not set
266CONFIG_DEVTMPFS=y 268CONFIG_DEVTMPFS=y
@@ -272,6 +274,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
272CONFIG_BLK_DEV_DRBD=m 274CONFIG_BLK_DEV_DRBD=m
273CONFIG_BLK_DEV_NBD=m 275CONFIG_BLK_DEV_NBD=m
274CONFIG_BLK_DEV_RAM=y 276CONFIG_BLK_DEV_RAM=y
277CONFIG_BLK_DEV_PMEM=m
275CONFIG_CDROM_PKTCDVD=m 278CONFIG_CDROM_PKTCDVD=m
276CONFIG_ATA_OVER_ETH=m 279CONFIG_ATA_OVER_ETH=m
277CONFIG_DUMMY_IRQ=m 280CONFIG_DUMMY_IRQ=m
@@ -302,6 +305,7 @@ CONFIG_DM_RAID=m
302CONFIG_DM_ZERO=m 305CONFIG_DM_ZERO=m
303CONFIG_DM_MULTIPATH=m 306CONFIG_DM_MULTIPATH=m
304CONFIG_DM_UEVENT=y 307CONFIG_DM_UEVENT=y
308CONFIG_DM_LOG_WRITES=m
305CONFIG_TARGET_CORE=m 309CONFIG_TARGET_CORE=m
306CONFIG_TCM_IBLOCK=m 310CONFIG_TCM_IBLOCK=m
307CONFIG_TCM_FILEIO=m 311CONFIG_TCM_FILEIO=m
@@ -324,6 +328,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
324CONFIG_VETH=m 328CONFIG_VETH=m
325CONFIG_SUN3LANCE=y 329CONFIG_SUN3LANCE=y
326# CONFIG_NET_VENDOR_ARC is not set 330# CONFIG_NET_VENDOR_ARC is not set
331# CONFIG_NET_CADENCE is not set
327CONFIG_SUN3_82586=y 332CONFIG_SUN3_82586=y
328# CONFIG_NET_VENDOR_MARVELL is not set 333# CONFIG_NET_VENDOR_MARVELL is not set
329# CONFIG_NET_VENDOR_MICREL is not set 334# CONFIG_NET_VENDOR_MICREL is not set
@@ -370,7 +375,6 @@ CONFIG_HID=m
370CONFIG_HIDRAW=y 375CONFIG_HIDRAW=y
371CONFIG_UHID=m 376CONFIG_UHID=m
372# CONFIG_HID_GENERIC is not set 377# CONFIG_HID_GENERIC is not set
373# CONFIG_HID_PLANTRONICS is not set
374# CONFIG_USB_SUPPORT is not set 378# CONFIG_USB_SUPPORT is not set
375CONFIG_RTC_CLASS=y 379CONFIG_RTC_CLASS=y
376CONFIG_RTC_DRV_GENERIC=m 380CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 73c36b7a0009..9902c5bfbdc8 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -170,9 +170,9 @@ CONFIG_IP_SET_HASH_NETPORT=m
170CONFIG_IP_SET_HASH_NETIFACE=m 170CONFIG_IP_SET_HASH_NETIFACE=m
171CONFIG_IP_SET_LIST_SET=m 171CONFIG_IP_SET_LIST_SET=m
172CONFIG_NF_CONNTRACK_IPV4=m 172CONFIG_NF_CONNTRACK_IPV4=m
173CONFIG_NF_LOG_ARP=m
174CONFIG_NFT_CHAIN_ROUTE_IPV4=m 173CONFIG_NFT_CHAIN_ROUTE_IPV4=m
175CONFIG_NF_TABLES_ARP=m 174CONFIG_NF_TABLES_ARP=m
175CONFIG_NF_LOG_ARP=m
176CONFIG_NFT_CHAIN_NAT_IPV4=m 176CONFIG_NFT_CHAIN_NAT_IPV4=m
177CONFIG_NFT_MASQ_IPV4=m 177CONFIG_NFT_MASQ_IPV4=m
178CONFIG_NFT_REDIR_IPV4=m 178CONFIG_NFT_REDIR_IPV4=m
@@ -260,7 +260,9 @@ CONFIG_BATMAN_ADV_DAT=y
260CONFIG_BATMAN_ADV_NC=y 260CONFIG_BATMAN_ADV_NC=y
261CONFIG_BATMAN_ADV_MCAST=y 261CONFIG_BATMAN_ADV_MCAST=y
262CONFIG_NETLINK_DIAG=m 262CONFIG_NETLINK_DIAG=m
263CONFIG_MPLS=y
263CONFIG_NET_MPLS_GSO=m 264CONFIG_NET_MPLS_GSO=m
265CONFIG_MPLS_ROUTING=m
264# CONFIG_WIRELESS is not set 266# CONFIG_WIRELESS is not set
265# CONFIG_UEVENT_HELPER is not set 267# CONFIG_UEVENT_HELPER is not set
266CONFIG_DEVTMPFS=y 268CONFIG_DEVTMPFS=y
@@ -272,6 +274,7 @@ CONFIG_BLK_DEV_CRYPTOLOOP=m
272CONFIG_BLK_DEV_DRBD=m 274CONFIG_BLK_DEV_DRBD=m
273CONFIG_BLK_DEV_NBD=m 275CONFIG_BLK_DEV_NBD=m
274CONFIG_BLK_DEV_RAM=y 276CONFIG_BLK_DEV_RAM=y
277CONFIG_BLK_DEV_PMEM=m
275CONFIG_CDROM_PKTCDVD=m 278CONFIG_CDROM_PKTCDVD=m
276CONFIG_ATA_OVER_ETH=m 279CONFIG_ATA_OVER_ETH=m
277CONFIG_DUMMY_IRQ=m 280CONFIG_DUMMY_IRQ=m
@@ -302,6 +305,7 @@ CONFIG_DM_RAID=m
302CONFIG_DM_ZERO=m 305CONFIG_DM_ZERO=m
303CONFIG_DM_MULTIPATH=m 306CONFIG_DM_MULTIPATH=m
304CONFIG_DM_UEVENT=y 307CONFIG_DM_UEVENT=y
308CONFIG_DM_LOG_WRITES=m
305CONFIG_TARGET_CORE=m 309CONFIG_TARGET_CORE=m
306CONFIG_TCM_IBLOCK=m 310CONFIG_TCM_IBLOCK=m
307CONFIG_TCM_FILEIO=m 311CONFIG_TCM_FILEIO=m
@@ -324,6 +328,7 @@ CONFIG_NETCONSOLE_DYNAMIC=y
324CONFIG_VETH=m 328CONFIG_VETH=m
325CONFIG_SUN3LANCE=y 329CONFIG_SUN3LANCE=y
326# CONFIG_NET_VENDOR_ARC is not set 330# CONFIG_NET_VENDOR_ARC is not set
331# CONFIG_NET_CADENCE is not set
327# CONFIG_NET_VENDOR_BROADCOM is not set 332# CONFIG_NET_VENDOR_BROADCOM is not set
328# CONFIG_NET_VENDOR_INTEL is not set 333# CONFIG_NET_VENDOR_INTEL is not set
329# CONFIG_NET_VENDOR_MARVELL is not set 334# CONFIG_NET_VENDOR_MARVELL is not set
@@ -370,7 +375,6 @@ CONFIG_HID=m
370CONFIG_HIDRAW=y 375CONFIG_HIDRAW=y
371CONFIG_UHID=m 376CONFIG_UHID=m
372# CONFIG_HID_GENERIC is not set 377# CONFIG_HID_GENERIC is not set
373# CONFIG_HID_PLANTRONICS is not set
374# CONFIG_USB_SUPPORT is not set 378# CONFIG_USB_SUPPORT is not set
375CONFIG_RTC_CLASS=y 379CONFIG_RTC_CLASS=y
376CONFIG_RTC_DRV_GENERIC=m 380CONFIG_RTC_DRV_GENERIC=m
diff --git a/arch/m68k/kernel/dma.c b/arch/m68k/kernel/dma.c
index e546a5534dd4..564665f9af30 100644
--- a/arch/m68k/kernel/dma.c
+++ b/arch/m68k/kernel/dma.c
@@ -120,13 +120,16 @@ void dma_sync_single_for_device(struct device *dev, dma_addr_t handle,
120} 120}
121EXPORT_SYMBOL(dma_sync_single_for_device); 121EXPORT_SYMBOL(dma_sync_single_for_device);
122 122
123void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nents, 123void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sglist,
124 enum dma_data_direction dir) 124 int nents, enum dma_data_direction dir)
125{ 125{
126 int i; 126 int i;
127 struct scatterlist *sg;
127 128
128 for (i = 0; i < nents; sg++, i++) 129 for_each_sg(sglist, sg, nents, i) {
129 dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir); 130 dma_sync_single_for_device(dev, sg->dma_address, sg->length,
131 dir);
132 }
130} 133}
131EXPORT_SYMBOL(dma_sync_sg_for_device); 134EXPORT_SYMBOL(dma_sync_sg_for_device);
132 135
@@ -151,14 +154,16 @@ dma_addr_t dma_map_page(struct device *dev, struct page *page,
151} 154}
152EXPORT_SYMBOL(dma_map_page); 155EXPORT_SYMBOL(dma_map_page);
153 156
154int dma_map_sg(struct device *dev, struct scatterlist *sg, int nents, 157int dma_map_sg(struct device *dev, struct scatterlist *sglist, int nents,
155 enum dma_data_direction dir) 158 enum dma_data_direction dir)
156{ 159{
157 int i; 160 int i;
161 struct scatterlist *sg;
158 162
159 for (i = 0; i < nents; sg++, i++) { 163 for_each_sg(sglist, sg, nents, i) {
160 sg->dma_address = sg_phys(sg); 164 sg->dma_address = sg_phys(sg);
161 dma_sync_single_for_device(dev, sg->dma_address, sg->length, dir); 165 dma_sync_single_for_device(dev, sg->dma_address, sg->length,
166 dir);
162 } 167 }
163 return nents; 168 return nents;
164} 169}
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-31 21:06:50 -0400