Commit 8c05f3b9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:
 "ARM development updates:

   - more unified assembly conversions for clang

   - drop obsolete -mauto-it assembler option

   - remove arm_memory_present in preference to the generic version

   - remove unused asm/limits.h header

   - vdso linker update

  We tried to make the assembler warn if unified syntax was not used,
  but unfortunately older versions of GCC warn, so the commit had to be
  reverted"

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  Revert "ARM: 8846/1: warn if divided syntax assembler is used"
  ARM: 8858/1: vdso: use $(LD) instead of $(CC) to link VDSO
  ARM: 8855/1: remove unused <asm/limits.h>
  ARM: 8850/1: use memblocks_present
  ARM: 8854/1: drop -mauto-it
  ARM: 8846/1: warn if divided syntax assembler is used
  ARM: 8853/1: drop WASM to work around LLVM issue
  ARM: 8852/1: uaccess: use unified assembler language syntax
  ARM: 8851/1: add TUSERCOND() macro for conditional postfix
parents ab02888e b752bb40

arch/arm/Makefile

+1 −2
Original line number Diff line number Diff line
@@ -116,8 +116,7 @@ endif 
AFLAGS_NOWARN	:=$(call as-option,-Wa$(comma)-mno-warn-deprecated,-Wa$(comma)-W)



ifeq ($(CONFIG_THUMB2_KERNEL),y)

AFLAGS_AUTOIT	:=$(call as-option,-Wa$(comma)-mimplicit-it=always,-Wa$(comma)-mauto-it)

CFLAGS_ISA	:=-mthumb $(AFLAGS_AUTOIT) $(AFLAGS_NOWARN)

CFLAGS_ISA	:=-mthumb -Wa,-mimplicit-it=always $(AFLAGS_NOWARN)

AFLAGS_ISA	:=$(CFLAGS_ISA) -Wa$(comma)-mthumb

# Work around buggy relocation from gas if requested:

ifeq ($(CONFIG_THUMB2_AVOID_R_ARM_THM_JUMP11),y)

arch/arm/include/asm/domain.h

+4 −2
Original line number Diff line number Diff line
@@ -133,9 +133,11 @@ static inline void modify_domain(unsigned dom, unsigned type) { } 
 * instructions (inline assembly)

 */

#ifdef CONFIG_CPU_USE_DOMAINS

#define TUSER(instr)	#instr "t"

#define TUSER(instr)		TUSERCOND(instr, )

#define TUSERCOND(instr, cond)	#instr "t" #cond

#else

#define TUSER(instr)	#instr

#define TUSER(instr)		TUSERCOND(instr, )

#define TUSERCOND(instr, cond)	#instr #cond

#endif



#else /* __ASSEMBLY__ */

arch/arm/include/asm/futex.h

+2 −1
Original line number Diff line number Diff line
@@ -110,10 +110,11 @@ futex_atomic_cmpxchg_inatomic(u32 *uval, u32 __user *uaddr, 
	preempt_disable();

	__ua_flags = uaccess_save_and_enable();

	__asm__ __volatile__("@futex_atomic_cmpxchg_inatomic\n"

	"	.syntax unified\n"

	"1:	" TUSER(ldr) "	%1, [%4]\n"

	"	teq	%1, %2\n"

	"	it	eq	@ explicit IT needed for the 2b label\n"

	"2:	" TUSER(streq) "	%3, [%4]\n"

	"2:	" TUSERCOND(str, eq) "	%3, [%4]\n"

	__futex_atomic_ex_table("%5")

	: "+r" (ret), "=&r" (val)

	: "r" (oldval), "r" (newval), "r" (uaddr), "Ir" (-EFAULT)

arch/arm/include/asm/limits.h

deleted100644 → 0
+0 −12
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#ifndef __ASM_PIPE_H

#define __ASM_PIPE_H



#ifndef PAGE_SIZE

#include <asm/page.h>

#endif



#define PIPE_BUF	PAGE_SIZE



#endif

arch/arm/include/asm/processor.h

+2 −2
Original line number Diff line number Diff line
@@ -135,8 +135,8 @@ static inline void prefetchw(const void *ptr) 
	__asm__ __volatile__(

		".arch_extension	mp\n"

		__ALT_SMP_ASM(

			WASM(pldw)		"\t%a0",

			WASM(pld)		"\t%a0"

			"pldw\t%a0",

			"pld\t%a0"

		)

		:: "p" (ptr));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE