diff options
| author | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-12-02 19:50:27 -0800 |
| commit | aa2ba5f1082dc705745899584aac8416d710c056 (patch) | |
| tree | bde0bf4aff036c6bac19a0212194ae1092afb3c9 /mm/slub.c | |
| parent | 68024541e2e5a8f35e281daaa5068a29e2a538a5 (diff) | |
| parent | f6f7b52e2f6149d2ee365717afff315b05720162 (diff) | |
| download | linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.gz linux-aa2ba5f1082dc705745899584aac8416d710c056.tar.bz2 linux-aa2ba5f1082dc705745899584aac8416d710c056.zip | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
drivers/net/ixgbe/ixgbe_main.c
drivers/net/smc91x.c
Diffstat (limited to 'mm/slub.c')
| -rw-r--r-- | mm/slub.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mm/slub.c b/mm/slub.c index 7ad489af9561..749588a50a5a 100644 --- a/mm/slub.c +++ b/mm/slub.c @@ -2931,8 +2931,10 @@ static int slab_memory_callback(struct notifier_block *self, case MEM_CANCEL_OFFLINE: break; } - - ret = notifier_from_errno(ret); + if (ret) + ret = notifier_from_errno(ret); + else + ret = NOTIFY_OK; return ret; } |