aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2016-07-22 23:39:08 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2016-07-22 23:39:08 -0400
commit23218843d92b77c99375609eb43e6e6b3d7f68c3 (patch)
tree7c919d116bfacb3846fc42ba7900f7a2255041e1
parent7825e0c42943e16535ece82f3787b6b94a6c1652 (diff)
parent6bd80f372371a7b3f5ff13e4e8a560066299c001 (diff)
Merge tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k upddates from Geert Uytterhoeven: - assorted spelling fixes - defconfig updates * tag 'm68k-for-v4.8-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k/defconfig: Update defconfigs for v4.7-rc2 m68k: Assorted spelling fixes
Diffstat
-rw-r--r--arch/m68k/coldfire/head.S2
-rw-r--r--arch/m68k/coldfire/m5272.c2
-rw-r--r--arch/m68k/coldfire/pci.c2
-rw-r--r--arch/m68k/configs/amiga_defconfig4
-rw-r--r--arch/m68k/configs/apollo_defconfig4
-rw-r--r--arch/m68k/configs/atari_defconfig4
-rw-r--r--arch/m68k/configs/bvme6000_defconfig4
-rw-r--r--arch/m68k/configs/hp300_defconfig4
-rw-r--r--arch/m68k/configs/mac_defconfig4
-rw-r--r--arch/m68k/configs/multi_defconfig4
-rw-r--r--arch/m68k/configs/mvme147_defconfig4
-rw-r--r--arch/m68k/configs/mvme16x_defconfig4
-rw-r--r--arch/m68k/configs/q40_defconfig4
-rw-r--r--arch/m68k/configs/sun3_defconfig4
-rw-r--r--arch/m68k/configs/sun3x_defconfig4
-rw-r--r--arch/m68k/ifpsp060/src/fpsp.S8
-rw-r--r--arch/m68k/ifpsp060/src/pfpsp.S4
-rw-r--r--arch/m68k/include/asm/dma.h2
-rw-r--r--arch/m68k/include/asm/m525xsim.h4
-rw-r--r--arch/m68k/include/asm/mcfmmu.h2
-rw-r--r--arch/m68k/include/asm/q40_master.h2
-rw-r--r--arch/m68k/mac/iop.c2
-rw-r--r--arch/m68k/math-emu/fp_decode.h2
23 files changed, 64 insertions, 16 deletions
diff --git a/arch/m68k/coldfire/head.S b/arch/m68k/coldfire/head.S
index fa31be297b85..73d92ea0ce65 100644
--- a/arch/m68k/coldfire/head.S
+++ b/arch/m68k/coldfire/head.S
@@ -288,7 +288,7 @@ _clear_bss:
288#endif 288#endif
289 289
290 /* 290 /*
291 * Assember start up done, start code proper. 291 * Assembler start up done, start code proper.
292 */ 292 */
293 jsr start_kernel /* start Linux kernel */ 293 jsr start_kernel /* start Linux kernel */
294 294
diff --git a/arch/m68k/coldfire/m5272.c b/arch/m68k/coldfire/m5272.c
index c525e4c08f84..9abb1a441da0 100644
--- a/arch/m68k/coldfire/m5272.c
+++ b/arch/m68k/coldfire/m5272.c
@@ -111,7 +111,7 @@ void __init config_BSP(char *commandp, int size)
111/***************************************************************************/ 111/***************************************************************************/
112 112
113/* 113/*
114 * Some 5272 based boards have the FEC ethernet diectly connected to 114 * Some 5272 based boards have the FEC ethernet directly connected to
115 * an ethernet switch. In this case we need to use the fixed phy type, 115 * an ethernet switch. In this case we need to use the fixed phy type,
116 * and we need to declare it early in boot. 116 * and we need to declare it early in boot.
117 */ 117 */
diff --git a/arch/m68k/coldfire/pci.c b/arch/m68k/coldfire/pci.c
index 821de928dc3f..6a640be48568 100644
--- a/arch/m68k/coldfire/pci.c
+++ b/arch/m68k/coldfire/pci.c
@@ -42,7 +42,7 @@ static unsigned long iospace;
42 42
43/* 43/*
44 * We need to be carefull probing on bus 0 (directly connected to host 44 * We need to be carefull probing on bus 0 (directly connected to host
45 * bridge). We should only acccess the well defined possible devices in 45 * bridge). We should only access the well defined possible devices in
46 * use, ignore aliases and the like. 46 * use, ignore aliases and the like.
47 */ 47 */
48static unsigned char mcf_host_slot2sid[32] = { 48static unsigned char mcf_host_slot2sid[32] = {
diff --git a/arch/m68k/configs/amiga_defconfig b/arch/m68k/configs/amiga_defconfig
index 3ee6976f6088..8f5b6f7dd136 100644
--- a/arch/m68k/configs/amiga_defconfig
+++ b/arch/m68k/configs/amiga_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -359,6 +360,7 @@ CONFIG_MACVTAP=m
359CONFIG_IPVLAN=m 360CONFIG_IPVLAN=m
360CONFIG_VXLAN=m 361CONFIG_VXLAN=m
361CONFIG_GENEVE=m 362CONFIG_GENEVE=m
363CONFIG_GTP=m
362CONFIG_MACSEC=m 364CONFIG_MACSEC=m
363CONFIG_NETCONSOLE=m 365CONFIG_NETCONSOLE=m
364CONFIG_NETCONSOLE_DYNAMIC=y 366CONFIG_NETCONSOLE_DYNAMIC=y
@@ -553,7 +555,9 @@ CONFIG_TEST_STRING_HELPERS=m
553CONFIG_TEST_KSTRTOX=m 555CONFIG_TEST_KSTRTOX=m
554CONFIG_TEST_PRINTF=m 556CONFIG_TEST_PRINTF=m
555CONFIG_TEST_BITMAP=m 557CONFIG_TEST_BITMAP=m
558CONFIG_TEST_UUID=m
556CONFIG_TEST_RHASHTABLE=m 559CONFIG_TEST_RHASHTABLE=m
560CONFIG_TEST_HASH=m
557CONFIG_TEST_LKM=m 561CONFIG_TEST_LKM=m
558CONFIG_TEST_USER_COPY=m 562CONFIG_TEST_USER_COPY=m
559CONFIG_TEST_BPF=m 563CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/apollo_defconfig b/arch/m68k/configs/apollo_defconfig
index e96787ffcbce..31bded9c83d4 100644
--- a/arch/m68k/configs/apollo_defconfig
+++ b/arch/m68k/configs/apollo_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -341,6 +342,7 @@ CONFIG_MACVTAP=m
341CONFIG_IPVLAN=m 342CONFIG_IPVLAN=m
342CONFIG_VXLAN=m 343CONFIG_VXLAN=m
343CONFIG_GENEVE=m 344CONFIG_GENEVE=m
345CONFIG_GTP=m
344CONFIG_MACSEC=m 346CONFIG_MACSEC=m
345CONFIG_NETCONSOLE=m 347CONFIG_NETCONSOLE=m
346CONFIG_NETCONSOLE_DYNAMIC=y 348CONFIG_NETCONSOLE_DYNAMIC=y
@@ -512,7 +514,9 @@ CONFIG_TEST_STRING_HELPERS=m
512CONFIG_TEST_KSTRTOX=m 514CONFIG_TEST_KSTRTOX=m
513CONFIG_TEST_PRINTF=m 515CONFIG_TEST_PRINTF=m
514CONFIG_TEST_BITMAP=m 516CONFIG_TEST_BITMAP=m
517CONFIG_TEST_UUID=m
515CONFIG_TEST_RHASHTABLE=m 518CONFIG_TEST_RHASHTABLE=m
519CONFIG_TEST_HASH=m
516CONFIG_TEST_LKM=m 520CONFIG_TEST_LKM=m
517CONFIG_TEST_USER_COPY=m 521CONFIG_TEST_USER_COPY=m
518CONFIG_TEST_BPF=m 522CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/atari_defconfig b/arch/m68k/configs/atari_defconfig
index 083fe6beac14..0d7739e04ae2 100644
--- a/arch/m68k/configs/atari_defconfig
+++ b/arch/m68k/configs/atari_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -350,6 +351,7 @@ CONFIG_MACVTAP=m
350CONFIG_IPVLAN=m 351CONFIG_IPVLAN=m
351CONFIG_VXLAN=m 352CONFIG_VXLAN=m
352CONFIG_GENEVE=m 353CONFIG_GENEVE=m
354CONFIG_GTP=m
353CONFIG_MACSEC=m 355CONFIG_MACSEC=m
354CONFIG_NETCONSOLE=m 356CONFIG_NETCONSOLE=m
355CONFIG_NETCONSOLE_DYNAMIC=y 357CONFIG_NETCONSOLE_DYNAMIC=y
@@ -533,7 +535,9 @@ CONFIG_TEST_STRING_HELPERS=m
533CONFIG_TEST_KSTRTOX=m 535CONFIG_TEST_KSTRTOX=m
534CONFIG_TEST_PRINTF=m 536CONFIG_TEST_PRINTF=m
535CONFIG_TEST_BITMAP=m 537CONFIG_TEST_BITMAP=m
538CONFIG_TEST_UUID=m
536CONFIG_TEST_RHASHTABLE=m 539CONFIG_TEST_RHASHTABLE=m
540CONFIG_TEST_HASH=m
537CONFIG_TEST_LKM=m 541CONFIG_TEST_LKM=m
538CONFIG_TEST_USER_COPY=m 542CONFIG_TEST_USER_COPY=m
539CONFIG_TEST_BPF=m 543CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/bvme6000_defconfig b/arch/m68k/configs/bvme6000_defconfig
index 475130c06dcb..2cbb5c465fec 100644
--- a/arch/m68k/configs/bvme6000_defconfig
+++ b/arch/m68k/configs/bvme6000_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -340,6 +341,7 @@ CONFIG_MACVTAP=m
340CONFIG_IPVLAN=m 341CONFIG_IPVLAN=m
341CONFIG_VXLAN=m 342CONFIG_VXLAN=m
342CONFIG_GENEVE=m 343CONFIG_GENEVE=m
344CONFIG_GTP=m
343CONFIG_MACSEC=m 345CONFIG_MACSEC=m
344CONFIG_NETCONSOLE=m 346CONFIG_NETCONSOLE=m
345CONFIG_NETCONSOLE_DYNAMIC=y 347CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504CONFIG_TEST_KSTRTOX=m 506CONFIG_TEST_KSTRTOX=m
505CONFIG_TEST_PRINTF=m 507CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m 508CONFIG_TEST_BITMAP=m
509CONFIG_TEST_UUID=m
507CONFIG_TEST_RHASHTABLE=m 510CONFIG_TEST_RHASHTABLE=m
511CONFIG_TEST_HASH=m
508CONFIG_TEST_LKM=m 512CONFIG_TEST_LKM=m
509CONFIG_TEST_USER_COPY=m 513CONFIG_TEST_USER_COPY=m
510CONFIG_TEST_BPF=m 514CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/hp300_defconfig b/arch/m68k/configs/hp300_defconfig
index 4339658c200f..96102a42c156 100644
--- a/arch/m68k/configs/hp300_defconfig
+++ b/arch/m68k/configs/hp300_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -341,6 +342,7 @@ CONFIG_MACVTAP=m
341CONFIG_IPVLAN=m 342CONFIG_IPVLAN=m
342CONFIG_VXLAN=m 343CONFIG_VXLAN=m
343CONFIG_GENEVE=m 344CONFIG_GENEVE=m
345CONFIG_GTP=m
344CONFIG_MACSEC=m 346CONFIG_MACSEC=m
345CONFIG_NETCONSOLE=m 347CONFIG_NETCONSOLE=m
346CONFIG_NETCONSOLE_DYNAMIC=y 348CONFIG_NETCONSOLE_DYNAMIC=y
@@ -514,7 +516,9 @@ CONFIG_TEST_STRING_HELPERS=m
514CONFIG_TEST_KSTRTOX=m 516CONFIG_TEST_KSTRTOX=m
515CONFIG_TEST_PRINTF=m 517CONFIG_TEST_PRINTF=m
516CONFIG_TEST_BITMAP=m 518CONFIG_TEST_BITMAP=m
519CONFIG_TEST_UUID=m
517CONFIG_TEST_RHASHTABLE=m 520CONFIG_TEST_RHASHTABLE=m
521CONFIG_TEST_HASH=m
518CONFIG_TEST_LKM=m 522CONFIG_TEST_LKM=m
519CONFIG_TEST_USER_COPY=m 523CONFIG_TEST_USER_COPY=m
520CONFIG_TEST_BPF=m 524CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/mac_defconfig b/arch/m68k/configs/mac_defconfig
index 831cc8c3a2e2..97d88f7dc5a7 100644
--- a/arch/m68k/configs/mac_defconfig
+++ b/arch/m68k/configs/mac_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -357,6 +358,7 @@ CONFIG_MACVTAP=m
357CONFIG_IPVLAN=m 358CONFIG_IPVLAN=m
358CONFIG_VXLAN=m 359CONFIG_VXLAN=m
359CONFIG_GENEVE=m 360CONFIG_GENEVE=m
361CONFIG_GTP=m
360CONFIG_MACSEC=m 362CONFIG_MACSEC=m
361CONFIG_NETCONSOLE=m 363CONFIG_NETCONSOLE=m
362CONFIG_NETCONSOLE_DYNAMIC=y 364CONFIG_NETCONSOLE_DYNAMIC=y
@@ -536,7 +538,9 @@ CONFIG_TEST_STRING_HELPERS=m
536CONFIG_TEST_KSTRTOX=m 538CONFIG_TEST_KSTRTOX=m
537CONFIG_TEST_PRINTF=m 539CONFIG_TEST_PRINTF=m
538CONFIG_TEST_BITMAP=m 540CONFIG_TEST_BITMAP=m
541CONFIG_TEST_UUID=m
539CONFIG_TEST_RHASHTABLE=m 542CONFIG_TEST_RHASHTABLE=m
543CONFIG_TEST_HASH=m
540CONFIG_TEST_LKM=m 544CONFIG_TEST_LKM=m
541CONFIG_TEST_USER_COPY=m 545CONFIG_TEST_USER_COPY=m
542CONFIG_TEST_BPF=m 546CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/multi_defconfig b/arch/m68k/configs/multi_defconfig
index 6377afeb522b..be25ef208f0f 100644
--- a/arch/m68k/configs/multi_defconfig
+++ b/arch/m68k/configs/multi_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -390,6 +391,7 @@ CONFIG_MACVTAP=m
390CONFIG_IPVLAN=m 391CONFIG_IPVLAN=m
391CONFIG_VXLAN=m 392CONFIG_VXLAN=m
392CONFIG_GENEVE=m 393CONFIG_GENEVE=m
394CONFIG_GTP=m
393CONFIG_MACSEC=m 395CONFIG_MACSEC=m
394CONFIG_NETCONSOLE=m 396CONFIG_NETCONSOLE=m
395CONFIG_NETCONSOLE_DYNAMIC=y 397CONFIG_NETCONSOLE_DYNAMIC=y
@@ -616,7 +618,9 @@ CONFIG_TEST_STRING_HELPERS=m
616CONFIG_TEST_KSTRTOX=m 618CONFIG_TEST_KSTRTOX=m
617CONFIG_TEST_PRINTF=m 619CONFIG_TEST_PRINTF=m
618CONFIG_TEST_BITMAP=m 620CONFIG_TEST_BITMAP=m
621CONFIG_TEST_UUID=m
619CONFIG_TEST_RHASHTABLE=m 622CONFIG_TEST_RHASHTABLE=m
623CONFIG_TEST_HASH=m
620CONFIG_TEST_LKM=m 624CONFIG_TEST_LKM=m
621CONFIG_TEST_USER_COPY=m 625CONFIG_TEST_USER_COPY=m
622CONFIG_TEST_BPF=m 626CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/mvme147_defconfig b/arch/m68k/configs/mvme147_defconfig
index 4304b3d56262..a008344360c9 100644
--- a/arch/m68k/configs/mvme147_defconfig
+++ b/arch/m68k/configs/mvme147_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -339,6 +340,7 @@ CONFIG_MACVTAP=m
339CONFIG_IPVLAN=m 340CONFIG_IPVLAN=m
340CONFIG_VXLAN=m 341CONFIG_VXLAN=m
341CONFIG_GENEVE=m 342CONFIG_GENEVE=m
343CONFIG_GTP=m
342CONFIG_MACSEC=m 344CONFIG_MACSEC=m
343CONFIG_NETCONSOLE=m 345CONFIG_NETCONSOLE=m
344CONFIG_NETCONSOLE_DYNAMIC=y 346CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504CONFIG_TEST_KSTRTOX=m 506CONFIG_TEST_KSTRTOX=m
505CONFIG_TEST_PRINTF=m 507CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m 508CONFIG_TEST_BITMAP=m
509CONFIG_TEST_UUID=m
507CONFIG_TEST_RHASHTABLE=m 510CONFIG_TEST_RHASHTABLE=m
511CONFIG_TEST_HASH=m
508CONFIG_TEST_LKM=m 512CONFIG_TEST_LKM=m
509CONFIG_TEST_USER_COPY=m 513CONFIG_TEST_USER_COPY=m
510CONFIG_TEST_BPF=m 514CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/mvme16x_defconfig b/arch/m68k/configs/mvme16x_defconfig
index 074bda4094ff..6735a25f36d4 100644
--- a/arch/m68k/configs/mvme16x_defconfig
+++ b/arch/m68k/configs/mvme16x_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -340,6 +341,7 @@ CONFIG_MACVTAP=m
340CONFIG_IPVLAN=m 341CONFIG_IPVLAN=m
341CONFIG_VXLAN=m 342CONFIG_VXLAN=m
342CONFIG_GENEVE=m 343CONFIG_GENEVE=m
344CONFIG_GTP=m
343CONFIG_MACSEC=m 345CONFIG_MACSEC=m
344CONFIG_NETCONSOLE=m 346CONFIG_NETCONSOLE=m
345CONFIG_NETCONSOLE_DYNAMIC=y 347CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504CONFIG_TEST_KSTRTOX=m 506CONFIG_TEST_KSTRTOX=m
505CONFIG_TEST_PRINTF=m 507CONFIG_TEST_PRINTF=m
506CONFIG_TEST_BITMAP=m 508CONFIG_TEST_BITMAP=m
509CONFIG_TEST_UUID=m
507CONFIG_TEST_RHASHTABLE=m 510CONFIG_TEST_RHASHTABLE=m
511CONFIG_TEST_HASH=m
508CONFIG_TEST_LKM=m 512CONFIG_TEST_LKM=m
509CONFIG_TEST_USER_COPY=m 513CONFIG_TEST_USER_COPY=m
510CONFIG_TEST_BPF=m 514CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/q40_defconfig b/arch/m68k/configs/q40_defconfig
index 07b9fa8d7f2e..780c6e9f6cf9 100644
--- a/arch/m68k/configs/q40_defconfig
+++ b/arch/m68k/configs/q40_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -346,6 +347,7 @@ CONFIG_MACVTAP=m
346CONFIG_IPVLAN=m 347CONFIG_IPVLAN=m
347CONFIG_VXLAN=m 348CONFIG_VXLAN=m
348CONFIG_GENEVE=m 349CONFIG_GENEVE=m
350CONFIG_GTP=m
349CONFIG_MACSEC=m 351CONFIG_MACSEC=m
350CONFIG_NETCONSOLE=m 352CONFIG_NETCONSOLE=m
351CONFIG_NETCONSOLE_DYNAMIC=y 353CONFIG_NETCONSOLE_DYNAMIC=y
@@ -527,7 +529,9 @@ CONFIG_TEST_STRING_HELPERS=m
527CONFIG_TEST_KSTRTOX=m 529CONFIG_TEST_KSTRTOX=m
528CONFIG_TEST_PRINTF=m 530CONFIG_TEST_PRINTF=m
529CONFIG_TEST_BITMAP=m 531CONFIG_TEST_BITMAP=m
532CONFIG_TEST_UUID=m
530CONFIG_TEST_RHASHTABLE=m 533CONFIG_TEST_RHASHTABLE=m
534CONFIG_TEST_HASH=m
531CONFIG_TEST_LKM=m 535CONFIG_TEST_LKM=m
532CONFIG_TEST_USER_COPY=m 536CONFIG_TEST_USER_COPY=m
533CONFIG_TEST_BPF=m 537CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/sun3_defconfig b/arch/m68k/configs/sun3_defconfig
index 36e6fae02d45..44693cf361e5 100644
--- a/arch/m68k/configs/sun3_defconfig
+++ b/arch/m68k/configs/sun3_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -337,6 +338,7 @@ CONFIG_MACVTAP=m
337CONFIG_IPVLAN=m 338CONFIG_IPVLAN=m
338CONFIG_VXLAN=m 339CONFIG_VXLAN=m
339CONFIG_GENEVE=m 340CONFIG_GENEVE=m
341CONFIG_GTP=m
340CONFIG_MACSEC=m 342CONFIG_MACSEC=m
341CONFIG_NETCONSOLE=m 343CONFIG_NETCONSOLE=m
342CONFIG_NETCONSOLE_DYNAMIC=y 344CONFIG_NETCONSOLE_DYNAMIC=y
@@ -506,7 +508,9 @@ CONFIG_TEST_STRING_HELPERS=m
506CONFIG_TEST_KSTRTOX=m 508CONFIG_TEST_KSTRTOX=m
507CONFIG_TEST_PRINTF=m 509CONFIG_TEST_PRINTF=m
508CONFIG_TEST_BITMAP=m 510CONFIG_TEST_BITMAP=m
511CONFIG_TEST_UUID=m
509CONFIG_TEST_RHASHTABLE=m 512CONFIG_TEST_RHASHTABLE=m
513CONFIG_TEST_HASH=m
510CONFIG_TEST_LKM=m 514CONFIG_TEST_LKM=m
511CONFIG_TEST_USER_COPY=m 515CONFIG_TEST_USER_COPY=m
512CONFIG_TEST_BPF=m 516CONFIG_TEST_BPF=m
diff --git a/arch/m68k/configs/sun3x_defconfig b/arch/m68k/configs/sun3x_defconfig
index 903acf929511..ef0071d61158 100644
--- a/arch/m68k/configs/sun3x_defconfig
+++ b/arch/m68k/configs/sun3x_defconfig
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
9# CONFIG_PID_NS is not set 9# CONFIG_PID_NS is not set
10# CONFIG_NET_NS is not set 10# CONFIG_NET_NS is not set
11CONFIG_BLK_DEV_INITRD=y 11CONFIG_BLK_DEV_INITRD=y
12CONFIG_CC_OPTIMIZE_FOR_SIZE=y
12CONFIG_USERFAULTFD=y 13CONFIG_USERFAULTFD=y
13CONFIG_SLAB=y 14CONFIG_SLAB=y
14CONFIG_MODULES=y 15CONFIG_MODULES=y
@@ -337,6 +338,7 @@ CONFIG_MACVTAP=m
337CONFIG_IPVLAN=m 338CONFIG_IPVLAN=m
338CONFIG_VXLAN=m 339CONFIG_VXLAN=m
339CONFIG_GENEVE=m 340CONFIG_GENEVE=m
341CONFIG_GTP=m
340CONFIG_MACSEC=m 342CONFIG_MACSEC=m
341CONFIG_NETCONSOLE=m 343CONFIG_NETCONSOLE=m
342CONFIG_NETCONSOLE_DYNAMIC=y 344CONFIG_NETCONSOLE_DYNAMIC=y
@@ -506,7 +508,9 @@ CONFIG_TEST_STRING_HELPERS=m
506CONFIG_TEST_KSTRTOX=m 508CONFIG_TEST_KSTRTOX=m
507CONFIG_TEST_PRINTF=m 509CONFIG_TEST_PRINTF=m
508CONFIG_TEST_BITMAP=m 510CONFIG_TEST_BITMAP=m
511CONFIG_TEST_UUID=m
509CONFIG_TEST_RHASHTABLE=m 512CONFIG_TEST_RHASHTABLE=m
513CONFIG_TEST_HASH=m
510CONFIG_TEST_LKM=m 514CONFIG_TEST_LKM=m
511CONFIG_TEST_USER_COPY=m 515CONFIG_TEST_USER_COPY=m
512CONFIG_TEST_BPF=m 516CONFIG_TEST_BPF=m
diff --git a/arch/m68k/ifpsp060/src/fpsp.S b/arch/m68k/ifpsp060/src/fpsp.S
index 78cb60f5bb4d..9bbffebe3eb5 100644
--- a/arch/m68k/ifpsp060/src/fpsp.S
+++ b/arch/m68k/ifpsp060/src/fpsp.S
@@ -10191,7 +10191,7 @@ xdnrm_con:
10191xdnrm_sd: 10191xdnrm_sd:
10192 mov.l %a1,-(%sp) 10192 mov.l %a1,-(%sp)
10193 tst.b LOCAL_EX(%a0) # is denorm pos or neg? 10193 tst.b LOCAL_EX(%a0) # is denorm pos or neg?
10194 smi.b %d1 # set d0 accodingly 10194 smi.b %d1 # set d0 accordingly
10195 bsr.l unf_sub 10195 bsr.l unf_sub
10196 mov.l (%sp)+,%a1 10196 mov.l (%sp)+,%a1
10197xdnrm_exit: 10197xdnrm_exit:
@@ -10990,7 +10990,7 @@ src_qnan_m:
10990# routines where an instruction is selected by an index into 10990# routines where an instruction is selected by an index into
10991# a large jump table corresponding to a given instruction which 10991# a large jump table corresponding to a given instruction which
10992# has been decoded. Flow continues here where we now decode 10992# has been decoded. Flow continues here where we now decode
10993# further accoding to the source operand type. 10993# further according to the source operand type.
10994# 10994#
10995 10995
10996 global fsinh 10996 global fsinh
@@ -23196,14 +23196,14 @@ m_sign:
23196# 23196#
23197# 1. Branch on the sign of the adjusted exponent. 23197# 1. Branch on the sign of the adjusted exponent.
23198# 2p.(positive exp) 23198# 2p.(positive exp)
23199# 2. Check M16 and the digits in lwords 2 and 3 in decending order. 23199# 2. Check M16 and the digits in lwords 2 and 3 in descending order.
23200# 3. Add one for each zero encountered until a non-zero digit. 23200# 3. Add one for each zero encountered until a non-zero digit.
23201# 4. Subtract the count from the exp. 23201# 4. Subtract the count from the exp.
23202# 5. Check if the exp has crossed zero in #3 above; make the exp abs 23202# 5. Check if the exp has crossed zero in #3 above; make the exp abs
23203# and set SE. 23203# and set SE.
23204# 6. Multiply the mantissa by 10**count. 23204# 6. Multiply the mantissa by 10**count.
23205# 2n.(negative exp) 23205# 2n.(negative exp)
23206# 2. Check the digits in lwords 3 and 2 in decending order. 23206# 2. Check the digits in lwords 3 and 2 in descending order.
23207# 3. Add one for each zero encountered until a non-zero digit. 23207# 3. Add one for each zero encountered until a non-zero digit.
23208# 4. Add the count to the exp. 23208# 4. Add the count to the exp.
23209# 5. Check if the exp has crossed zero in #3 above; clear SE. 23209# 5. Check if the exp has crossed zero in #3 above; clear SE.
diff --git a/arch/m68k/ifpsp060/src/pfpsp.S b/arch/m68k/ifpsp060/src/pfpsp.S
index 4aedef973cf6..3535e6c87eec 100644
--- a/arch/m68k/ifpsp060/src/pfpsp.S
+++ b/arch/m68k/ifpsp060/src/pfpsp.S
@@ -13156,14 +13156,14 @@ m_sign:
13156# 13156#
13157# 1. Branch on the sign of the adjusted exponent. 13157# 1. Branch on the sign of the adjusted exponent.
13158# 2p.(positive exp) 13158# 2p.(positive exp)
13159# 2. Check M16 and the digits in lwords 2 and 3 in decending order. 13159# 2. Check M16 and the digits in lwords 2 and 3 in descending order.
13160# 3. Add one for each zero encountered until a non-zero digit. 13160# 3. Add one for each zero encountered until a non-zero digit.
13161# 4. Subtract the count from the exp. 13161# 4. Subtract the count from the exp.
13162# 5. Check if the exp has crossed zero in #3 above; make the exp abs 13162# 5. Check if the exp has crossed zero in #3 above; make the exp abs
13163# and set SE. 13163# and set SE.
13164# 6. Multiply the mantissa by 10**count. 13164# 6. Multiply the mantissa by 10**count.
13165# 2n.(negative exp) 13165# 2n.(negative exp)
13166# 2. Check the digits in lwords 3 and 2 in decending order. 13166# 2. Check the digits in lwords 3 and 2 in descending order.
13167# 3. Add one for each zero encountered until a non-zero digit. 13167# 3. Add one for each zero encountered until a non-zero digit.
13168# 4. Add the count to the exp. 13168# 4. Add the count to the exp.
13169# 5. Check if the exp has crossed zero in #3 above; clear SE. 13169# 5. Check if the exp has crossed zero in #3 above; clear SE.
diff --git a/arch/m68k/include/asm/dma.h b/arch/m68k/include/asm/dma.h
index 429fe26e320c..208b4daa14b3 100644
--- a/arch/m68k/include/asm/dma.h
+++ b/arch/m68k/include/asm/dma.h
@@ -18,7 +18,7 @@
18 * AUG/22/2000 : added support for 32-bit Dual-Address-Mode (K) 2000 18 * AUG/22/2000 : added support for 32-bit Dual-Address-Mode (K) 2000
19 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de) 19 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de)
20 * 20 *
21 * AUG/25/2000 : addad support for 8, 16 and 32-bit Single-Address-Mode (K)2000 21 * AUG/25/2000 : added support for 8, 16 and 32-bit Single-Address-Mode (K)2000
22 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de) 22 * Oliver Kamphenkel (O.Kamphenkel@tu-bs.de)
23 * 23 *
24 * APR/18/2002 : added proper support for MCF5272 DMA controller. 24 * APR/18/2002 : added proper support for MCF5272 DMA controller.
diff --git a/arch/m68k/include/asm/m525xsim.h b/arch/m68k/include/asm/m525xsim.h
index f186459072e9..699f20c8a0fe 100644
--- a/arch/m68k/include/asm/m525xsim.h
+++ b/arch/m68k/include/asm/m525xsim.h
@@ -123,10 +123,10 @@
123/* 123/*
124 * I2C module. 124 * I2C module.
125 */ 125 */
126#define MCFI2C_BASE0 (MCF_MBAR + 0x280) /* Base addreess I2C0 */ 126#define MCFI2C_BASE0 (MCF_MBAR + 0x280) /* Base address I2C0 */
127#define MCFI2C_SIZE0 0x20 /* Register set size */ 127#define MCFI2C_SIZE0 0x20 /* Register set size */
128 128
129#define MCFI2C_BASE1 (MCF_MBAR2 + 0x440) /* Base addreess I2C1 */ 129#define MCFI2C_BASE1 (MCF_MBAR2 + 0x440) /* Base address I2C1 */
130#define MCFI2C_SIZE1 0x20 /* Register set size */ 130#define MCFI2C_SIZE1 0x20 /* Register set size */
131 131
132/* 132/*
diff --git a/arch/m68k/include/asm/mcfmmu.h b/arch/m68k/include/asm/mcfmmu.h
index 26cc3d5a63f8..8824236e303f 100644
--- a/arch/m68k/include/asm/mcfmmu.h
+++ b/arch/m68k/include/asm/mcfmmu.h
@@ -38,7 +38,7 @@
38/* 38/*
39 * MMU Operation register. 39 * MMU Operation register.
40 */ 40 */
41#define MMUOR_UAA 0x00000001 /* Update allocatiom address */ 41#define MMUOR_UAA 0x00000001 /* Update allocation address */
42#define MMUOR_ACC 0x00000002 /* TLB access */ 42#define MMUOR_ACC 0x00000002 /* TLB access */
43#define MMUOR_RD 0x00000004 /* TLB access read */ 43#define MMUOR_RD 0x00000004 /* TLB access read */
44#define MMUOR_WR 0x00000000 /* TLB access write */ 44#define MMUOR_WR 0x00000000 /* TLB access write */
diff --git a/arch/m68k/include/asm/q40_master.h b/arch/m68k/include/asm/q40_master.h
index fc5b36278d04..c48d21b68f04 100644
--- a/arch/m68k/include/asm/q40_master.h
+++ b/arch/m68k/include/asm/q40_master.h
@@ -1,6 +1,6 @@
1/* 1/*
2 * Q40 master Chip Control 2 * Q40 master Chip Control
3 * RTC stuff merged for compactnes.. 3 * RTC stuff merged for compactness.
4*/ 4*/
5 5
6#ifndef _Q40_MASTER_H 6#ifndef _Q40_MASTER_H
diff --git a/arch/m68k/mac/iop.c b/arch/m68k/mac/iop.c
index 4d2adfb32a2a..7990b6f50105 100644
--- a/arch/m68k/mac/iop.c
+++ b/arch/m68k/mac/iop.c
@@ -60,7 +60,7 @@
60 * 60 *
61 * The host talks to the IOPs using a rather simple message-passing scheme via 61 * The host talks to the IOPs using a rather simple message-passing scheme via
62 * a shared memory area in the IOP RAM. Each IOP has seven "channels"; each 62 * a shared memory area in the IOP RAM. Each IOP has seven "channels"; each
63 * channel is conneced to a specific software driver on the IOP. For example 63 * channel is connected to a specific software driver on the IOP. For example
64 * on the SCC IOP there is one channel for each serial port. Each channel has 64 * on the SCC IOP there is one channel for each serial port. Each channel has
65 * an incoming and and outgoing message queue with a depth of one. 65 * an incoming and and outgoing message queue with a depth of one.
66 * 66 *
diff --git a/arch/m68k/math-emu/fp_decode.h b/arch/m68k/math-emu/fp_decode.h
index 759679d9ab96..6d1e760e2a0e 100644
--- a/arch/m68k/math-emu/fp_decode.h
+++ b/arch/m68k/math-emu/fp_decode.h
@@ -130,7 +130,7 @@ do_fscc=0
130 bfextu %d2{#13,#3},%d0 130 bfextu %d2{#13,#3},%d0
131.endm 131.endm
132 132
133| decode the 8bit diplacement from the brief extension word 133| decode the 8bit displacement from the brief extension word
134.macro fp_decode_disp8 134.macro fp_decode_disp8
135 move.b %d2,%d0 135 move.b %d2,%d0
136 ext.w %d0 136 ext.w %d0
generated by cgit v1.2.2 (git 2.25.0) at 2025-08-23 17:58:06 -0400