aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-02-16 10:13:53 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2016-02-16 10:13:53 -0500
commit2a4be2c52556ded8df08904f4032aed98654a017 (patch)
tree2e38becf083b43b6d3d8e93007a604aa8368e46a
parent1926e54f115725a9248d0c4c65c22acaf94de4c4 (diff)
parentdaf670bc9d36ba8b03e010f4bf798bebe08659fe (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k fixes from Geert Uytterhoeven: "Summary: - Wire up new copy_file_range syscall - Update defconfigs" * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/defconfig: Update defconfigs for v4.5-rc1 m68k: Wire up copy_file_range
Diffstat
-rw-r--r--arch/m68k/configs/amiga_defconfig9
-rw-r--r--arch/m68k/configs/apollo_defconfig9
-rw-r--r--arch/m68k/configs/atari_defconfig9
-rw-r--r--arch/m68k/configs/bvme6000_defconfig9
-rw-r--r--arch/m68k/configs/hp300_defconfig9
-rw-r--r--arch/m68k/configs/mac_defconfig9
-rw-r--r--arch/m68k/configs/multi_defconfig9
-rw-r--r--arch/m68k/configs/mvme147_defconfig9
-rw-r--r--arch/m68k/configs/mvme16x_defconfig9
-rw-r--r--arch/m68k/configs/q40_defconfig9
-rw-r--r--arch/m68k/configs/sun3_defconfig9
-rw-r--r--arch/m68k/configs/sun3x_defconfig9
-rw-r--r--arch/m68k/include/asm/unistd.h2
-rw-r--r--arch/m68k/include/uapi/asm/unistd.h1
-rw-r--r--arch/m68k/kernel/syscalltable.S1
15 files changed, 111 insertions, 1 deletions
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index fc96e814188e..d1fc4796025e 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -108,6 +108,8 @@ CONFIG_NFT_NAT=m
108CONFIG_NFT_QUEUE=m 108CONFIG_NFT_QUEUE=m
109CONFIG_NFT_REJECT=m 109CONFIG_NFT_REJECT=m
110CONFIG_NFT_COMPAT=m 110CONFIG_NFT_COMPAT=m
111CONFIG_NFT_DUP_NETDEV=m
112CONFIG_NFT_FWD_NETDEV=m
111CONFIG_NETFILTER_XT_SET=m 113CONFIG_NETFILTER_XT_SET=m
112CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 114CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
113CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 115CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -266,6 +268,12 @@ CONFIG_L2TP=m
266CONFIG_BRIDGE=m 268CONFIG_BRIDGE=m
267CONFIG_ATALK=m 269CONFIG_ATALK=m
268CONFIG_6LOWPAN=m 270CONFIG_6LOWPAN=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
272CONFIG_6LOWPAN_GHC_UDP=m
273CONFIG_6LOWPAN_GHC_ICMPV6=m
274CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
275CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
276CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
269CONFIG_DNS_RESOLVER=y 277CONFIG_DNS_RESOLVER=y
270CONFIG_BATMAN_ADV=m 278CONFIG_BATMAN_ADV=m
271CONFIG_BATMAN_ADV_DAT=y 279CONFIG_BATMAN_ADV_DAT=y
@@ -366,6 +374,7 @@ CONFIG_ARIADNE=y
366# CONFIG_NET_VENDOR_INTEL is not set 374# CONFIG_NET_VENDOR_INTEL is not set
367# CONFIG_NET_VENDOR_MARVELL is not set 375# CONFIG_NET_VENDOR_MARVELL is not set
368# CONFIG_NET_VENDOR_MICREL is not set 376# CONFIG_NET_VENDOR_MICREL is not set
377# CONFIG_NET_VENDOR_NETRONOME is not set
369CONFIG_HYDRA=y 378CONFIG_HYDRA=y
370CONFIG_APNE=y 379CONFIG_APNE=y
371CONFIG_ZORRO8390=y 380CONFIG_ZORRO8390=y
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index 05c904f08d9d..9bfe8be3658c 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m
106CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_REJECT=m 107CONFIG_NFT_REJECT=m
108CONFIG_NFT_COMPAT=m 108CONFIG_NFT_COMPAT=m
109CONFIG_NFT_DUP_NETDEV=m
110CONFIG_NFT_FWD_NETDEV=m
109CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 112CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 113CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m
264CONFIG_BRIDGE=m 266CONFIG_BRIDGE=m
265CONFIG_ATALK=m 267CONFIG_ATALK=m
266CONFIG_6LOWPAN=m 268CONFIG_6LOWPAN=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
270CONFIG_6LOWPAN_GHC_UDP=m
271CONFIG_6LOWPAN_GHC_ICMPV6=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
273CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
274CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
267CONFIG_DNS_RESOLVER=y 275CONFIG_DNS_RESOLVER=y
268CONFIG_BATMAN_ADV=m 276CONFIG_BATMAN_ADV=m
269CONFIG_BATMAN_ADV_DAT=y 277CONFIG_BATMAN_ADV_DAT=y
@@ -344,6 +352,7 @@ CONFIG_VETH=m
344# CONFIG_NET_VENDOR_MARVELL is not set 352# CONFIG_NET_VENDOR_MARVELL is not set
345# CONFIG_NET_VENDOR_MICREL is not set 353# CONFIG_NET_VENDOR_MICREL is not set
346# CONFIG_NET_VENDOR_NATSEMI is not set 354# CONFIG_NET_VENDOR_NATSEMI is not set
355# CONFIG_NET_VENDOR_NETRONOME is not set
347# CONFIG_NET_VENDOR_QUALCOMM is not set 356# CONFIG_NET_VENDOR_QUALCOMM is not set
348# CONFIG_NET_VENDOR_RENESAS is not set 357# CONFIG_NET_VENDOR_RENESAS is not set
349# CONFIG_NET_VENDOR_ROCKER is not set 358# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index d572b731c510..ebdcfae55580 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m
106CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_REJECT=m 107CONFIG_NFT_REJECT=m
108CONFIG_NFT_COMPAT=m 108CONFIG_NFT_COMPAT=m
109CONFIG_NFT_DUP_NETDEV=m
110CONFIG_NFT_FWD_NETDEV=m
109CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 112CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 113CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m
264CONFIG_BRIDGE=m 266CONFIG_BRIDGE=m
265CONFIG_ATALK=m 267CONFIG_ATALK=m
266CONFIG_6LOWPAN=m 268CONFIG_6LOWPAN=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
270CONFIG_6LOWPAN_GHC_UDP=m
271CONFIG_6LOWPAN_GHC_ICMPV6=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
273CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
274CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
267CONFIG_DNS_RESOLVER=y 275CONFIG_DNS_RESOLVER=y
268CONFIG_BATMAN_ADV=m 276CONFIG_BATMAN_ADV=m
269CONFIG_BATMAN_ADV_DAT=y 277CONFIG_BATMAN_ADV_DAT=y
@@ -353,6 +361,7 @@ CONFIG_ATARILANCE=y
353# CONFIG_NET_VENDOR_INTEL is not set 361# CONFIG_NET_VENDOR_INTEL is not set
354# CONFIG_NET_VENDOR_MARVELL is not set 362# CONFIG_NET_VENDOR_MARVELL is not set
355# CONFIG_NET_VENDOR_MICREL is not set 363# CONFIG_NET_VENDOR_MICREL is not set
364# CONFIG_NET_VENDOR_NETRONOME is not set
356CONFIG_NE2000=y 365CONFIG_NE2000=y
357# CONFIG_NET_VENDOR_QUALCOMM is not set 366# CONFIG_NET_VENDOR_QUALCOMM is not set
358# CONFIG_NET_VENDOR_RENESAS is not set 367# CONFIG_NET_VENDOR_RENESAS is not set
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 11a30c65ad44..8acc65e54995 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m
104CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_REJECT=m 105CONFIG_NFT_REJECT=m
106CONFIG_NFT_COMPAT=m 106CONFIG_NFT_COMPAT=m
107CONFIG_NFT_DUP_NETDEV=m
108CONFIG_NFT_FWD_NETDEV=m
107CONFIG_NETFILTER_XT_SET=m 109CONFIG_NETFILTER_XT_SET=m
108CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
109CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -262,6 +264,12 @@ CONFIG_L2TP=m
262CONFIG_BRIDGE=m 264CONFIG_BRIDGE=m
263CONFIG_ATALK=m 265CONFIG_ATALK=m
264CONFIG_6LOWPAN=m 266CONFIG_6LOWPAN=m
267CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
268CONFIG_6LOWPAN_GHC_UDP=m
269CONFIG_6LOWPAN_GHC_ICMPV6=m
270CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
265CONFIG_DNS_RESOLVER=y 273CONFIG_DNS_RESOLVER=y
266CONFIG_BATMAN_ADV=m 274CONFIG_BATMAN_ADV=m
267CONFIG_BATMAN_ADV_DAT=y 275CONFIG_BATMAN_ADV_DAT=y
@@ -343,6 +351,7 @@ CONFIG_BVME6000_NET=y
343# CONFIG_NET_VENDOR_MARVELL is not set 351# CONFIG_NET_VENDOR_MARVELL is not set
344# CONFIG_NET_VENDOR_MICREL is not set 352# CONFIG_NET_VENDOR_MICREL is not set
345# CONFIG_NET_VENDOR_NATSEMI is not set 353# CONFIG_NET_VENDOR_NATSEMI is not set
354# CONFIG_NET_VENDOR_NETRONOME is not set
346# CONFIG_NET_VENDOR_QUALCOMM is not set 355# CONFIG_NET_VENDOR_QUALCOMM is not set
347# CONFIG_NET_VENDOR_RENESAS is not set 356# CONFIG_NET_VENDOR_RENESAS is not set
348# CONFIG_NET_VENDOR_ROCKER is not set 357# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 6630a5154b9d..0c6a3d52b26e 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -106,6 +106,8 @@ CONFIG_NFT_NAT=m
106CONFIG_NFT_QUEUE=m 106CONFIG_NFT_QUEUE=m
107CONFIG_NFT_REJECT=m 107CONFIG_NFT_REJECT=m
108CONFIG_NFT_COMPAT=m 108CONFIG_NFT_COMPAT=m
109CONFIG_NFT_DUP_NETDEV=m
110CONFIG_NFT_FWD_NETDEV=m
109CONFIG_NETFILTER_XT_SET=m 111CONFIG_NETFILTER_XT_SET=m
110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 112CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 113CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -264,6 +266,12 @@ CONFIG_L2TP=m
264CONFIG_BRIDGE=m 266CONFIG_BRIDGE=m
265CONFIG_ATALK=m 267CONFIG_ATALK=m
266CONFIG_6LOWPAN=m 268CONFIG_6LOWPAN=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
270CONFIG_6LOWPAN_GHC_UDP=m
271CONFIG_6LOWPAN_GHC_ICMPV6=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
273CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
274CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
267CONFIG_DNS_RESOLVER=y 275CONFIG_DNS_RESOLVER=y
268CONFIG_BATMAN_ADV=m 276CONFIG_BATMAN_ADV=m
269CONFIG_BATMAN_ADV_DAT=y 277CONFIG_BATMAN_ADV_DAT=y
@@ -345,6 +353,7 @@ CONFIG_HPLANCE=y
345# CONFIG_NET_VENDOR_MARVELL is not set 353# CONFIG_NET_VENDOR_MARVELL is not set
346# CONFIG_NET_VENDOR_MICREL is not set 354# CONFIG_NET_VENDOR_MICREL is not set
347# CONFIG_NET_VENDOR_NATSEMI is not set 355# CONFIG_NET_VENDOR_NATSEMI is not set
356# CONFIG_NET_VENDOR_NETRONOME is not set
348# CONFIG_NET_VENDOR_QUALCOMM is not set 357# CONFIG_NET_VENDOR_QUALCOMM is not set
349# CONFIG_NET_VENDOR_RENESAS is not set 358# CONFIG_NET_VENDOR_RENESAS is not set
350# CONFIG_NET_VENDOR_ROCKER is not set 359# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 1d90b71d0903..12a8a6cb32f4 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -105,6 +105,8 @@ CONFIG_NFT_NAT=m
105CONFIG_NFT_QUEUE=m 105CONFIG_NFT_QUEUE=m
106CONFIG_NFT_REJECT=m 106CONFIG_NFT_REJECT=m
107CONFIG_NFT_COMPAT=m 107CONFIG_NFT_COMPAT=m
108CONFIG_NFT_DUP_NETDEV=m
109CONFIG_NFT_FWD_NETDEV=m
108CONFIG_NETFILTER_XT_SET=m 110CONFIG_NETFILTER_XT_SET=m
109CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 111CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
110CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 112CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -266,6 +268,12 @@ CONFIG_DEV_APPLETALK=m
266CONFIG_IPDDP=m 268CONFIG_IPDDP=m
267CONFIG_IPDDP_ENCAP=y 269CONFIG_IPDDP_ENCAP=y
268CONFIG_6LOWPAN=m 270CONFIG_6LOWPAN=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
272CONFIG_6LOWPAN_GHC_UDP=m
273CONFIG_6LOWPAN_GHC_ICMPV6=m
274CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
275CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
276CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
269CONFIG_DNS_RESOLVER=y 277CONFIG_DNS_RESOLVER=y
270CONFIG_BATMAN_ADV=m 278CONFIG_BATMAN_ADV=m
271CONFIG_BATMAN_ADV_DAT=y 279CONFIG_BATMAN_ADV_DAT=y
@@ -362,6 +370,7 @@ CONFIG_MAC89x0=y
362# CONFIG_NET_VENDOR_MARVELL is not set 370# CONFIG_NET_VENDOR_MARVELL is not set
363# CONFIG_NET_VENDOR_MICREL is not set 371# CONFIG_NET_VENDOR_MICREL is not set
364CONFIG_MACSONIC=y 372CONFIG_MACSONIC=y
373# CONFIG_NET_VENDOR_NETRONOME is not set
365CONFIG_MAC8390=y 374CONFIG_MAC8390=y
366# CONFIG_NET_VENDOR_QUALCOMM is not set 375# CONFIG_NET_VENDOR_QUALCOMM is not set
367# CONFIG_NET_VENDOR_RENESAS is not set 376# CONFIG_NET_VENDOR_RENESAS is not set
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 1fd21c1ca87f..64ff2dcb34c8 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -115,6 +115,8 @@ CONFIG_NFT_NAT=m
115CONFIG_NFT_QUEUE=m 115CONFIG_NFT_QUEUE=m
116CONFIG_NFT_REJECT=m 116CONFIG_NFT_REJECT=m
117CONFIG_NFT_COMPAT=m 117CONFIG_NFT_COMPAT=m
118CONFIG_NFT_DUP_NETDEV=m
119CONFIG_NFT_FWD_NETDEV=m
118CONFIG_NETFILTER_XT_SET=m 120CONFIG_NETFILTER_XT_SET=m
119CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 121CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
120CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 122CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -276,6 +278,12 @@ CONFIG_DEV_APPLETALK=m
276CONFIG_IPDDP=m 278CONFIG_IPDDP=m
277CONFIG_IPDDP_ENCAP=y 279CONFIG_IPDDP_ENCAP=y
278CONFIG_6LOWPAN=m 280CONFIG_6LOWPAN=m
281CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
282CONFIG_6LOWPAN_GHC_UDP=m
283CONFIG_6LOWPAN_GHC_ICMPV6=m
284CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
285CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
286CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
279CONFIG_DNS_RESOLVER=y 287CONFIG_DNS_RESOLVER=y
280CONFIG_BATMAN_ADV=m 288CONFIG_BATMAN_ADV=m
281CONFIG_BATMAN_ADV_DAT=y 289CONFIG_BATMAN_ADV_DAT=y
@@ -404,6 +412,7 @@ CONFIG_MVME16x_NET=y
404# CONFIG_NET_VENDOR_MARVELL is not set 412# CONFIG_NET_VENDOR_MARVELL is not set
405# CONFIG_NET_VENDOR_MICREL is not set 413# CONFIG_NET_VENDOR_MICREL is not set
406CONFIG_MACSONIC=y 414CONFIG_MACSONIC=y
415# CONFIG_NET_VENDOR_NETRONOME is not set
407CONFIG_HYDRA=y 416CONFIG_HYDRA=y
408CONFIG_MAC8390=y 417CONFIG_MAC8390=y
409CONFIG_NE2000=y 418CONFIG_NE2000=y
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 74e10f79d7b1..07fc6abcfe0c 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -103,6 +103,8 @@ CONFIG_NFT_NAT=m
103CONFIG_NFT_QUEUE=m 103CONFIG_NFT_QUEUE=m
104CONFIG_NFT_REJECT=m 104CONFIG_NFT_REJECT=m
105CONFIG_NFT_COMPAT=m 105CONFIG_NFT_COMPAT=m
106CONFIG_NFT_DUP_NETDEV=m
107CONFIG_NFT_FWD_NETDEV=m
106CONFIG_NETFILTER_XT_SET=m 108CONFIG_NETFILTER_XT_SET=m
107CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 109CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
108CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 110CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -261,6 +263,12 @@ CONFIG_L2TP=m
261CONFIG_BRIDGE=m 263CONFIG_BRIDGE=m
262CONFIG_ATALK=m 264CONFIG_ATALK=m
263CONFIG_6LOWPAN=m 265CONFIG_6LOWPAN=m
266CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
267CONFIG_6LOWPAN_GHC_UDP=m
268CONFIG_6LOWPAN_GHC_ICMPV6=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
270CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
264CONFIG_DNS_RESOLVER=y 272CONFIG_DNS_RESOLVER=y
265CONFIG_BATMAN_ADV=m 273CONFIG_BATMAN_ADV=m
266CONFIG_BATMAN_ADV_DAT=y 274CONFIG_BATMAN_ADV_DAT=y
@@ -343,6 +351,7 @@ CONFIG_MVME147_NET=y
343# CONFIG_NET_VENDOR_MARVELL is not set 351# CONFIG_NET_VENDOR_MARVELL is not set
344# CONFIG_NET_VENDOR_MICREL is not set 352# CONFIG_NET_VENDOR_MICREL is not set
345# CONFIG_NET_VENDOR_NATSEMI is not set 353# CONFIG_NET_VENDOR_NATSEMI is not set
354# CONFIG_NET_VENDOR_NETRONOME is not set
346# CONFIG_NET_VENDOR_QUALCOMM is not set 355# CONFIG_NET_VENDOR_QUALCOMM is not set
347# CONFIG_NET_VENDOR_RENESAS is not set 356# CONFIG_NET_VENDOR_RENESAS is not set
348# CONFIG_NET_VENDOR_ROCKER is not set 357# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 7034e716f166..69903ded88f7 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m
104CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_REJECT=m 105CONFIG_NFT_REJECT=m
106CONFIG_NFT_COMPAT=m 106CONFIG_NFT_COMPAT=m
107CONFIG_NFT_DUP_NETDEV=m
108CONFIG_NFT_FWD_NETDEV=m
107CONFIG_NETFILTER_XT_SET=m 109CONFIG_NETFILTER_XT_SET=m
108CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
109CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -262,6 +264,12 @@ CONFIG_L2TP=m
262CONFIG_BRIDGE=m 264CONFIG_BRIDGE=m
263CONFIG_ATALK=m 265CONFIG_ATALK=m
264CONFIG_6LOWPAN=m 266CONFIG_6LOWPAN=m
267CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
268CONFIG_6LOWPAN_GHC_UDP=m
269CONFIG_6LOWPAN_GHC_ICMPV6=m
270CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
265CONFIG_DNS_RESOLVER=y 273CONFIG_DNS_RESOLVER=y
266CONFIG_BATMAN_ADV=m 274CONFIG_BATMAN_ADV=m
267CONFIG_BATMAN_ADV_DAT=y 275CONFIG_BATMAN_ADV_DAT=y
@@ -343,6 +351,7 @@ CONFIG_MVME16x_NET=y
343# CONFIG_NET_VENDOR_MARVELL is not set 351# CONFIG_NET_VENDOR_MARVELL is not set
344# CONFIG_NET_VENDOR_MICREL is not set 352# CONFIG_NET_VENDOR_MICREL is not set
345# CONFIG_NET_VENDOR_NATSEMI is not set 353# CONFIG_NET_VENDOR_NATSEMI is not set
354# CONFIG_NET_VENDOR_NETRONOME is not set
346# CONFIG_NET_VENDOR_QUALCOMM is not set 355# CONFIG_NET_VENDOR_QUALCOMM is not set
347# CONFIG_NET_VENDOR_RENESAS is not set 356# CONFIG_NET_VENDOR_RENESAS is not set
348# CONFIG_NET_VENDOR_ROCKER is not set 357# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index f7deb5f702a6..bd8401686dde 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -104,6 +104,8 @@ CONFIG_NFT_NAT=m
104CONFIG_NFT_QUEUE=m 104CONFIG_NFT_QUEUE=m
105CONFIG_NFT_REJECT=m 105CONFIG_NFT_REJECT=m
106CONFIG_NFT_COMPAT=m 106CONFIG_NFT_COMPAT=m
107CONFIG_NFT_DUP_NETDEV=m
108CONFIG_NFT_FWD_NETDEV=m
107CONFIG_NETFILTER_XT_SET=m 109CONFIG_NETFILTER_XT_SET=m
108CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 110CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
109CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 111CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -262,6 +264,12 @@ CONFIG_L2TP=m
262CONFIG_BRIDGE=m 264CONFIG_BRIDGE=m
263CONFIG_ATALK=m 265CONFIG_ATALK=m
264CONFIG_6LOWPAN=m 266CONFIG_6LOWPAN=m
267CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
268CONFIG_6LOWPAN_GHC_UDP=m
269CONFIG_6LOWPAN_GHC_ICMPV6=m
270CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
271CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
272CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
265CONFIG_DNS_RESOLVER=y 273CONFIG_DNS_RESOLVER=y
266CONFIG_BATMAN_ADV=m 274CONFIG_BATMAN_ADV=m
267CONFIG_BATMAN_ADV_DAT=y 275CONFIG_BATMAN_ADV_DAT=y
@@ -352,6 +360,7 @@ CONFIG_VETH=m
352# CONFIG_NET_VENDOR_INTEL is not set 360# CONFIG_NET_VENDOR_INTEL is not set
353# CONFIG_NET_VENDOR_MARVELL is not set 361# CONFIG_NET_VENDOR_MARVELL is not set
354# CONFIG_NET_VENDOR_MICREL is not set 362# CONFIG_NET_VENDOR_MICREL is not set
363# CONFIG_NET_VENDOR_NETRONOME is not set
355CONFIG_NE2000=y 364CONFIG_NE2000=y
356# CONFIG_NET_VENDOR_QUALCOMM is not set 365# CONFIG_NET_VENDOR_QUALCOMM is not set
357# CONFIG_NET_VENDOR_RENESAS is not set 366# CONFIG_NET_VENDOR_RENESAS is not set
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 0ce79eb0d805..5f9fb3ab9636 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -101,6 +101,8 @@ CONFIG_NFT_NAT=m
101CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
102CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
103CONFIG_NFT_COMPAT=m 103CONFIG_NFT_COMPAT=m
104CONFIG_NFT_DUP_NETDEV=m
105CONFIG_NFT_FWD_NETDEV=m
104CONFIG_NETFILTER_XT_SET=m 106CONFIG_NETFILTER_XT_SET=m
105CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 107CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
106CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 108CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -259,6 +261,12 @@ CONFIG_L2TP=m
259CONFIG_BRIDGE=m 261CONFIG_BRIDGE=m
260CONFIG_ATALK=m 262CONFIG_ATALK=m
261CONFIG_6LOWPAN=m 263CONFIG_6LOWPAN=m
264CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
265CONFIG_6LOWPAN_GHC_UDP=m
266CONFIG_6LOWPAN_GHC_ICMPV6=m
267CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
268CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
262CONFIG_DNS_RESOLVER=y 270CONFIG_DNS_RESOLVER=y
263CONFIG_BATMAN_ADV=m 271CONFIG_BATMAN_ADV=m
264CONFIG_BATMAN_ADV_DAT=y 272CONFIG_BATMAN_ADV_DAT=y
@@ -340,6 +348,7 @@ CONFIG_SUN3_82586=y
340# CONFIG_NET_VENDOR_MARVELL is not set 348# CONFIG_NET_VENDOR_MARVELL is not set
341# CONFIG_NET_VENDOR_MICREL is not set 349# CONFIG_NET_VENDOR_MICREL is not set
342# CONFIG_NET_VENDOR_NATSEMI is not set 350# CONFIG_NET_VENDOR_NATSEMI is not set
351# CONFIG_NET_VENDOR_NETRONOME is not set
343# CONFIG_NET_VENDOR_QUALCOMM is not set 352# CONFIG_NET_VENDOR_QUALCOMM is not set
344# CONFIG_NET_VENDOR_RENESAS is not set 353# CONFIG_NET_VENDOR_RENESAS is not set
345# CONFIG_NET_VENDOR_ROCKER is not set 354# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 4cb787e4991f..5d1c674530e2 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -101,6 +101,8 @@ CONFIG_NFT_NAT=m
101CONFIG_NFT_QUEUE=m 101CONFIG_NFT_QUEUE=m
102CONFIG_NFT_REJECT=m 102CONFIG_NFT_REJECT=m
103CONFIG_NFT_COMPAT=m 103CONFIG_NFT_COMPAT=m
104CONFIG_NFT_DUP_NETDEV=m
105CONFIG_NFT_FWD_NETDEV=m
104CONFIG_NETFILTER_XT_SET=m 106CONFIG_NETFILTER_XT_SET=m
105CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m 107CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m
106CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m 108CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m
@@ -259,6 +261,12 @@ CONFIG_L2TP=m
259CONFIG_BRIDGE=m 261CONFIG_BRIDGE=m
260CONFIG_ATALK=m 262CONFIG_ATALK=m
261CONFIG_6LOWPAN=m 263CONFIG_6LOWPAN=m
264CONFIG_6LOWPAN_GHC_EXT_HDR_HOP=m
265CONFIG_6LOWPAN_GHC_UDP=m
266CONFIG_6LOWPAN_GHC_ICMPV6=m
267CONFIG_6LOWPAN_GHC_EXT_HDR_DEST=m
268CONFIG_6LOWPAN_GHC_EXT_HDR_FRAG=m
269CONFIG_6LOWPAN_GHC_EXT_HDR_ROUTE=m
262CONFIG_DNS_RESOLVER=y 270CONFIG_DNS_RESOLVER=y
263CONFIG_BATMAN_ADV=m 271CONFIG_BATMAN_ADV=m
264CONFIG_BATMAN_ADV_DAT=y 272CONFIG_BATMAN_ADV_DAT=y
@@ -341,6 +349,7 @@ CONFIG_SUN3LANCE=y
341# CONFIG_NET_VENDOR_MARVELL is not set 349# CONFIG_NET_VENDOR_MARVELL is not set
342# CONFIG_NET_VENDOR_MICREL is not set 350# CONFIG_NET_VENDOR_MICREL is not set
343# CONFIG_NET_VENDOR_NATSEMI is not set 351# CONFIG_NET_VENDOR_NATSEMI is not set
352# CONFIG_NET_VENDOR_NETRONOME is not set
344# CONFIG_NET_VENDOR_QUALCOMM is not set 353# CONFIG_NET_VENDOR_QUALCOMM is not set
345# CONFIG_NET_VENDOR_RENESAS is not set 354# CONFIG_NET_VENDOR_RENESAS is not set
346# CONFIG_NET_VENDOR_ROCKER is not set 355# CONFIG_NET_VENDOR_ROCKER is not set
diff --git a/arch/m68k/include/asm/unistd.h b/arch/m68k/include/asm/unistd.h
index f9d96bf86910..bafaff6dcd7b 100644
--- a/arch/m68k/include/asm/unistd.h
+++ b/arch/m68k/include/asm/unistd.h
@@ -4,7 +4,7 @@
4#include <uapi/asm/unistd.h> 4#include <uapi/asm/unistd.h>
5 5
6 6
7#define NR_syscalls 376 7#define NR_syscalls 377
8 8
9#define __ARCH_WANT_OLD_READDIR 9#define __ARCH_WANT_OLD_READDIR
10#define __ARCH_WANT_OLD_STAT 10#define __ARCH_WANT_OLD_STAT
diff --git a/arch/m68k/include/uapi/asm/unistd.h b/arch/m68k/include/uapi/asm/unistd.h
index 36cf129de663..0ca729665f29 100644
--- a/arch/m68k/include/uapi/asm/unistd.h
+++ b/arch/m68k/include/uapi/asm/unistd.h
@@ -381,5 +381,6 @@
381#define __NR_userfaultfd 373 381#define __NR_userfaultfd 373
382#define __NR_membarrier 374 382#define __NR_membarrier 374
383#define __NR_mlock2 375 383#define __NR_mlock2 375
384#define __NR_copy_file_range 376
384 385
385#endif /* _UAPI_ASM_M68K_UNISTD_H_ */ 386#endif /* _UAPI_ASM_M68K_UNISTD_H_ */
diff --git a/arch/m68k/kernel/syscalltable.S b/arch/m68k/kernel/syscalltable.S
index 282cd903f4c4..8bb94261ff97 100644
--- a/arch/m68k/kernel/syscalltable.S
+++ b/arch/m68k/kernel/syscalltable.S
@@ -396,3 +396,4 @@ ENTRY(sys_call_table)
396 .long sys_userfaultfd 396 .long sys_userfaultfd
397 .long sys_membarrier 397 .long sys_membarrier
398 .long sys_mlock2 /* 375 */ 398 .long sys_mlock2 /* 375 */
399 .long sys_copy_file_range
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-19 00:22:06 -0400