aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/kasan.h
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-08-27 20:30:46 +0100
committerMark Brown <broonie@kernel.org>2015-08-27 20:30:46 +0100
commit2002e90412df17ef7f714be62ed96a3c80b2f907 (patch)
tree3dd03684f7436320ec64f9c702b5d057a25dca17 /arch/x86/include/asm/kasan.h
parent02a9547e9b3f10d73fde66f52fc8b2a375a300cd (diff)
parent3b7ce99748f0d006f9d1aa85709872e7b46787f7 (diff)
downloadkernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.gz
kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.tar.bz2
kernel_replicant_linux-2002e90412df17ef7f714be62ed96a3c80b2f907.zip
Merge branch 'topic/ics43432' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-gtm601
Diffstat (limited to 'arch/x86/include/asm/kasan.h')
-rw-r--r--arch/x86/include/asm/kasan.h8
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