Merge tag 'm68k-for-v6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k

-2

arch/m68k/configs/amiga_defconfig

··· 559 559 CONFIG_CRYPTO_ECDH=m 560 560 CONFIG_CRYPTO_ECDSA=m 561 561 CONFIG_CRYPTO_ECRDSA=m 562 - CONFIG_CRYPTO_SM2=m 563 562 CONFIG_CRYPTO_CURVE25519=m 564 563 CONFIG_CRYPTO_AES=y 565 564 CONFIG_CRYPTO_AES_TI=m ··· 635 636 CONFIG_TEST_IDA=m 636 637 CONFIG_TEST_BITOPS=m 637 638 CONFIG_TEST_VMALLOC=m 638 - CONFIG_TEST_USER_COPY=m 639 639 CONFIG_TEST_BPF=m 640 640 CONFIG_TEST_BLACKHOLE_DEV=m 641 641 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/apollo_defconfig

··· 516 516 CONFIG_CRYPTO_ECDH=m 517 517 CONFIG_CRYPTO_ECDSA=m 518 518 CONFIG_CRYPTO_ECRDSA=m 519 - CONFIG_CRYPTO_SM2=m 520 519 CONFIG_CRYPTO_CURVE25519=m 521 520 CONFIG_CRYPTO_AES=y 522 521 CONFIG_CRYPTO_AES_TI=m ··· 592 593 CONFIG_TEST_IDA=m 593 594 CONFIG_TEST_BITOPS=m 594 595 CONFIG_TEST_VMALLOC=m 595 - CONFIG_TEST_USER_COPY=m 596 596 CONFIG_TEST_BPF=m 597 597 CONFIG_TEST_BLACKHOLE_DEV=m 598 598 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/atari_defconfig

··· 536 536 CONFIG_CRYPTO_ECDH=m 537 537 CONFIG_CRYPTO_ECDSA=m 538 538 CONFIG_CRYPTO_ECRDSA=m 539 - CONFIG_CRYPTO_SM2=m 540 539 CONFIG_CRYPTO_CURVE25519=m 541 540 CONFIG_CRYPTO_AES=y 542 541 CONFIG_CRYPTO_AES_TI=m ··· 612 613 CONFIG_TEST_IDA=m 613 614 CONFIG_TEST_BITOPS=m 614 615 CONFIG_TEST_VMALLOC=m 615 - CONFIG_TEST_USER_COPY=m 616 616 CONFIG_TEST_BPF=m 617 617 CONFIG_TEST_BLACKHOLE_DEV=m 618 618 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/bvme6000_defconfig

··· 508 508 CONFIG_CRYPTO_ECDH=m 509 509 CONFIG_CRYPTO_ECDSA=m 510 510 CONFIG_CRYPTO_ECRDSA=m 511 - CONFIG_CRYPTO_SM2=m 512 511 CONFIG_CRYPTO_CURVE25519=m 513 512 CONFIG_CRYPTO_AES=y 514 513 CONFIG_CRYPTO_AES_TI=m ··· 584 585 CONFIG_TEST_IDA=m 585 586 CONFIG_TEST_BITOPS=m 586 587 CONFIG_TEST_VMALLOC=m 587 - CONFIG_TEST_USER_COPY=m 588 588 CONFIG_TEST_BPF=m 589 589 CONFIG_TEST_BLACKHOLE_DEV=m 590 590 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/hp300_defconfig

··· 518 518 CONFIG_CRYPTO_ECDH=m 519 519 CONFIG_CRYPTO_ECDSA=m 520 520 CONFIG_CRYPTO_ECRDSA=m 521 - CONFIG_CRYPTO_SM2=m 522 521 CONFIG_CRYPTO_CURVE25519=m 523 522 CONFIG_CRYPTO_AES=y 524 523 CONFIG_CRYPTO_AES_TI=m ··· 594 595 CONFIG_TEST_IDA=m 595 596 CONFIG_TEST_BITOPS=m 596 597 CONFIG_TEST_VMALLOC=m 597 - CONFIG_TEST_USER_COPY=m 598 598 CONFIG_TEST_BPF=m 599 599 CONFIG_TEST_BLACKHOLE_DEV=m 600 600 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/mac_defconfig

