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 5bffada7cde1..59a3cd4c799d 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, | |||
243 | break; | 243 | break; |
244 | } | 244 | } |
245 | 245 | ||
246 | if (ret) | 246 | return notifier_from_errno(ret); |
247 | ret = notifier_from_errno(ret); | ||
248 | else | ||
249 | ret = NOTIFY_OK; | ||
250 | |||
251 | return ret; | ||
252 | } | 247 | } |
253 | 248 | ||
254 | #endif | 249 | #endif |
@@ -1390,7 +1390,7 @@ static int __meminit slab_memory_callback(struct notifier_block *self, | |||
1390 | break; | 1390 | break; |
1391 | } | 1391 | } |
1392 | out: | 1392 | out: |
1393 | return ret ? notifier_from_errno(ret) : NOTIFY_OK; | 1393 | return notifier_from_errno(ret); |
1394 | } | 1394 | } |
1395 | #endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */ | 1395 | #endif /* CONFIG_NUMA && CONFIG_MEMORY_HOTPLUG */ |
1396 | 1396 | ||