diff options
-rw-r--r-- | mm/page_cgroup.c | 7 | ||||
-rw-r--r-- | mm/slab.c | 2 |
2 files changed, 2 insertions, 7 deletions
diff --git a/mm/page_cgroup.c b/mm/page_cgroup.c index 5bffada..59a3cd4 100644 --- a/mm/page_cgroup.c +++ b/mm/page_cgroup.c @@ -243,12 +243,7 @@ static int __meminit page_cgroup_callback(struct notifier_block *self, break; } - if (ret) - ret = notifier_from_errno(ret); - else - ret = NOTIFY_OK; - - return ret; + return notifier_from_errno(ret); } #endif @@ -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 */ |