··· 535 535 CONFIG_CRYPTO_ECDH=m 536 536 CONFIG_CRYPTO_ECDSA=m 537 537 CONFIG_CRYPTO_ECRDSA=m 538 - CONFIG_CRYPTO_SM2=m 539 538 CONFIG_CRYPTO_CURVE25519=m 540 539 CONFIG_CRYPTO_AES=y 541 540 CONFIG_CRYPTO_AES_TI=m ··· 611 612 CONFIG_TEST_IDA=m 612 613 CONFIG_TEST_BITOPS=m 613 614 CONFIG_TEST_VMALLOC=m 614 - CONFIG_TEST_USER_COPY=m 615 615 CONFIG_TEST_BPF=m 616 616 CONFIG_TEST_BLACKHOLE_DEV=m 617 617 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/multi_defconfig

··· 621 621 CONFIG_CRYPTO_ECDH=m 622 622 CONFIG_CRYPTO_ECDSA=m 623 623 CONFIG_CRYPTO_ECRDSA=m 624 - CONFIG_CRYPTO_SM2=m 625 624 CONFIG_CRYPTO_CURVE25519=m 626 625 CONFIG_CRYPTO_AES=y 627 626 CONFIG_CRYPTO_AES_TI=m ··· 697 698 CONFIG_TEST_IDA=m 698 699 CONFIG_TEST_BITOPS=m 699 700 CONFIG_TEST_VMALLOC=m 700 - CONFIG_TEST_USER_COPY=m 701 701 CONFIG_TEST_BPF=m 702 702 CONFIG_TEST_BLACKHOLE_DEV=m 703 703 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/mvme147_defconfig

··· 507 507 CONFIG_CRYPTO_ECDH=m 508 508 CONFIG_CRYPTO_ECDSA=m 509 509 CONFIG_CRYPTO_ECRDSA=m 510 - CONFIG_CRYPTO_SM2=m 511 510 CONFIG_CRYPTO_CURVE25519=m 512 511 CONFIG_CRYPTO_AES=y 513 512 CONFIG_CRYPTO_AES_TI=m ··· 583 584 CONFIG_TEST_IDA=m 584 585 CONFIG_TEST_BITOPS=m 585 586 CONFIG_TEST_VMALLOC=m 586 - CONFIG_TEST_USER_COPY=m 587 587 CONFIG_TEST_BPF=m 588 588 CONFIG_TEST_BLACKHOLE_DEV=m 589 589 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/mvme16x_defconfig

··· 508 508 CONFIG_CRYPTO_ECDH=m 509 509 CONFIG_CRYPTO_ECDSA=m 510 510 CONFIG_CRYPTO_ECRDSA=m 511 - CONFIG_CRYPTO_SM2=m 512 511 CONFIG_CRYPTO_CURVE25519=m 513 512 CONFIG_CRYPTO_AES=y 514 513 CONFIG_CRYPTO_AES_TI=m ··· 584 585 CONFIG_TEST_IDA=m 585 586 CONFIG_TEST_BITOPS=m 586 587 CONFIG_TEST_VMALLOC=m 587 - CONFIG_TEST_USER_COPY=m 588 588 CONFIG_TEST_BPF=m 589 589 CONFIG_TEST_BLACKHOLE_DEV=m 590 590 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/q40_defconfig

··· 525 525 CONFIG_CRYPTO_ECDH=m 526 526 CONFIG_CRYPTO_ECDSA=m 527 527 CONFIG_CRYPTO_ECRDSA=m 528 - CONFIG_CRYPTO_SM2=m 529 528 CONFIG_CRYPTO_CURVE25519=m 530 529 CONFIG_CRYPTO_AES=y 531 530 CONFIG_CRYPTO_AES_TI=m ··· 601 602 CONFIG_TEST_IDA=m 602 603 CONFIG_TEST_BITOPS=m 603 604 CONFIG_TEST_VMALLOC=m 604 - CONFIG_TEST_USER_COPY=m 605 605 CONFIG_TEST_BPF=m 606 606 CONFIG_TEST_BLACKHOLE_DEV=m 607 607 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/sun3_defconfig

··· 506 506 CONFIG_CRYPTO_ECDH=m 507 507 CONFIG_CRYPTO_ECDSA=m 508 508 CONFIG_CRYPTO_ECRDSA=m 509 - CONFIG_CRYPTO_SM2=m 510 509 CONFIG_CRYPTO_CURVE25519=m 511 510 CONFIG_CRYPTO_AES=y 512 511 CONFIG_CRYPTO_AES_TI=m ··· 581 582 CONFIG_TEST_IDA=m 582 583 CONFIG_TEST_BITOPS=m 583 584 CONFIG_TEST_VMALLOC=m 584 - CONFIG_TEST_USER_COPY=m 585 585 CONFIG_TEST_BPF=m 586 586 CONFIG_TEST_BLACKHOLE_DEV=m 587 587 CONFIG_FIND_BIT_BENCHMARK=m

-2

arch/m68k/configs/sun3x_defconfig

··· 506 506 CONFIG_CRYPTO_ECDH=m 507 507 CONFIG_CRYPTO_ECDSA=m 508 508 CONFIG_CRYPTO_ECRDSA=m 509 - CONFIG_CRYPTO_SM2=m 510 509 CONFIG_CRYPTO_CURVE25519=m 511 510 CONFIG_CRYPTO_AES=y 512 511 CONFIG_CRYPTO_AES_TI=m ··· 582 583 CONFIG_TEST_IDA=m 583 584 CONFIG_TEST_BITOPS=m 584 585 CONFIG_TEST_VMALLOC=m 585 - CONFIG_TEST_USER_COPY=m 586 586 CONFIG_TEST_BPF=m 587 587 CONFIG_TEST_BLACKHOLE_DEV=m 588 588 CONFIG_FIND_BIT_BENCHMARK=m

+5 -10

arch/m68k/include/asm/cmpxchg.h

··· 3 3 #define __ARCH_M68K_CMPXCHG__ 4 4 5 5 #include <linux/irqflags.h> 6 + #include <linux/minmax.h> 6 7 7 8 #define __xg(type, x) ((volatile type *)(x)) 8 9 ··· 12 11 #ifndef CONFIG_RMW_INSNS 13 12 static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, int size) 14 13 { 15 - unsigned long flags, tmp; 14 + unsigned long flags; 16 15 17 16 local_irq_save(flags); 18 17 19 18 switch (size) { 20 19 case 1: 21 - tmp = *(u8 *)ptr; 22 - *(u8 *)ptr = x; 23 - x = tmp; 20 + swap(*(u8 *)ptr, x); 24 21 break; 25 22 case 2: 26 - tmp = *(u16 *)ptr; 27 - *(u16 *)ptr = x; 28 - x = tmp; 23 + swap(*(u16 *)ptr, x); 29 24 break; 30 25 case 4: 31 - tmp = *(u32 *)ptr; 32 - *(u32 *)ptr = x; 33 - x = tmp; 26 + swap(*(u32 *)ptr, x); 34 27 break; 35 28 default: 36 29 x = __invalid_xchg_size(x, ptr, size);

+1 -1

arch/m68k/kernel/process.c

··· 117 117 { 118 118 /* regs will be equal to current_pt_regs() */ 119 119 struct kernel_clone_args args = { 120 - .flags = regs->d1 & ~CSIGNAL, 120 + .flags = (u32)(regs->d1) & ~CSIGNAL, 121 121 .pidfd = (int __user *)regs->d3, 122 122 .child_tid = (int __user *)regs->d4, 123 123 .parent_tid = (int __user *)regs->d3,

Configure Feed

Configure Feed