projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[firefly-linux-kernel-4.4.55.git]
/
mm
/
slab.c
diff --git
a/mm/slab.c
b/mm/slab.c
index a18ba57517af469eac32ef7c572327c6bed7668a..568803f121a8769b73b5d76c7b49ea82b3f8e10f 100644
(file)
--- a/
mm/slab.c
+++ b/
mm/slab.c
@@
-1390,7
+1390,7
@@
static int __meminit slab_memory_callback(struct notifier_block *self,
break;
}
out:
- return
ret ? notifier_from_errno(ret) : NOTIFY_OK
;
+ return
notifier_from_errno(ret)
;
}
#endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */