Commit 3fc928dc authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'xtensa-20180211' of git://github.com/jcmvbkbc/linux-xtensa

Pull xtense fix from Max Filippov:
 "Build fix for xtensa architecture with KASAN enabled"

* tag 'xtensa-20180211' of git://github.com/jcmvbkbc/linux-xtensa:
  xtensa: fix build with KASAN
parents 60d7a21a f8d0cbf2
...@@ -10,6 +10,8 @@ ...@@ -10,6 +10,8 @@
#include <linux/sizes.h> #include <linux/sizes.h>
#include <asm/kmem_layout.h> #include <asm/kmem_layout.h>
#define KASAN_SHADOW_SCALE_SHIFT 3
/* Start of area covered by KASAN */ /* Start of area covered by KASAN */
#define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000) #define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000)
/* Start of the shadow map */ /* Start of the shadow map */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment