diff options
| author | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:00:58 -0500 |
|---|---|---|
| committer | Gary S. Robertson <gary.robertson@linaro.org> | 2015-09-09 17:00:58 -0500 |
| commit | b00df57e50e087151f4ca976ca2796ea105f68c1 (patch) | |
| tree | 041e22fd6831e8231d7405a445607979d1387775 /arch/x86/include/asm/kasan.h | |
| parent | 6f7cc80865bae836c963fe4d405fe27496024f6f (diff) | |
| parent | b7be2a1de3f5c0827a4f8ccb6a18342d9d4dc446 (diff) | |
Merge tag 'lsk-v4.1-15.08' of http://git.linaro.org/kernel/linux-linaro-stable into linux-linaro-lng-v4.1linux-lng-4.1.5-2015.09
LSK 15.08 v4.1
Diffstat (limited to 'arch/x86/include/asm/kasan.h')
| -rw-r--r-- | arch/x86/include/asm/kasan.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/x86/include/asm/kasan.h b/arch/x86/include/asm/kasan.h index 8b22422fbad8..74a2a8dc9908 100644 --- a/arch/x86/include/asm/kasan.h +++ b/arch/x86/include/asm/kasan.h @@ -14,15 +14,11 @@ #ifndef __ASSEMBLY__ -extern pte_t kasan_zero_pte[]; -extern pte_t kasan_zero_pmd[]; -extern pte_t kasan_zero_pud[]; - #ifdef CONFIG_KASAN -void __init kasan_map_early_shadow(pgd_t *pgd); +void __init kasan_early_init(void); void __init kasan_init(void); #else -static inline void kasan_map_early_shadow(pgd_t *pgd) { } +static inline void kasan_early_init(void) { } static inline void kasan_init(void) { } #endif |