Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'arc-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta:
- Assorted fixes
* tag 'arc-5.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc:
ARC: remove redundant READ_ONCE() in cmpxchg loop
ARC: atomic: cleanup atomic-llsc definitions
arc: drop definitions of pgd_index() and pgd_offset{, _k}() entirely
ARC: dts: align SPI NOR node name with dtschema
ARC: Remove a redundant memset()
ARC: fix typos in comments
ARC: entry: fix syscall_trace_exit argument
+24
-27
+1
-1
arch/arc/boot/dts/hsdk.dts
+1
-1
arch/arc/boot/dts/hsdk.dts
+16
-16
arch/arc/include/asm/atomic-llsc.h
+16
-16
arch/arc/include/asm/atomic-llsc.h
···
5
5
6
6
#define arch_atomic_set(v, i) WRITE_ONCE(((v)->counter), (i))
7
7
8
-
#define ATOMIC_OP(op, c_op, asm_op) \
8
+
#define ATOMIC_OP(op, asm_op) \
9
9
static inline void arch_atomic_##op(int i, atomic_t *v) \
10
10
{ \
11
11
unsigned int val; \
···
21
21
: "cc"); \
22
22
} \
23
23
24
-
#define ATOMIC_OP_RETURN(op, c_op, asm_op) \
24
+
#define ATOMIC_OP_RETURN(op, asm_op) \
25
25
static inline int arch_atomic_##op##_return_relaxed(int i, atomic_t *v) \
26
26
{ \
27
27
unsigned int val; \
···
42
42
#define arch_atomic_add_return_relaxed arch_atomic_add_return_relaxed
43
43
#define arch_atomic_sub_return_relaxed arch_atomic_sub_return_relaxed
44
44
45
-
#define ATOMIC_FETCH_OP(op, c_op, asm_op) \
45
+
#define ATOMIC_FETCH_OP(op, asm_op) \
46
46
static inline int arch_atomic_fetch_##op##_relaxed(int i, atomic_t *v) \
47
47
{ \
48
48
unsigned int val, orig; \
···
69
69
#define arch_atomic_fetch_or_relaxed arch_atomic_fetch_or_relaxed
70
70
#define arch_atomic_fetch_xor_relaxed arch_atomic_fetch_xor_relaxed
71
71
72
-
#define ATOMIC_OPS(op, c_op, asm_op) \
73
-
ATOMIC_OP(op, c_op, asm_op) \
74
-
ATOMIC_OP_RETURN(op, c_op, asm_op) \
75
-
ATOMIC_FETCH_OP(op, c_op, asm_op)
72
+
#define ATOMIC_OPS(op, asm_op) \
73
+
ATOMIC_OP(op, asm_op) \
74
+
ATOMIC_OP_RETURN(op, asm_op) \
75
+
ATOMIC_FETCH_OP(op, asm_op)
76
76
77
-
ATOMIC_OPS(add, +=, add)
78
-
ATOMIC_OPS(sub, -=, sub)
77
+
ATOMIC_OPS(add, add)
78
+
ATOMIC_OPS(sub, sub)
79
79
80
80
#undef ATOMIC_OPS
81
-
#define ATOMIC_OPS(op, c_op, asm_op) \
82
-
ATOMIC_OP(op, c_op, asm_op) \
83
-
ATOMIC_FETCH_OP(op, c_op, asm_op)
81
+
#define ATOMIC_OPS(op, asm_op) \
82
+
ATOMIC_OP(op, asm_op) \
83
+
ATOMIC_FETCH_OP(op, asm_op)
84
84
85
-
ATOMIC_OPS(and, &=, and)
86
-
ATOMIC_OPS(andnot, &= ~, bic)
87
-
ATOMIC_OPS(or, |=, or)
88
-
ATOMIC_OPS(xor, ^=, xor)
85
+
ATOMIC_OPS(and, and)
86
+
ATOMIC_OPS(andnot, bic)
87
+
ATOMIC_OPS(or, or)
88
+
ATOMIC_OPS(xor, xor)
89
89
90
90
#define arch_atomic_andnot arch_atomic_andnot
91
91
-3
arch/arc/include/asm/pgtable-levels.h
-3
arch/arc/include/asm/pgtable-levels.h
···
98
98
/*
99
99
* 1st level paging: pgd
100
100
*/
101
-
#define pgd_index(addr) ((addr) >> PGDIR_SHIFT)
102
-
#define pgd_offset(mm, addr) (((mm)->pgd) + pgd_index(addr))
103
-
#define pgd_offset_k(addr) pgd_offset(&init_mm, addr)
104
101
#define pgd_ERROR(e) \
105
102
pr_crit("%s:%d: bad pgd %08lx.\n", __FILE__, __LINE__, pgd_val(e))
106
103
+1
-2
arch/arc/kernel/disasm.c
+1
-2
arch/arc/kernel/disasm.c
···
366
366
case op_SP: /* LD_S|LDB_S b,[sp,u7], ST_S|STB_S b,[sp,u7] */
367
367
/* note: we are ignoring possibility of:
368
368
* ADD_S, SUB_S, PUSH_S, POP_S as these should not
369
-
* cause unaliged exception anyway */
369
+
* cause unaligned exception anyway */
370
370
state->write = BITS(state->words[0], 6, 6);
371
371
state->zz = BITS(state->words[0], 5, 5);
372
372
if (state->zz)
···
503
503
{
504
504
struct disasm_state instr;
505
505
506
-
memset(&instr, 0, sizeof(struct disasm_state));
507
506
disasm_instr(pc, &instr, 0, regs, cregs);
508
507
509
508
*next_pc = pc + instr.instr_len;
+1
arch/arc/kernel/entry.S
+1
arch/arc/kernel/entry.S
···
196
196
st r0, [sp, PT_r0] ; sys call return value in pt_regs
197
197
198
198
;POST Sys Call Ptrace Hook
199
+
mov r0, sp ; pt_regs needed
199
200
bl @syscall_trace_exit
200
201
b ret_from_exception ; NOT ret_from_system_call at is saves r0 which
201
202
; we'd done before calling post hook above
+1
-1
arch/arc/kernel/signal.c
+1
-1
arch/arc/kernel/signal.c
···
319
319
regs->ret = (unsigned long)ksig->ka.sa.sa_handler;
320
320
321
321
/*
322
-
* handler returns using sigreturn stub provided already by userpsace
322
+
* handler returns using sigreturn stub provided already by userspace
323
323
* If not, nuke the process right away
324
324
*/
325
325
if(!(ksig->ka.sa.sa_flags & SA_RESTORER))
+2
-2
arch/arc/kernel/smp.c
+2
-2
arch/arc/kernel/smp.c
···
35
35
36
36
struct plat_smp_ops __weak plat_smp_ops;
37
37
38
-
/* XXX: per cpu ? Only needed once in early seconday boot */
38
+
/* XXX: per cpu ? Only needed once in early secondary boot */
39
39
struct task_struct *secondary_idle_tsk;
40
40
41
41
/* Called from start_kernel */
···
274
274
* and read back old value
275
275
*/
276
276
do {
277
-
new = old = READ_ONCE(*ipi_data_ptr);
277
+
new = old = *ipi_data_ptr;
278
278
new |= 1U << msg;
279
279
} while (cmpxchg(ipi_data_ptr, old, new) != old);
280
280
+1
-1
arch/arc/kernel/unaligned.c
+1
-1
arch/arc/kernel/unaligned.c
+1
-1
arch/arc/mm/cache.c
+1
-1
arch/arc/mm/cache.c
···
401
401
{
402
402
if (op == OP_FLUSH_N_INV) {
403
403
/* Dcache provides 2 cmd: FLUSH or INV
404
-
* INV inturn has sub-modes: DISCARD or FLUSH-BEFORE
404
+
* INV in turn has sub-modes: DISCARD or FLUSH-BEFORE
405
405
* flush-n-inv is achieved by INV cmd but with IM=1
406
406
* So toggle INV sub-mode depending on op request and default
407
407
*/