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 'linux-2.6' into merge
[profile/ivi/kernel-adaptation-intel-automotive.git]
/
mm
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index
aac1dd3
..
bcdb2c8
100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-2734,7
+2734,7
@@
static void slab_mem_offline_callback(void *arg)
* and offline_pages() function shoudn't call this
* callback. So, we must fail.
*/
- BUG_ON(atomic_read(&n->nr_slabs));
+ BUG_ON(atomic_
long_
read(&n->nr_slabs));
s->node[offline_node] = NULL;
kmem_cache_free(kmalloc_caches, n);