Skip to content

L
linux
Commit 8202cc80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

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

Pull m68k updates from Geert Uytterhoeven:

 - Use swap() helper for __arch_xchg()

 - Fix kernel_clone_args.flags in m68k_clone()

 - defconfig updates

* tag 'm68k-for-v6.12-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k:
  m68k: defconfig: Update defconfigs for v6.11-rc1
  m68k: Fix kernel_clone_args.flags in m68k_clone()
  m68k: cmpxchg: Use swap() to improve code
parents fc1dc0d5 b90fae5d
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 35 deletions
arch/m68k/configs/amiga_defconfig
View file @ 8202cc80
...@@ -559,7 +559,6 @@ CONFIG_CRYPTO_DH=m ...@@ -559,7 +559,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -636,7 +635,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -636,7 +635,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/apollo_defconfig
View file @ 8202cc80
...@@ -516,7 +516,6 @@ CONFIG_CRYPTO_DH=m ...@@ -516,7 +516,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -593,7 +592,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -593,7 +592,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/atari_defconfig
View file @ 8202cc80
...@@ -536,7 +536,6 @@ CONFIG_CRYPTO_DH=m ...@@ -536,7 +536,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -613,7 +612,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -613,7 +612,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/bvme6000_defconfig
View file @ 8202cc80
...@@ -508,7 +508,6 @@ CONFIG_CRYPTO_DH=m ...@@ -508,7 +508,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -585,7 +584,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -585,7 +584,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/hp300_defconfig
View file @ 8202cc80
...@@ -518,7 +518,6 @@ CONFIG_CRYPTO_DH=m ...@@ -518,7 +518,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -595,7 +594,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -595,7 +594,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/mac_defconfig
View file @ 8202cc80
...@@ -535,7 +535,6 @@ CONFIG_CRYPTO_DH=m ...@@ -535,7 +535,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -612,7 +611,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -612,7 +611,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/multi_defconfig
View file @ 8202cc80
...@@ -621,7 +621,6 @@ CONFIG_CRYPTO_DH=m ...@@ -621,7 +621,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -698,7 +697,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -698,7 +697,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/mvme147_defconfig
View file @ 8202cc80
...@@ -507,7 +507,6 @@ CONFIG_CRYPTO_DH=m ...@@ -507,7 +507,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -584,7 +583,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -584,7 +583,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/mvme16x_defconfig
View file @ 8202cc80
...@@ -508,7 +508,6 @@ CONFIG_CRYPTO_DH=m ...@@ -508,7 +508,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -585,7 +584,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -585,7 +584,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/q40_defconfig
View file @ 8202cc80
...@@ -525,7 +525,6 @@ CONFIG_CRYPTO_DH=m ...@@ -525,7 +525,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -602,7 +601,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -602,7 +601,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/sun3_defconfig
View file @ 8202cc80
...@@ -506,7 +506,6 @@ CONFIG_CRYPTO_DH=m ...@@ -506,7 +506,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -582,7 +581,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -582,7 +581,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/configs/sun3x_defconfig
View file @ 8202cc80
...@@ -506,7 +506,6 @@ CONFIG_CRYPTO_DH=m ...@@ -506,7 +506,6 @@ CONFIG_CRYPTO_DH=m
CONFIG_CRYPTO_ECDH=m CONFIG_CRYPTO_ECDH=m
CONFIG_CRYPTO_ECDSA=m CONFIG_CRYPTO_ECDSA=m
CONFIG_CRYPTO_ECRDSA=m CONFIG_CRYPTO_ECRDSA=m
CONFIG_CRYPTO_SM2=m
CONFIG_CRYPTO_CURVE25519=m CONFIG_CRYPTO_CURVE25519=m
CONFIG_CRYPTO_AES=y CONFIG_CRYPTO_AES=y
CONFIG_CRYPTO_AES_TI=m CONFIG_CRYPTO_AES_TI=m
...@@ -583,7 +582,6 @@ CONFIG_TEST_RHASHTABLE=m ...@@ -583,7 +582,6 @@ CONFIG_TEST_RHASHTABLE=m
CONFIG_TEST_IDA=m CONFIG_TEST_IDA=m
CONFIG_TEST_BITOPS=m CONFIG_TEST_BITOPS=m
CONFIG_TEST_VMALLOC=m CONFIG_TEST_VMALLOC=m
CONFIG_TEST_USER_COPY=m
CONFIG_TEST_BPF=m CONFIG_TEST_BPF=m
CONFIG_TEST_BLACKHOLE_DEV=m CONFIG_TEST_BLACKHOLE_DEV=m
CONFIG_FIND_BIT_BENCHMARK=m CONFIG_FIND_BIT_BENCHMARK=m
......
arch/m68k/include/asm/cmpxchg.h
View file @ 8202cc80
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
#define __ARCH_M68K_CMPXCHG__ #define __ARCH_M68K_CMPXCHG__
#include <linux/irqflags.h> #include <linux/irqflags.h>
#include <linux/minmax.h>
#define __xg(type, x) ((volatile type *)(x)) #define __xg(type, x) ((volatile type *)(x))
...@@ -11,25 +12,19 @@ extern unsigned long __invalid_xchg_size(unsigned long, volatile void *, int); ...@@ -11,25 +12,19 @@ extern unsigned long __invalid_xchg_size(unsigned long, volatile void *, int);
#ifndef CONFIG_RMW_INSNS #ifndef CONFIG_RMW_INSNS
static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, int size) static inline unsigned long __arch_xchg(unsigned long x, volatile void * ptr, int size)
{ {
unsigned long flags, tmp; unsigned long flags;
local_irq_save(flags); local_irq_save(flags);
switch (size) { switch (size) {
case 1: case 1:
tmp = *(u8 *)ptr; swap(*(u8 *)ptr, x);
*(u8 *)ptr = x;
x = tmp;
break; break;
case 2: case 2:
tmp = *(u16 *)ptr; swap(*(u16 *)ptr, x);
*(u16 *)ptr = x;
x = tmp;
break; break;
case 4: case 4:
tmp = *(u32 *)ptr; swap(*(u32 *)ptr, x);
*(u32 *)ptr = x;
x = tmp;
break; break;
default: default:
x = __invalid_xchg_size(x, ptr, size); x = __invalid_xchg_size(x, ptr, size);
......
arch/m68k/kernel/process.c
View file @ 8202cc80
...@@ -117,7 +117,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs) ...@@ -117,7 +117,7 @@ asmlinkage int m68k_clone(struct pt_regs *regs)
{ {
/* regs will be equal to current_pt_regs() */ /* regs will be equal to current_pt_regs() */
struct kernel_clone_args args = { struct kernel_clone_args args = {
.flags = regs->d1 & ~CSIGNAL, .flags = (u32)(regs->d1) & ~CSIGNAL,
.pidfd = (int __user *)regs->d3, .pidfd = (int __user *)regs->d3,
.child_tid = (int __user *)regs->d4, .child_tid = (int __user *)regs->d4,
.parent_tid = (int __user *)regs->d3, .parent_tid = (int __user *)regs->d3,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7