openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

- Remove vdso code trying to free unallocated pages. 

- Delete the space separator in the __emit_inst macro as it breaks the
   clang integrated assembler.
 -----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCgAdFiEE5RElWfyWxS+3PLO2a9axLQDIXvEFAl6Z4L8ACgkQa9axLQDI
 XvHoNw/+M22K2NSdIG1/6XOlB96XlfbbCB5Ak30VJiIz4tnt2wSYv8CeuvCrWkdY
 u8hs3w60kPlk2uP48GyBGwZVxoGkQDQs5wZOZTkTgsa+uR3af+mJK0IWbbW04u7o
 2QRvkZCaQx435QxqKY/nNqArzzGo/90GL5tio3jNdL47iBAvpI7t/hxEIuQPvczh
 MRVvGaGQtODXsQPUdCWcnrziPG7o0dHAmGnVUuReiyvz67zf93tR33Xudw3/sQWT
 /nFnE9/WfsyomTL7jI8JndlT1bnZ9SASeyrYm881rypvMYofyCcvOao+0KqcoTnR
 6yAtcAHQttESTekti0/gC75859RWFUMcpTbCuvsG4PwM/H5Yx89cTwulAX9uCA3m
 qEnGcJ+F8jYTkbBau0edl6pYaFmNqbOtL1vbfO+ZLeBZnFspFcbqWmDJe+GgRAar
 dWwD3bR/8GCsAM53rUF+1lrH7F5MC/JWKWTjAyQQNwmMViIFDycB8xFyVdk0l3P7
 UEbX+1TqVz8m2cyRWESDAWJ+SI+WJcP+gg16w1WMuj2RGooPVQuBmERwmcxKwLkS
 OOQmc4EySHEj9JOnhEquHMxeAQOn0giMf9x8TwiFmLPOAdwWRlG+dXwmEMiYRbHu
 SVDL1lcYVurfa12v2cfihnXdOGqKWf+UReWjBsEaohANFK0YuUc=
 =2DjJ
 -----END PGP SIGNATURE-----

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

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
This commit is contained in:
Linus Torvalds 2020-04-17 10:39:43 -07:00
parent d0a4ebe7d1 c9a4ef6645
commit 95988fbc7c
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/arm64/include/asm/sysreg.h
View File

@ -49,7 +49,9 @@
#ifndef CONFIG_BROKEN_GAS_INST
#ifdef __ASSEMBLY__
#define __emit_inst(x) .inst (x)
// 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"
#endif

13
arch/arm64/kernel/vdso.c
View File

@ -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)