diff options
| author | Olof Johansson <olof@lixom.net> | 2020-02-11 23:48:22 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2020-02-11 23:48:22 +0100 |
| commit | 1b32b72b27341cafe5f1c8e3ebd26387a8faf664 (patch) | |
| tree | 6a12892ac6d64bc6bff072a37746244d3edd34fb /arch/arm64 | |
| parent | Merge tag 'juno-fix-5.6' of git://git.kernel.org/pub/scm/linux/kernel/git/sud... (diff) | |
| parent | Linux 5.6-rc1 (diff) | |
| download | linux-1b32b72b27341cafe5f1c8e3ebd26387a8faf664.tar.xz linux-1b32b72b27341cafe5f1c8e3ebd26387a8faf664.zip | |
Merge tag 'v5.6-rc1' into arm/fixes
Linux 5.6-rc1
Merging in to avoid fixes pull request diffstats being noisy due to
being based on -rc1.
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm64')
| -rw-r--r-- | arch/arm64/include/asm/arch_gicv3.h | 8 | ||||
| -rw-r--r-- | arch/arm64/kernel/vdso32/Makefile | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm64/include/asm/arch_gicv3.h b/arch/arm64/include/asm/arch_gicv3.h index 4750fc8030c3..25fec4bde43a 100644 --- a/arch/arm64/include/asm/arch_gicv3.h +++ b/arch/arm64/include/asm/arch_gicv3.h @@ -140,11 +140,11 @@ static inline u32 gic_read_rpr(void) #define gicr_write_pendbaser(v, c) writeq_relaxed(v, c) #define gicr_read_pendbaser(c) readq_relaxed(c) -#define gits_write_vpropbaser(v, c) writeq_relaxed(v, c) -#define gits_read_vpropbaser(c) readq_relaxed(c) +#define gicr_write_vpropbaser(v, c) writeq_relaxed(v, c) +#define gicr_read_vpropbaser(c) readq_relaxed(c) -#define gits_write_vpendbaser(v, c) writeq_relaxed(v, c) -#define gits_read_vpendbaser(c) readq_relaxed(c) +#define gicr_write_vpendbaser(v, c) writeq_relaxed(v, c) +#define gicr_read_vpendbaser(c) readq_relaxed(c) static inline bool gic_prio_masking_enabled(void) { diff --git a/arch/arm64/kernel/vdso32/Makefile b/arch/arm64/kernel/vdso32/Makefile index 76b327f88fbb..04df57b43cb1 100644 --- a/arch/arm64/kernel/vdso32/Makefile +++ b/arch/arm64/kernel/vdso32/Makefile @@ -115,9 +115,9 @@ VDSO_LDFLAGS += $(call cc32-ldoption,-fuse-ld=bfd) # Borrow vdsomunge.c from the arm vDSO # We have to use a relative path because scripts/Makefile.host prefixes -# $(hostprogs-y) with $(obj) +# $(hostprogs) with $(obj) munge := ../../../arm/vdso/vdsomunge -hostprogs-y := $(munge) +hostprogs := $(munge) c-obj-vdso := note.o c-obj-vdso-gettimeofday := vgettimeofday.o |