Commit 54e9ea3c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux 

Pull arm64 fixes from Will Deacon:

 - Fix cleaning of vDSO directories

 - Ensure CNTHCTL_EL2 is fully initialised when booting at EL2

* tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux:
  arm64: initialize all of CNTHCTL_EL2
  arm64: clean vdso & vdso32 files
parents b7d184d3 bde8fff8

arch/arm64/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -183,6 +183,8 @@ endif 
# We use MRPROPER_FILES and CLEAN_FILES now

archclean:

	$(Q)$(MAKE) $(clean)=$(boot)

	$(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso

	$(Q)$(MAKE) $(clean)=arch/arm64/kernel/vdso32



ifeq ($(KBUILD_EXTMOD),)

# We need to generate vdso-offsets.h before compiling certain files in kernel/.

arch/arm64/include/asm/el2_setup.h

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ 
 * EL2.

 */

.macro __init_el2_timers

	mrs	x0, cnthctl_el2

	orr	x0, x0, #3			// Enable EL1 physical timers

	mov	x0, #3				// Enable EL1 physical timers

	msr	cnthctl_el2, x0

	msr	cntvoff_el2, xzr		// Clear virtual offset

.endm