Skip to content

Commit

Permalink
Merge tag 'xtensa-20180211' of git://github.com/jcmvbkbc/linux-xtensa
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Linus Torvalds committed Feb 11, 2018
2 parents 60d7a21 + f8d0cbf commit 3fc928d
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions arch/xtensa/include/asm/kasan.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
#include <linux/sizes.h>
#include <asm/kmem_layout.h>

#define KASAN_SHADOW_SCALE_SHIFT 3

/* Start of area covered by KASAN */
#define KASAN_START_VADDR __XTENSA_UL_CONST(0x90000000)
/* Start of the shadow map */
Expand Down

0 comments on commit 3fc928d

Please sign in to comment.