Skip to content

Commit a82c58c

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - Use RNG seed from bootinfo block on virt platform - defconfig updates - Minor fixes and improvements * tag 'm68k-for-v5.20-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: defconfig: Update defconfigs for v5.19-rc1 m68k: Add common forward declaration for show_registers() m68k: mac: Remove forward declaration for mac_nmi_handler() m68k: virt: Fix missing platform_device_unregister() on error in virt_platform_init() m68k: virt: Use RNG seed from bootinfo block m68k: bitops: Change __fls to return and accept unsigned long m68k: Kconfig.machine: Add endif comment m68k: Kconfig.debug: Replace single quotes m68k: Kconfig.cpu: Fix indentation and add endif comments m68k: q40: Align '*' in comments m68k: sun3: Use __func__ to get function's name in an output message m68k: mac: Fix typos in comments m68k: virt: Kconfig minor fixes
2 parents 60ee49f + b508128 commit a82c58c

26 files changed

Lines changed: 149 additions & 173 deletions

‎arch/m68k/Kconfig.cpu‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ config M520x
155155
select COLDFIRE_PIT_TIMER
156156
select HAVE_CACHE_SPLIT
157157
help
158-
Freescale Coldfire 5207/5208 processor support.
158+
Freescale Coldfire 5207/5208 processor support.
159159

160160
config M523x
161161
bool "MCF523x"
@@ -322,7 +322,6 @@ config COLDFIRE_SLTIMERS
322322

323323
endif # COLDFIRE
324324

325-
326325
comment "Processor Specific Options"
327326

328327
config M68KFPU_EMU
@@ -522,7 +521,7 @@ config CACHE_BOTH
522521
Split the ColdFire CPU cache, and use half as an instruction cache
523522
and half as a data cache.
524523
endchoice
525-
endif
524+
endif # HAVE_CACHE_SPLIT
526525

527526
if HAVE_CACHE_CB
528527
choice
@@ -539,4 +538,4 @@ config CACHE_COPYBACK
539538
help
540539
The ColdFire CPU cache is set into Copy-back mode.
541540
endchoice
542-
endif
541+
endif # HAVE_CACHE_CB

‎arch/m68k/Kconfig.debug‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
# SPDX-License-Identifier: GPL-2.0
22

33
config BOOTPARAM
4-
bool 'Compiled-in Kernel Boot Parameter'
4+
bool "Compiled-in Kernel Boot Parameter"
55

66
config BOOTPARAM_STRING
7-
string 'Kernel Boot Parameter'
8-
default 'console=ttyS0,19200'
7+
string "Kernel Boot Parameter"
8+
default "console=ttyS0,19200"
99
depends on BOOTPARAM
1010

1111
config EARLY_PRINTK

‎arch/m68k/Kconfig.machine‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,10 +161,11 @@ config VIRT
161161
select RTC_CLASS
162162
select RTC_DRV_GOLDFISH
163163
select TTY
164+
select VIRTIO_MENU
164165
select VIRTIO_MMIO
165166
help
166167
This options enable a pure virtual machine based on m68k,
167-
VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC)
168+
VIRTIO MMIO devices and GOLDFISH interfaces (TTY, RTC, PIC).
168169

169170
config PILOT
170171
bool
@@ -492,4 +493,4 @@ config ROMKERNEL
492493

493494
endchoice
494495

495-
endif
496+
endif # !MMU || COLDFIRE

