Skip to content

Commit 5419e78

Browse files
torvaldstorvalds
committed
Merge tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k
Pull m68k updates from Geert Uytterhoeven: - cleanups - defconfig updates - GPG fingerprint update * tag 'm68k-for-v4.9-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k: m68k: Migrate exception table users off module.h and onto extable.h CREDITS: Update fingerprint for Geert Uytterhoeven m68k: Use IS_ENABLED() instead of checking for built-in or module m68k/defconfig: Update defconfigs for v4.8-rc1
2 parents 8e4ef63 + 6736e65 commit 5419e78

19 files changed

+43
-7
lines changed

‎CREDITS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3691,7 +3691,7 @@ S: Germany
36913691
N: Geert Uytterhoeven
36923692
E: geert@linux-m68k.org
36933693
W: http://users.telenet.be/geertu/
3694-
P: 1024/862678A6 C51D 361C 0BD1 4C90 B275 C553 6EEA 11BA 8626 78A6
3694+
P: 4096R/4804B4BC3F55EEFB 750D 82B0 A781 5431 5E25 925B 4804 B4BC 3F55 EEFB
36953695
D: m68k/Amiga and PPC/CHRP Longtrail coordinator
36963696
D: Frame buffer device and XF68_FBDev maintainer
36973697
D: m68k IDE maintainer

‎arch/m68k/amiga/config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,7 @@ void __init config_amiga(void)
396396
mach_max_dma_address = 0xffffffff;
397397

398398
mach_reset = amiga_reset;
399-
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
399+
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
400400
mach_beep = amiga_mksound;
401401
#endif
402402

‎arch/m68k/atari/config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -211,7 +211,7 @@ void __init config_atari(void)
211211
arch_gettimeoffset = atari_gettimeoffset;
212212
mach_reset = atari_reset;
213213
mach_max_dma_address = 0xffffff;
214-
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
214+
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
215215
mach_beep = atari_mksound;
216216
#endif
217217
#ifdef CONFIG_HEARTBEAT

