projects
/
profile
/
ivi
/
kernel-adaptation-intel-automotive.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/fixmap' into x86/devel
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
mm
/
slob.c
diff --git
a/mm/slob.c
b/mm/slob.c
index
6038cba
..
a3ad667
100644
(file)
--- a/
mm/slob.c
+++ b/
mm/slob.c
@@
-469,8
+469,9
@@
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
return ZERO_SIZE_PTR;
m = slob_alloc(size + align, gfp, align, node);
- if (m)
- *m = size;
+ if (!m)
+ return NULL;
+ *m = size;
return (void *)m + align;
} else {
void *ret;