Skip to content

Commit 2321884

Browse files
committed
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
2 parents 7825e0c + 6bd80f3 commit 2321884

23 files changed

+64
-16
lines changed

arch/m68k/coldfire/head.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ _clear_bss:
288288
#endif
289289

290290
/*
291-
* Assember start up done, start code proper.
291+
* Assembler start up done, start code proper.
292292
*/
293293
jsr start_kernel /* start Linux kernel */
294294

arch/m68k/coldfire/m5272.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ void __init config_BSP(char *commandp, int size)
111111
/***************************************************************************/
112112

113113
/*
114-
* Some 5272 based boards have the FEC ethernet diectly connected to
114+
* Some 5272 based boards have the FEC ethernet directly connected to
115115
* an ethernet switch. In this case we need to use the fixed phy type,
116116
* and we need to declare it early in boot.
117117
*/

arch/m68k/coldfire/pci.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ static unsigned long iospace;
4242

4343
/*
4444
* 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
4646
* use, ignore aliases and the like.
4747
*/
4848
static unsigned char mcf_host_slot2sid[32] = {

arch/m68k/configs/amiga_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -359,6 +360,7 @@ CONFIG_MACVTAP=m
359360
CONFIG_IPVLAN=m
360361
CONFIG_VXLAN=m
361362
CONFIG_GENEVE=m
363+
CONFIG_GTP=m
362364
CONFIG_MACSEC=m
363365
CONFIG_NETCONSOLE=m
364366
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -553,7 +555,9 @@ CONFIG_TEST_STRING_HELPERS=m
553555
CONFIG_TEST_KSTRTOX=m
554556
CONFIG_TEST_PRINTF=m
555557
CONFIG_TEST_BITMAP=m
558+
CONFIG_TEST_UUID=m
556559
CONFIG_TEST_RHASHTABLE=m
560+
CONFIG_TEST_HASH=m
557561
CONFIG_TEST_LKM=m
558562
CONFIG_TEST_USER_COPY=m
559563
CONFIG_TEST_BPF=m

arch/m68k/configs/apollo_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -341,6 +342,7 @@ CONFIG_MACVTAP=m
341342
CONFIG_IPVLAN=m
342343
CONFIG_VXLAN=m
343344
CONFIG_GENEVE=m
345+
CONFIG_GTP=m
344346
CONFIG_MACSEC=m
345347
CONFIG_NETCONSOLE=m
346348
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -512,7 +514,9 @@ CONFIG_TEST_STRING_HELPERS=m
512514
CONFIG_TEST_KSTRTOX=m
513515
CONFIG_TEST_PRINTF=m
514516
CONFIG_TEST_BITMAP=m
517+
CONFIG_TEST_UUID=m
515518
CONFIG_TEST_RHASHTABLE=m
519+
CONFIG_TEST_HASH=m
516520
CONFIG_TEST_LKM=m
517521
CONFIG_TEST_USER_COPY=m
518522
CONFIG_TEST_BPF=m

arch/m68k/configs/atari_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -350,6 +351,7 @@ CONFIG_MACVTAP=m
350351
CONFIG_IPVLAN=m
351352
CONFIG_VXLAN=m
352353
CONFIG_GENEVE=m
354+
CONFIG_GTP=m
353355
CONFIG_MACSEC=m
354356
CONFIG_NETCONSOLE=m
355357
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -533,7 +535,9 @@ CONFIG_TEST_STRING_HELPERS=m
533535
CONFIG_TEST_KSTRTOX=m
534536
CONFIG_TEST_PRINTF=m
535537
CONFIG_TEST_BITMAP=m
538+
CONFIG_TEST_UUID=m
536539
CONFIG_TEST_RHASHTABLE=m
540+
CONFIG_TEST_HASH=m
537541
CONFIG_TEST_LKM=m
538542
CONFIG_TEST_USER_COPY=m
539543
CONFIG_TEST_BPF=m

arch/m68k/configs/bvme6000_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -340,6 +341,7 @@ CONFIG_MACVTAP=m
340341
CONFIG_IPVLAN=m
341342
CONFIG_VXLAN=m
342343
CONFIG_GENEVE=m
344+
CONFIG_GTP=m
343345
CONFIG_MACSEC=m
344346
CONFIG_NETCONSOLE=m
345347
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504506
CONFIG_TEST_KSTRTOX=m
505507
CONFIG_TEST_PRINTF=m
506508
CONFIG_TEST_BITMAP=m
509+
CONFIG_TEST_UUID=m
507510
CONFIG_TEST_RHASHTABLE=m
511+
CONFIG_TEST_HASH=m
508512
CONFIG_TEST_LKM=m
509513
CONFIG_TEST_USER_COPY=m
510514
CONFIG_TEST_BPF=m

arch/m68k/configs/hp300_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -341,6 +342,7 @@ CONFIG_MACVTAP=m
341342
CONFIG_IPVLAN=m
342343
CONFIG_VXLAN=m
343344
CONFIG_GENEVE=m
345+
CONFIG_GTP=m
344346
CONFIG_MACSEC=m
345347
CONFIG_NETCONSOLE=m
346348
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -514,7 +516,9 @@ CONFIG_TEST_STRING_HELPERS=m
514516
CONFIG_TEST_KSTRTOX=m
515517
CONFIG_TEST_PRINTF=m
516518
CONFIG_TEST_BITMAP=m
519+
CONFIG_TEST_UUID=m
517520
CONFIG_TEST_RHASHTABLE=m
521+
CONFIG_TEST_HASH=m
518522
CONFIG_TEST_LKM=m
519523
CONFIG_TEST_USER_COPY=m
520524
CONFIG_TEST_BPF=m

arch/m68k/configs/mac_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -357,6 +358,7 @@ CONFIG_MACVTAP=m
357358
CONFIG_IPVLAN=m
358359
CONFIG_VXLAN=m
359360
CONFIG_GENEVE=m
361+
CONFIG_GTP=m
360362
CONFIG_MACSEC=m
361363
CONFIG_NETCONSOLE=m
362364
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -536,7 +538,9 @@ CONFIG_TEST_STRING_HELPERS=m
536538
CONFIG_TEST_KSTRTOX=m
537539
CONFIG_TEST_PRINTF=m
538540
CONFIG_TEST_BITMAP=m
541+
CONFIG_TEST_UUID=m
539542
CONFIG_TEST_RHASHTABLE=m
543+
CONFIG_TEST_HASH=m
540544
CONFIG_TEST_LKM=m
541545
CONFIG_TEST_USER_COPY=m
542546
CONFIG_TEST_BPF=m

arch/m68k/configs/multi_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -390,6 +391,7 @@ CONFIG_MACVTAP=m
390391
CONFIG_IPVLAN=m
391392
CONFIG_VXLAN=m
392393
CONFIG_GENEVE=m
394+
CONFIG_GTP=m
393395
CONFIG_MACSEC=m
394396
CONFIG_NETCONSOLE=m
395397
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -616,7 +618,9 @@ CONFIG_TEST_STRING_HELPERS=m
616618
CONFIG_TEST_KSTRTOX=m
617619
CONFIG_TEST_PRINTF=m
618620
CONFIG_TEST_BITMAP=m
621+
CONFIG_TEST_UUID=m
619622
CONFIG_TEST_RHASHTABLE=m
623+
CONFIG_TEST_HASH=m
620624
CONFIG_TEST_LKM=m
621625
CONFIG_TEST_USER_COPY=m
622626
CONFIG_TEST_BPF=m

arch/m68k/configs/mvme147_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -339,6 +340,7 @@ CONFIG_MACVTAP=m
339340
CONFIG_IPVLAN=m
340341
CONFIG_VXLAN=m
341342
CONFIG_GENEVE=m
343+
CONFIG_GTP=m
342344
CONFIG_MACSEC=m
343345
CONFIG_NETCONSOLE=m
344346
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504506
CONFIG_TEST_KSTRTOX=m
505507
CONFIG_TEST_PRINTF=m
506508
CONFIG_TEST_BITMAP=m
509+
CONFIG_TEST_UUID=m
507510
CONFIG_TEST_RHASHTABLE=m
511+
CONFIG_TEST_HASH=m
508512
CONFIG_TEST_LKM=m
509513
CONFIG_TEST_USER_COPY=m
510514
CONFIG_TEST_BPF=m

arch/m68k/configs/mvme16x_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -340,6 +341,7 @@ CONFIG_MACVTAP=m
340341
CONFIG_IPVLAN=m
341342
CONFIG_VXLAN=m
342343
CONFIG_GENEVE=m
344+
CONFIG_GTP=m
343345
CONFIG_MACSEC=m
344346
CONFIG_NETCONSOLE=m
345347
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -504,7 +506,9 @@ CONFIG_TEST_STRING_HELPERS=m
504506
CONFIG_TEST_KSTRTOX=m
505507
CONFIG_TEST_PRINTF=m
506508
CONFIG_TEST_BITMAP=m
509+
CONFIG_TEST_UUID=m
507510
CONFIG_TEST_RHASHTABLE=m
511+
CONFIG_TEST_HASH=m
508512
CONFIG_TEST_LKM=m
509513
CONFIG_TEST_USER_COPY=m
510514
CONFIG_TEST_BPF=m

arch/m68k/configs/q40_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -346,6 +347,7 @@ CONFIG_MACVTAP=m
346347
CONFIG_IPVLAN=m
347348
CONFIG_VXLAN=m
348349
CONFIG_GENEVE=m
350+
CONFIG_GTP=m
349351
CONFIG_MACSEC=m
350352
CONFIG_NETCONSOLE=m
351353
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -527,7 +529,9 @@ CONFIG_TEST_STRING_HELPERS=m
527529
CONFIG_TEST_KSTRTOX=m
528530
CONFIG_TEST_PRINTF=m
529531
CONFIG_TEST_BITMAP=m
532+
CONFIG_TEST_UUID=m
530533
CONFIG_TEST_RHASHTABLE=m
534+
CONFIG_TEST_HASH=m
531535
CONFIG_TEST_LKM=m
532536
CONFIG_TEST_USER_COPY=m
533537
CONFIG_TEST_BPF=m

arch/m68k/configs/sun3_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -337,6 +338,7 @@ CONFIG_MACVTAP=m
337338
CONFIG_IPVLAN=m
338339
CONFIG_VXLAN=m
339340
CONFIG_GENEVE=m
341+
CONFIG_GTP=m
340342
CONFIG_MACSEC=m
341343
CONFIG_NETCONSOLE=m
342344
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -506,7 +508,9 @@ CONFIG_TEST_STRING_HELPERS=m
506508
CONFIG_TEST_KSTRTOX=m
507509
CONFIG_TEST_PRINTF=m
508510
CONFIG_TEST_BITMAP=m
511+
CONFIG_TEST_UUID=m
509512
CONFIG_TEST_RHASHTABLE=m
513+
CONFIG_TEST_HASH=m
510514
CONFIG_TEST_LKM=m
511515
CONFIG_TEST_USER_COPY=m
512516
CONFIG_TEST_BPF=m

arch/m68k/configs/sun3x_defconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ CONFIG_LOG_BUF_SHIFT=16
99
# CONFIG_PID_NS is not set
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
12+
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
1213
CONFIG_USERFAULTFD=y
1314
CONFIG_SLAB=y
1415
CONFIG_MODULES=y
@@ -337,6 +338,7 @@ CONFIG_MACVTAP=m
337338
CONFIG_IPVLAN=m
338339
CONFIG_VXLAN=m
339340
CONFIG_GENEVE=m
341+
CONFIG_GTP=m
340342
CONFIG_MACSEC=m
341343
CONFIG_NETCONSOLE=m
342344
CONFIG_NETCONSOLE_DYNAMIC=y
@@ -506,7 +508,9 @@ CONFIG_TEST_STRING_HELPERS=m
506508
CONFIG_TEST_KSTRTOX=m
507509
CONFIG_TEST_PRINTF=m
508510
CONFIG_TEST_BITMAP=m
511+
CONFIG_TEST_UUID=m
509512
CONFIG_TEST_RHASHTABLE=m
513+
CONFIG_TEST_HASH=m
510514
CONFIG_TEST_LKM=m
511515
CONFIG_TEST_USER_COPY=m
512516
CONFIG_TEST_BPF=m

arch/m68k/ifpsp060/src/fpsp.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -10191,7 +10191,7 @@ xdnrm_con:
1019110191
xdnrm_sd:
1019210192
mov.l %a1,-(%sp)
1019310193
tst.b LOCAL_EX(%a0) # is denorm pos or neg?
10194-
smi.b %d1 # set d0 accodingly
10194+
smi.b %d1 # set d0 accordingly
1019510195
bsr.l unf_sub
1019610196
mov.l (%sp)+,%a1
1019710197
xdnrm_exit:
@@ -10990,7 +10990,7 @@ src_qnan_m:
1099010990
# routines where an instruction is selected by an index into
1099110991
# a large jump table corresponding to a given instruction which
1099210992
# 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.
1099410994
#
1099510995

1099610996
global fsinh
@@ -23196,14 +23196,14 @@ m_sign:
2319623196
#
2319723197
# 1. Branch on the sign of the adjusted exponent.
2319823198
# 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.
2320023200
# 3. Add one for each zero encountered until a non-zero digit.
2320123201
# 4. Subtract the count from the exp.
2320223202
# 5. Check if the exp has crossed zero in #3 above; make the exp abs
2320323203
# and set SE.
2320423204
# 6. Multiply the mantissa by 10**count.
2320523205
# 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.
2320723207
# 3. Add one for each zero encountered until a non-zero digit.
2320823208
# 4. Add the count to the exp.
2320923209
# 5. Check if the exp has crossed zero in #3 above; clear SE.

arch/m68k/ifpsp060/src/pfpsp.S

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13156,14 +13156,14 @@ m_sign:
1315613156
#
1315713157
# 1. Branch on the sign of the adjusted exponent.
1315813158
# 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.
1316013160
# 3. Add one for each zero encountered until a non-zero digit.
1316113161
# 4. Subtract the count from the exp.
1316213162
# 5. Check if the exp has crossed zero in #3 above; make the exp abs
1316313163
# and set SE.
1316413164
# 6. Multiply the mantissa by 10**count.
1316513165
# 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.
1316713167
# 3. Add one for each zero encountered until a non-zero digit.
1316813168
# 4. Add the count to the exp.
1316913169
# 5. Check if the exp has crossed zero in #3 above; clear SE.

arch/m68k/include/asm/dma.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
* AUG/22/2000 : added support for 32-bit Dual-Address-Mode (K) 2000
1919
* Oliver Kamphenkel ([email protected])
2020
*
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
2222
* Oliver Kamphenkel ([email protected])
2323
*
2424
* APR/18/2002 : added proper support for MCF5272 DMA controller.

0 commit comments

Comments
 (0)