‎arch/m68k/configs/amiga_defconfig‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
CONFIG_USERFAULTFD=y
14-
CONFIG_SLAB=y
1513
CONFIG_KEXEC=y
1614
CONFIG_BOOTINFO_PROC=y
1715
CONFIG_M68020=y
@@ -43,8 +41,9 @@ CONFIG_MQ_IOSCHED_KYBER=m
4341
CONFIG_IOSCHED_BFQ=m
4442
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
4543
CONFIG_BINFMT_MISC=m
44+
CONFIG_SLAB=y
4645
# CONFIG_COMPACTION is not set
47-
CONFIG_ZPOOL=m
46+
CONFIG_USERFAULTFD=y
4847
CONFIG_NET=y
4948
CONFIG_PACKET=y
5049
CONFIG_PACKET_DIAG=m
@@ -310,6 +309,7 @@ CONFIG_PARPORT_MFC3=m
310309
CONFIG_PARPORT_1284=y
311310
CONFIG_AMIGA_FLOPPY=y
312311
CONFIG_AMIGA_Z2RAM=y
312+
CONFIG_ZRAM=m
313313
CONFIG_BLK_DEV_LOOP=y
314314
CONFIG_BLK_DEV_DRBD=m
315315
CONFIG_BLK_DEV_NBD=m
@@ -580,7 +580,7 @@ CONFIG_CRYPTO_MD4=m
580580
CONFIG_CRYPTO_MICHAEL_MIC=m
581581
CONFIG_CRYPTO_RMD160=m
582582
CONFIG_CRYPTO_SHA3=m
583-
CONFIG_CRYPTO_SM3=m
583+
CONFIG_CRYPTO_SM3_GENERIC=m
584584
CONFIG_CRYPTO_WP512=m
585585
CONFIG_CRYPTO_AES=y
586586
CONFIG_CRYPTO_AES_TI=m
@@ -595,7 +595,7 @@ CONFIG_CRYPTO_FCRYPT=m
595595
CONFIG_CRYPTO_KHAZAD=m
596596
CONFIG_CRYPTO_SEED=m
597597
CONFIG_CRYPTO_SERPENT=m
598-
CONFIG_CRYPTO_SM4=m
598+
CONFIG_CRYPTO_SM4_GENERIC=m
599599
CONFIG_CRYPTO_TEA=m
600600
CONFIG_CRYPTO_TWOFISH=m
601601
CONFIG_CRYPTO_LZO=m
@@ -648,11 +648,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
648648
CONFIG_FIND_BIT_BENCHMARK=m
649649
CONFIG_TEST_FIRMWARE=m
650650
CONFIG_TEST_SYSCTL=m
651-
CONFIG_BITFIELD_KUNIT=m
652-
CONFIG_RESOURCE_KUNIT_TEST=m
653651
CONFIG_LINEAR_RANGES_TEST=m
654-
CONFIG_CMDLINE_KUNIT_TEST=m
655-
CONFIG_BITS_TEST=m
656652
CONFIG_TEST_UDELAY=m
657653
CONFIG_TEST_STATIC_KEYS=m
658654
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/apollo_defconfig‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
CONFIG_USERFAULTFD=y
14-
CONFIG_SLAB=y
1513
CONFIG_KEXEC=y
1614
CONFIG_BOOTINFO_PROC=y
1715
CONFIG_M68020=y
@@ -39,8 +37,9 @@ CONFIG_MQ_IOSCHED_KYBER=m
3937
CONFIG_IOSCHED_BFQ=m
4038
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
4139
CONFIG_BINFMT_MISC=m
40+
CONFIG_SLAB=y
4241
# CONFIG_COMPACTION is not set
43-
CONFIG_ZPOOL=m
42+
CONFIG_USERFAULTFD=y
4443
CONFIG_NET=y
4544
CONFIG_PACKET=y
4645
CONFIG_PACKET_DIAG=m
@@ -300,6 +299,7 @@ CONFIG_DEVTMPFS=y
300299
CONFIG_DEVTMPFS_MOUNT=y
301300
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
302301
CONFIG_CONNECTOR=m
302+
CONFIG_ZRAM=m
303303
CONFIG_BLK_DEV_LOOP=y
304304
CONFIG_BLK_DEV_DRBD=m
305305
CONFIG_BLK_DEV_NBD=m
@@ -537,7 +537,7 @@ CONFIG_CRYPTO_MD4=m
537537
CONFIG_CRYPTO_MICHAEL_MIC=m
538538
CONFIG_CRYPTO_RMD160=m
539539
CONFIG_CRYPTO_SHA3=m
540-
CONFIG_CRYPTO_SM3=m
540+
CONFIG_CRYPTO_SM3_GENERIC=m
541541
CONFIG_CRYPTO_WP512=m
542542
CONFIG_CRYPTO_AES=y
543543
CONFIG_CRYPTO_AES_TI=m
@@ -552,7 +552,7 @@ CONFIG_CRYPTO_FCRYPT=m
552552
CONFIG_CRYPTO_KHAZAD=m
553553
CONFIG_CRYPTO_SEED=m
554554
CONFIG_CRYPTO_SERPENT=m
555-
CONFIG_CRYPTO_SM4=m
555+
CONFIG_CRYPTO_SM4_GENERIC=m
556556
CONFIG_CRYPTO_TEA=m
557557
CONFIG_CRYPTO_TWOFISH=m
558558
CONFIG_CRYPTO_LZO=m
@@ -604,11 +604,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
604604
CONFIG_FIND_BIT_BENCHMARK=m
605605
CONFIG_TEST_FIRMWARE=m
606606
CONFIG_TEST_SYSCTL=m
607-
CONFIG_BITFIELD_KUNIT=m
608-
CONFIG_RESOURCE_KUNIT_TEST=m
609607
CONFIG_LINEAR_RANGES_TEST=m
610-
CONFIG_CMDLINE_KUNIT_TEST=m
611-
CONFIG_BITS_TEST=m
612608
CONFIG_TEST_UDELAY=m
613609
CONFIG_TEST_STATIC_KEYS=m
614610
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/atari_defconfig‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
CONFIG_USERFAULTFD=y
14-
CONFIG_SLAB=y
1513
CONFIG_KEXEC=y
1614
CONFIG_BOOTINFO_PROC=y
1715
CONFIG_M68020=y
@@ -46,8 +44,9 @@ CONFIG_MQ_IOSCHED_KYBER=m
4644
CONFIG_IOSCHED_BFQ=m
4745
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
4846
CONFIG_BINFMT_MISC=m
47+
CONFIG_SLAB=y
4948
# CONFIG_COMPACTION is not set
50-
CONFIG_ZPOOL=m
49+
CONFIG_USERFAULTFD=y
5150
CONFIG_NET=y
5251
CONFIG_PACKET=y
5352
CONFIG_PACKET_DIAG=m
@@ -311,6 +310,7 @@ CONFIG_PARPORT=m
311310
CONFIG_PARPORT_ATARI=m
312311
CONFIG_PARPORT_1284=y
313312
CONFIG_ATARI_FLOPPY=y
313+
CONFIG_ZRAM=m
314314
CONFIG_BLK_DEV_LOOP=y
315315
CONFIG_BLK_DEV_DRBD=m
316316
CONFIG_BLK_DEV_NBD=m
@@ -557,7 +557,7 @@ CONFIG_CRYPTO_MD4=m
557557
CONFIG_CRYPTO_MICHAEL_MIC=m
558558
CONFIG_CRYPTO_RMD160=m
559559
CONFIG_CRYPTO_SHA3=m
560-
CONFIG_CRYPTO_SM3=m
560+
CONFIG_CRYPTO_SM3_GENERIC=m
561561
CONFIG_CRYPTO_WP512=m
562562
CONFIG_CRYPTO_AES=y
563563
CONFIG_CRYPTO_AES_TI=m
@@ -572,7 +572,7 @@ CONFIG_CRYPTO_FCRYPT=m
572572
CONFIG_CRYPTO_KHAZAD=m
573573
CONFIG_CRYPTO_SEED=m
574574
CONFIG_CRYPTO_SERPENT=m
575-
CONFIG_CRYPTO_SM4=m
575+
CONFIG_CRYPTO_SM4_GENERIC=m
576576
CONFIG_CRYPTO_TEA=m
577577
CONFIG_CRYPTO_TWOFISH=m
578578
CONFIG_CRYPTO_LZO=m
@@ -625,11 +625,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
625625
CONFIG_FIND_BIT_BENCHMARK=m
626626
CONFIG_TEST_FIRMWARE=m
627627
CONFIG_TEST_SYSCTL=m
628-
CONFIG_BITFIELD_KUNIT=m
629-
CONFIG_RESOURCE_KUNIT_TEST=m
630628
CONFIG_LINEAR_RANGES_TEST=m
631-
CONFIG_CMDLINE_KUNIT_TEST=m
632-
CONFIG_BITS_TEST=m
633629
CONFIG_TEST_UDELAY=m
634630
CONFIG_TEST_STATIC_KEYS=m
635631
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/bvme6000_defconfig‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
CONFIG_USERFAULTFD=y
14-
CONFIG_SLAB=y
1513
CONFIG_KEXEC=y
1614
CONFIG_BOOTINFO_PROC=y
1715
CONFIG_M68040=y
@@ -36,8 +34,9 @@ CONFIG_MQ_IOSCHED_KYBER=m
3634
CONFIG_IOSCHED_BFQ=m
3735
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
3836
CONFIG_BINFMT_MISC=m
37+
CONFIG_SLAB=y
3938
# CONFIG_COMPACTION is not set
40-
CONFIG_ZPOOL=m
39+
CONFIG_USERFAULTFD=y
4140
CONFIG_NET=y
4241
CONFIG_PACKET=y
4342
CONFIG_PACKET_DIAG=m
@@ -297,6 +296,7 @@ CONFIG_DEVTMPFS=y
297296
CONFIG_DEVTMPFS_MOUNT=y
298297
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
299298
CONFIG_CONNECTOR=m
299+
CONFIG_ZRAM=m
300300
CONFIG_BLK_DEV_LOOP=y
301301
CONFIG_BLK_DEV_DRBD=m
302302
CONFIG_BLK_DEV_NBD=m
@@ -529,7 +529,7 @@ CONFIG_CRYPTO_MD4=m
529529
CONFIG_CRYPTO_MICHAEL_MIC=m
530530
CONFIG_CRYPTO_RMD160=m
531531
CONFIG_CRYPTO_SHA3=m
532-
CONFIG_CRYPTO_SM3=m
532+
CONFIG_CRYPTO_SM3_GENERIC=m
533533
CONFIG_CRYPTO_WP512=m
534534
CONFIG_CRYPTO_AES=y
535535
CONFIG_CRYPTO_AES_TI=m
@@ -544,7 +544,7 @@ CONFIG_CRYPTO_FCRYPT=m
544544
CONFIG_CRYPTO_KHAZAD=m
545545
CONFIG_CRYPTO_SEED=m
546546
CONFIG_CRYPTO_SERPENT=m
547-
CONFIG_CRYPTO_SM4=m
547+
CONFIG_CRYPTO_SM4_GENERIC=m
548548
CONFIG_CRYPTO_TEA=m
549549
CONFIG_CRYPTO_TWOFISH=m
550550
CONFIG_CRYPTO_LZO=m
@@ -596,11 +596,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
596596
CONFIG_FIND_BIT_BENCHMARK=m
597597
CONFIG_TEST_FIRMWARE=m
598598
CONFIG_TEST_SYSCTL=m
599-
CONFIG_BITFIELD_KUNIT=m
600-
CONFIG_RESOURCE_KUNIT_TEST=m
601599
CONFIG_LINEAR_RANGES_TEST=m
602-
CONFIG_CMDLINE_KUNIT_TEST=m
603-
CONFIG_BITS_TEST=m
604600
CONFIG_TEST_UDELAY=m
605601
CONFIG_TEST_STATIC_KEYS=m
606602
CONFIG_TEST_KMOD=m

