diff options
| author | Xishi Qiu <qiuxishi@huawei.com> | 2016-06-27 14:15:28 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-06-28 11:29:39 +0800 |
| commit | 374c08cb56fa2de1ceb97c5301cd4a1e8ad5560c (patch) | |
| tree | 618294fb2705d4110a4a0ec30ae211803ad007bb | |
| parent | bbc51cbdaf93f5938014345452cd1380fb25a221 (diff) | |
arm64/kasan: add the conflict in "arm64: add KASAN support"
After backport patch "arm64/efi: isolate EFI stub from the kernel proper",
It will cause build error in LSK, that's because we remove the conflict when
backport patch "arm64: add KASAN support", so add the conflict code again.
Signed-off-by: Xishi Qiu <qiuxishi@huawei.com>
| -rw-r--r-- | arch/arm64/kernel/image.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h index e083af0dd546..6eb8fee93321 100644 --- a/arch/arm64/kernel/image.h +++ b/arch/arm64/kernel/image.h @@ -80,6 +80,12 @@ __efistub_strcmp = __pi_strcmp; __efistub_strncmp = __pi_strncmp; __efistub___flush_dcache_area = __pi___flush_dcache_area; +#ifdef CONFIG_KASAN +__efistub___memcpy = __pi_memcpy; +__efistub___memmove = __pi_memmove; +__efistub___memset = __pi_memset; +#endif + __efistub__text = _text; __efistub__end = _end; __efistub__edata = _edata; |