提交 a8cc095e 编写于 作者: A Andrey Ryabinin 提交者: Xie XiuQi

include/linux/linkage.h: align weak symbols

mainline inclusion
from mainline-4.20
commit 74f213ea25b
category: bugfix
bugzilla: 5689
CVE: NA

-------------------------------------------------

Since WEAK() supposed to be used instead of ENTRY() to define weak
symbols, but unlike ENTRY() it doesn't have ALIGN directive.  It seems
there is no actual reason to not have, so let's add ALIGN to WEAK() too.

Link: http://lkml.kernel.org/r/20180920135631.23833-1-aryabinin@virtuozzo.comSigned-off-by: NAndrey Ryabinin <aryabinin@virtuozzo.com>
Will Deacon <will.deacon@arm.com>, Catalin Marinas <catalin.marinas@arm.com>
Cc: Kyeongdon Kim <kyeongdon.kim@lge.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: Alexander Potapenko <glider@google.com>
Cc: Dmitry Vyukov <dvyukov@google.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Signed-off-by: NAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: NLinus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 74f213ea25b99fddcf34cbe07dabdb01136bcd86)
Signed-off-by: NXie XiuQi <xiexiuqi@huawei.com>
Reviewed-by: NCheng Jian <cj.chengjian@huawei.com>
Signed-off-by: NYang Yingliang <yangyingliang@huawei.com>
上级 611690fd
...@@ -90,6 +90,7 @@ ...@@ -90,6 +90,7 @@
#ifndef WEAK #ifndef WEAK
#define WEAK(name) \ #define WEAK(name) \
.weak name ASM_NL \ .weak name ASM_NL \
ALIGN ASM_NL \
name: name:
#endif #endif
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册