‎arch/m68k/configs/hp300_defconfig‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ CONFIG_LOG_BUF_SHIFT=16
1010
# CONFIG_NET_NS is not set
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
CONFIG_USERFAULTFD=y
14-
CONFIG_SLAB=y
1513
CONFIG_KEXEC=y
1614
CONFIG_BOOTINFO_PROC=y
1715
CONFIG_M68020=y
@@ -38,8 +36,9 @@ CONFIG_MQ_IOSCHED_KYBER=m
3836
CONFIG_IOSCHED_BFQ=m
3937
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
4038
CONFIG_BINFMT_MISC=m
39+
CONFIG_SLAB=y
4140
# CONFIG_COMPACTION is not set
42-
CONFIG_ZPOOL=m
41+
CONFIG_USERFAULTFD=y
4342
CONFIG_NET=y
4443
CONFIG_PACKET=y
4544
CONFIG_PACKET_DIAG=m
@@ -299,6 +298,7 @@ CONFIG_DEVTMPFS=y
299298
CONFIG_DEVTMPFS_MOUNT=y
300299
CONFIG_TEST_ASYNC_DRIVER_PROBE=m
301300
CONFIG_CONNECTOR=m
301+
CONFIG_ZRAM=m
302302
CONFIG_BLK_DEV_LOOP=y
303303
CONFIG_BLK_DEV_DRBD=m
304304
CONFIG_BLK_DEV_NBD=m
@@ -539,7 +539,7 @@ CONFIG_CRYPTO_MD4=m
539539
CONFIG_CRYPTO_MICHAEL_MIC=m
540540
CONFIG_CRYPTO_RMD160=m
541541
CONFIG_CRYPTO_SHA3=m
542-
CONFIG_CRYPTO_SM3=m
542+
CONFIG_CRYPTO_SM3_GENERIC=m
543543
CONFIG_CRYPTO_WP512=m
544544
CONFIG_CRYPTO_AES=y
545545
CONFIG_CRYPTO_AES_TI=m
@@ -554,7 +554,7 @@ CONFIG_CRYPTO_FCRYPT=m
554554
CONFIG_CRYPTO_KHAZAD=m
555555
CONFIG_CRYPTO_SEED=m
556556
CONFIG_CRYPTO_SERPENT=m
557-
CONFIG_CRYPTO_SM4=m
557+
CONFIG_CRYPTO_SM4_GENERIC=m
558558
CONFIG_CRYPTO_TEA=m
559559
CONFIG_CRYPTO_TWOFISH=m
560560
CONFIG_CRYPTO_LZO=m
@@ -606,11 +606,7 @@ CONFIG_TEST_BLACKHOLE_DEV=m
606606
CONFIG_FIND_BIT_BENCHMARK=m
607607
CONFIG_TEST_FIRMWARE=m
608608
CONFIG_TEST_SYSCTL=m
609-
CONFIG_BITFIELD_KUNIT=m
610-
CONFIG_RESOURCE_KUNIT_TEST=m
611609
CONFIG_LINEAR_RANGES_TEST=m
612-
CONFIG_CMDLINE_KUNIT_TEST=m
613-
CONFIG_BITS_TEST=m
614610
CONFIG_TEST_UDELAY=m
615611
CONFIG_TEST_STATIC_KEYS=m
616612
CONFIG_TEST_KMOD=m

0 commit comments

Comments
 (0)