git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bci: some more code for testing
[pandora-kernel.git]
/
mm
/
slob.c
diff --git
a/mm/slob.c
b/mm/slob.c
index
4c82dd4
..
cb675d1
100644
(file)
--- a/
mm/slob.c
+++ b/
mm/slob.c
@@
-514,9
+514,11
@@
size_t ksize(const void *block)
return 0;
sp = (struct slob_page *)virt_to_page(block);
return 0;
sp = (struct slob_page *)virt_to_page(block);
- if (slob_page(sp))
- return ((slob_t *)block - 1)->units + SLOB_UNIT;
- else
+ if (slob_page(sp)) {
+ int align = max(ARCH_KMALLOC_MINALIGN, ARCH_SLAB_MINALIGN);
+ unsigned int *m = (unsigned int *)(block - align);
+ return SLOB_UNITS(*m) * SLOB_UNIT;
+ } else
return sp->page.private;
}
return sp->page.private;
}