projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-4.9/libnvdimm' into libnvdimm-for-next
[cascardo/linux.git]
/
arch
/
x86
/
mm
/
kaslr.c
diff --git
a/arch/x86/mm/kaslr.c
b/arch/x86/mm/kaslr.c
index
ec8654f
..
bda8d5e
100644
(file)
--- a/
arch/x86/mm/kaslr.c
+++ b/
arch/x86/mm/kaslr.c
@@
-77,7
+77,7
@@
static inline unsigned long get_padding(struct kaslr_memory_region *region)
*/
static inline bool kaslr_memory_enabled(void)
{
- return kaslr_enabled() && !
config_enabled
(CONFIG_KASAN);
+ return kaslr_enabled() && !
IS_ENABLED
(CONFIG_KASAN);
}
/* Initialize base and padding for each memory region randomized with KASLR */