‎arch/m68k/configs/amiga_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -566,6 +566,8 @@ CONFIG_TEST_UDELAY=m
566566
CONFIG_TEST_STATIC_KEYS=m
567567
CONFIG_EARLY_PRINTK=y
568568
CONFIG_CRYPTO_RSA=m
569+
CONFIG_CRYPTO_DH=m
570+
CONFIG_CRYPTO_ECDH=m
569571
CONFIG_CRYPTO_MANAGER=y
570572
CONFIG_CRYPTO_USER=m
571573
CONFIG_CRYPTO_CRYPTD=m
@@ -584,6 +586,7 @@ CONFIG_CRYPTO_RMD160=m
584586
CONFIG_CRYPTO_RMD256=m
585587
CONFIG_CRYPTO_RMD320=m
586588
CONFIG_CRYPTO_SHA512=m
589+
CONFIG_CRYPTO_SHA3=m
587590
CONFIG_CRYPTO_TGR192=m
588591
CONFIG_CRYPTO_WP512=m
589592
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/apollo_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -525,6 +525,8 @@ CONFIG_TEST_UDELAY=m
525525
CONFIG_TEST_STATIC_KEYS=m
526526
CONFIG_EARLY_PRINTK=y
527527
CONFIG_CRYPTO_RSA=m
528+
CONFIG_CRYPTO_DH=m
529+
CONFIG_CRYPTO_ECDH=m
528530
CONFIG_CRYPTO_MANAGER=y
529531
CONFIG_CRYPTO_USER=m
530532
CONFIG_CRYPTO_CRYPTD=m
@@ -543,6 +545,7 @@ CONFIG_CRYPTO_RMD160=m
543545
CONFIG_CRYPTO_RMD256=m
544546
CONFIG_CRYPTO_RMD320=m
545547
CONFIG_CRYPTO_SHA512=m
548+
CONFIG_CRYPTO_SHA3=m
546549
CONFIG_CRYPTO_TGR192=m
547550
CONFIG_CRYPTO_WP512=m
548551
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/atari_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,8 @@ CONFIG_TEST_UDELAY=m
546546
CONFIG_TEST_STATIC_KEYS=m
547547
CONFIG_EARLY_PRINTK=y
548548
CONFIG_CRYPTO_RSA=m
549+
CONFIG_CRYPTO_DH=m
550+
CONFIG_CRYPTO_ECDH=m
549551
CONFIG_CRYPTO_MANAGER=y
550552
CONFIG_CRYPTO_USER=m
551553
CONFIG_CRYPTO_CRYPTD=m
@@ -564,6 +566,7 @@ CONFIG_CRYPTO_RMD160=m
564566
CONFIG_CRYPTO_RMD256=m
565567
CONFIG_CRYPTO_RMD320=m
566568
CONFIG_CRYPTO_SHA512=m
569+
CONFIG_CRYPTO_SHA3=m
567570
CONFIG_CRYPTO_TGR192=m
568571
CONFIG_CRYPTO_WP512=m
569572
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/bvme6000_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ CONFIG_TEST_UDELAY=m
517517
CONFIG_TEST_STATIC_KEYS=m
518518
CONFIG_EARLY_PRINTK=y
519519
CONFIG_CRYPTO_RSA=m
520+
CONFIG_CRYPTO_DH=m
521+
CONFIG_CRYPTO_ECDH=m
520522
CONFIG_CRYPTO_MANAGER=y
521523
CONFIG_CRYPTO_USER=m
522524
CONFIG_CRYPTO_CRYPTD=m
@@ -535,6 +537,7 @@ CONFIG_CRYPTO_RMD160=m
535537
CONFIG_CRYPTO_RMD256=m
536538
CONFIG_CRYPTO_RMD320=m
537539
CONFIG_CRYPTO_SHA512=m
540+
CONFIG_CRYPTO_SHA3=m
538541
CONFIG_CRYPTO_TGR192=m
539542
CONFIG_CRYPTO_WP512=m
540543
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/hp300_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -527,6 +527,8 @@ CONFIG_TEST_UDELAY=m
527527
CONFIG_TEST_STATIC_KEYS=m
528528
CONFIG_EARLY_PRINTK=y
529529
CONFIG_CRYPTO_RSA=m
530+
CONFIG_CRYPTO_DH=m
531+
CONFIG_CRYPTO_ECDH=m
530532
CONFIG_CRYPTO_MANAGER=y
531533
CONFIG_CRYPTO_USER=m
532534
CONFIG_CRYPTO_CRYPTD=m
@@ -545,6 +547,7 @@ CONFIG_CRYPTO_RMD160=m
545547
CONFIG_CRYPTO_RMD256=m
546548
CONFIG_CRYPTO_RMD320=m
547549
CONFIG_CRYPTO_SHA512=m
550+
CONFIG_CRYPTO_SHA3=m
548551
CONFIG_CRYPTO_TGR192=m
549552
CONFIG_CRYPTO_WP512=m
550553
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/mac_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,8 @@ CONFIG_TEST_UDELAY=m
549549
CONFIG_TEST_STATIC_KEYS=m
550550
CONFIG_EARLY_PRINTK=y
551551
CONFIG_CRYPTO_RSA=m
552+
CONFIG_CRYPTO_DH=m
553+
CONFIG_CRYPTO_ECDH=m
552554
CONFIG_CRYPTO_MANAGER=y
553555
CONFIG_CRYPTO_USER=m
554556
CONFIG_CRYPTO_CRYPTD=m
@@ -567,6 +569,7 @@ CONFIG_CRYPTO_RMD160=m
567569
CONFIG_CRYPTO_RMD256=m
568570
CONFIG_CRYPTO_RMD320=m
569571
CONFIG_CRYPTO_SHA512=m
572+
CONFIG_CRYPTO_SHA3=m
570573
CONFIG_CRYPTO_TGR192=m
571574
CONFIG_CRYPTO_WP512=m
572575
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/multi_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -629,6 +629,8 @@ CONFIG_TEST_UDELAY=m
629629
CONFIG_TEST_STATIC_KEYS=m
630630
CONFIG_EARLY_PRINTK=y
631631
CONFIG_CRYPTO_RSA=m
632+
CONFIG_CRYPTO_DH=m
633+
CONFIG_CRYPTO_ECDH=m
632634
CONFIG_CRYPTO_MANAGER=y
633635
CONFIG_CRYPTO_USER=m
634636
CONFIG_CRYPTO_CRYPTD=m
@@ -647,6 +649,7 @@ CONFIG_CRYPTO_RMD160=m
647649
CONFIG_CRYPTO_RMD256=m
648650
CONFIG_CRYPTO_RMD320=m
649651
CONFIG_CRYPTO_SHA512=m
652+
CONFIG_CRYPTO_SHA3=m
650653
CONFIG_CRYPTO_TGR192=m
651654
CONFIG_CRYPTO_WP512=m
652655
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/mvme147_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ CONFIG_TEST_UDELAY=m
517517
CONFIG_TEST_STATIC_KEYS=m
518518
CONFIG_EARLY_PRINTK=y
519519
CONFIG_CRYPTO_RSA=m
520+
CONFIG_CRYPTO_DH=m
521+
CONFIG_CRYPTO_ECDH=m
520522
CONFIG_CRYPTO_MANAGER=y
521523
CONFIG_CRYPTO_USER=m
522524
CONFIG_CRYPTO_CRYPTD=m
@@ -535,6 +537,7 @@ CONFIG_CRYPTO_RMD160=m
535537
CONFIG_CRYPTO_RMD256=m
536538
CONFIG_CRYPTO_RMD320=m
537539
CONFIG_CRYPTO_SHA512=m
540+
CONFIG_CRYPTO_SHA3=m
538541
CONFIG_CRYPTO_TGR192=m
539542
CONFIG_CRYPTO_WP512=m
540543
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/mvme16x_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,8 @@ CONFIG_TEST_UDELAY=m
517517
CONFIG_TEST_STATIC_KEYS=m
518518
CONFIG_EARLY_PRINTK=y
519519
CONFIG_CRYPTO_RSA=m
520+
CONFIG_CRYPTO_DH=m
521+
CONFIG_CRYPTO_ECDH=m
520522
CONFIG_CRYPTO_MANAGER=y
521523
CONFIG_CRYPTO_USER=m
522524
CONFIG_CRYPTO_CRYPTD=m
@@ -535,6 +537,7 @@ CONFIG_CRYPTO_RMD160=m
535537
CONFIG_CRYPTO_RMD256=m
536538
CONFIG_CRYPTO_RMD320=m
537539
CONFIG_CRYPTO_SHA512=m
540+
CONFIG_CRYPTO_SHA3=m
538541
CONFIG_CRYPTO_TGR192=m
539542
CONFIG_CRYPTO_WP512=m
540543
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/q40_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -540,6 +540,8 @@ CONFIG_TEST_UDELAY=m
540540
CONFIG_TEST_STATIC_KEYS=m
541541
CONFIG_EARLY_PRINTK=y
542542
CONFIG_CRYPTO_RSA=m
543+
CONFIG_CRYPTO_DH=m
544+
CONFIG_CRYPTO_ECDH=m
543545
CONFIG_CRYPTO_MANAGER=y
544546
CONFIG_CRYPTO_USER=m
545547
CONFIG_CRYPTO_CRYPTD=m
@@ -558,6 +560,7 @@ CONFIG_CRYPTO_RMD160=m
558560
CONFIG_CRYPTO_RMD256=m
559561
CONFIG_CRYPTO_RMD320=m
560562
CONFIG_CRYPTO_SHA512=m
563+
CONFIG_CRYPTO_SHA3=m
561564
CONFIG_CRYPTO_TGR192=m
562565
CONFIG_CRYPTO_WP512=m
563566
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/sun3_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -518,6 +518,8 @@ CONFIG_TEST_FIRMWARE=m
518518
CONFIG_TEST_UDELAY=m
519519
CONFIG_TEST_STATIC_KEYS=m
520520
CONFIG_CRYPTO_RSA=m
521+
CONFIG_CRYPTO_DH=m
522+
CONFIG_CRYPTO_ECDH=m
521523
CONFIG_CRYPTO_MANAGER=y
522524
CONFIG_CRYPTO_USER=m
523525
CONFIG_CRYPTO_CRYPTD=m
@@ -536,6 +538,7 @@ CONFIG_CRYPTO_RMD160=m
536538
CONFIG_CRYPTO_RMD256=m
537539
CONFIG_CRYPTO_RMD320=m
538540
CONFIG_CRYPTO_SHA512=m
541+
CONFIG_CRYPTO_SHA3=m
539542
CONFIG_CRYPTO_TGR192=m
540543
CONFIG_CRYPTO_WP512=m
541544
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/configs/sun3x_defconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -519,6 +519,8 @@ CONFIG_TEST_UDELAY=m
519519
CONFIG_TEST_STATIC_KEYS=m
520520
CONFIG_EARLY_PRINTK=y
521521
CONFIG_CRYPTO_RSA=m
522+
CONFIG_CRYPTO_DH=m
523+
CONFIG_CRYPTO_ECDH=m
522524
CONFIG_CRYPTO_MANAGER=y
523525
CONFIG_CRYPTO_USER=m
524526
CONFIG_CRYPTO_CRYPTD=m
@@ -537,6 +539,7 @@ CONFIG_CRYPTO_RMD160=m
537539
CONFIG_CRYPTO_RMD256=m
538540
CONFIG_CRYPTO_RMD320=m
539541
CONFIG_CRYPTO_SHA512=m
542+
CONFIG_CRYPTO_SHA3=m
540543
CONFIG_CRYPTO_TGR192=m
541544
CONFIG_CRYPTO_WP512=m
542545
CONFIG_CRYPTO_ANUBIS=m

