diff options
| author | Will Deacon <will@kernel.org> | 2019-08-30 12:55:39 +0100 |
|---|---|---|
| committer | Will Deacon <will@kernel.org> | 2019-08-30 12:55:39 +0100 |
| commit | 61b7cddfe861f239bf39ab19a065e29b58153a80 (patch) | |
| tree | e4930ac4950b72203cfebfc3b6565b346747b33f /arch/arm64/lib | |
| parent | ac12cf85d682a2c1948210c65f7fb21ef01dd9f6 (diff) | |
| parent | 03adcbd996be7ce81cac793b1511406a7a4df117 (diff) | |
| download | lwn-61b7cddfe861f239bf39ab19a065e29b58153a80.tar.gz lwn-61b7cddfe861f239bf39ab19a065e29b58153a80.zip | |
Merge branch 'for-next/atomics' into for-next/core
* for-next/atomics: (10 commits)
Rework LSE instruction selection to use static keys instead of alternatives
Diffstat (limited to 'arch/arm64/lib')
| -rw-r--r-- | arch/arm64/lib/Makefile | 19 | ||||
| -rw-r--r-- | arch/arm64/lib/atomic_ll_sc.c | 3 |
2 files changed, 0 insertions, 22 deletions
diff --git a/arch/arm64/lib/Makefile b/arch/arm64/lib/Makefile index f182ccb0438e..c21b936dc01d 100644 --- a/arch/arm64/lib/Makefile +++ b/arch/arm64/lib/Makefile @@ -11,25 +11,6 @@ CFLAGS_REMOVE_xor-neon.o += -mgeneral-regs-only CFLAGS_xor-neon.o += -ffreestanding endif -# Tell the compiler to treat all general purpose registers (with the -# exception of the IP registers, which are already handled by the caller -# in case of a PLT) as callee-saved, which allows for efficient runtime -# patching of the bl instruction in the caller with an atomic instruction -# when supported by the CPU. Result and argument registers are handled -# correctly, based on the function prototype. -lib-$(CONFIG_ARM64_LSE_ATOMICS) += atomic_ll_sc.o -CFLAGS_atomic_ll_sc.o := -ffixed-x1 -ffixed-x2 \ - -ffixed-x3 -ffixed-x4 -ffixed-x5 -ffixed-x6 \ - -ffixed-x7 -fcall-saved-x8 -fcall-saved-x9 \ - -fcall-saved-x10 -fcall-saved-x11 -fcall-saved-x12 \ - -fcall-saved-x13 -fcall-saved-x14 -fcall-saved-x15 \ - -fcall-saved-x18 -fomit-frame-pointer -CFLAGS_REMOVE_atomic_ll_sc.o := $(CC_FLAGS_FTRACE) -GCOV_PROFILE_atomic_ll_sc.o := n -KASAN_SANITIZE_atomic_ll_sc.o := n -KCOV_INSTRUMENT_atomic_ll_sc.o := n -UBSAN_SANITIZE_atomic_ll_sc.o := n - lib-$(CONFIG_ARCH_HAS_UACCESS_FLUSHCACHE) += uaccess_flushcache.o obj-$(CONFIG_CRC32) += crc32.o diff --git a/arch/arm64/lib/atomic_ll_sc.c b/arch/arm64/lib/atomic_ll_sc.c deleted file mode 100644 index b0c538b0da28..000000000000 --- a/arch/arm64/lib/atomic_ll_sc.c +++ /dev/null @@ -1,3 +0,0 @@ -#include <asm/atomic.h> -#define __ARM64_IN_ATOMIC_IMPL -#include <asm/atomic_ll_sc.h> |