Merge remote-tracking branch 'input/next'

[karo-tx-linux.git] / arch / arm64 / kernel / image.h

diff --git a/arch/arm64/kernel/image.h b/arch/arm64/kernel/image.h
index e083af0dd54661a5ea3ec9cf161e74894a3c74e2..bc2abb8b1599576ae2dec02bce0c46c48fc707dd 100644 (file)
--- a/arch/arm64/kernel/image.h
+++ b/arch/arm64/kernel/image.h
@@ -47,7 +47,10 @@
 #define __HEAD_FLAG_BE 0
 #endif
 
-#define __HEAD_FLAGS   (__HEAD_FLAG_BE << 0)
+#define __HEAD_FLAG_PAGE_SIZE ((PAGE_SHIFT - 10) / 2)
+
+#define __HEAD_FLAGS   ((__HEAD_FLAG_BE << 0) |        \
+                        (__HEAD_FLAG_PAGE_SIZE << 1))
 
 /*
  * These will output as part of the Image header, which should be little-endian
@@ -80,6 +83,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;