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
Merge git://git.infradead.org/battery-2.6
[pandora-kernel.git]
/
mm
/
slob.c
diff --git
a/mm/slob.c
b/mm/slob.c
index
837ebd6
..
23631e2
100644
(file)
--- a/
mm/slob.c
+++ b/
mm/slob.c
@@
-467,14
+467,6
@@
out:
* End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
* End of slob allocator proper. Begin kmem_cache_alloc and kmalloc frontend.
*/
-#ifndef ARCH_KMALLOC_MINALIGN
-#define ARCH_KMALLOC_MINALIGN __alignof__(unsigned long)
-#endif
-
-#ifndef ARCH_SLAB_MINALIGN
-#define ARCH_SLAB_MINALIGN __alignof__(unsigned long)
-#endif
-
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
{
unsigned int *m;
void *__kmalloc_node(size_t size, gfp_t gfp, int node)
{
unsigned int *m;