‎arch/m68k/kernel/setup_mm.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ EXPORT_SYMBOL(mach_heartbeat);
105105
#ifdef CONFIG_M68K_L2_CACHE
106106
void (*mach_l2_flush) (int);
107107
#endif
108-
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
108+
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
109109
void (*mach_beep)(unsigned int, unsigned int);
110110
EXPORT_SYMBOL(mach_beep);
111111
#endif

‎arch/m68k/kernel/signal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
#include <linux/personality.h>
4343
#include <linux/tty.h>
4444
#include <linux/binfmts.h>
45-
#include <linux/module.h>
45+
#include <linux/extable.h>
4646
#include <linux/tracehook.h>
4747

4848
#include <asm/setup.h>

‎arch/m68k/mac/config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ void __init config_mac(void)
162162
mach_halt = mac_poweroff;
163163
mach_power_off = mac_poweroff;
164164
mach_max_dma_address = 0xffffffff;
165-
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
165+
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
166166
mach_beep = mac_mksound;
167167
#endif
168168

‎arch/m68k/q40/config.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ void __init config_q40(void)
180180
mach_reset = q40_reset;
181181
mach_get_model = q40_get_model;
182182

183-
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
183+
#if IS_ENABLED(CONFIG_INPUT_M68K_BEEP)
184184
mach_beep = q40_mksound;
185185
#endif
186186
#ifdef CONFIG_HEARTBEAT

0 commit comments

Comments
 (0)