Merge tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux (95988fbc) · Commits · 戴 / test

Pull arm64 fixes from Catalin Marinas: - Remove vdso code trying to free unallocated pages. - Delete the space separator in the __emit_inst macro as it breaks the clang integrated assembler. * tag 'arm64-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux: arm64: Delete the space separator in __emit_inst arm64: vdso: don't free unallocated pages

arch/arm64/include/asm/sysreg.h

+3 −1

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@
		#ifndef CONFIG_BROKEN_GAS_INST

		#ifdef __ASSEMBLY__
		// The space separator is omitted so that __emit_inst(x) can be parsed as
		// either an assembler directive or an assembler macro argument.
		#define __emit_inst(x) .inst(x)
		#else
		#define __emit_inst(x) ".inst " __stringify((x)) "\n\t"

arch/arm64/kernel/vdso.c

+1 −12

Original line number	Diff line number	Diff line
		@@ -260,18 +260,7 @@ static int __aarch32_alloc_vdso_pages(void)
		if (ret)
		return ret;

		ret = aarch32_alloc_kuser_vdso_page();
		if (ret) {
		unsigned long c_vvar =
		(unsigned long)page_to_virt(aarch32_vdso_pages[C_VVAR]);
		unsigned long c_vdso =
		(unsigned long)page_to_virt(aarch32_vdso_pages[C_VDSO]);

		free_page(c_vvar);
		free_page(c_vdso);
		}

		return ret;
		return aarch32_alloc_kuser_vdso_page();
		}
		#else
		static int __aarch32_alloc_vdso_pages(void)

Admin message