e4528126de
Boot tested: http://pastebin.com/L6aAb9xj Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> [jogo: update to 4.1 final add patches added since submission delete patches applied in later rcs restore commit messages in 220-gc-sections and 304-mips_disable_fpu fix 050-backport_netfilter_rtcache to match new API update inlined dma ops with upstream changes add missing config symbols enabled CONFIG_MULTIUSER update kmod defintions for 4.1 ] Signed-off-by: Jonas Gorski <jogo@openwrt.org> SVN-Revision: 46112
14 lines
534 B
Diff
14 lines
534 B
Diff
--- a/include/linux/slab.h
|
|
+++ b/include/linux/slab.h
|
|
@@ -171,8 +171,8 @@ size_t ksize(const void *);
|
|
* to do various tricks to work around compiler limitations in order to
|
|
* ensure proper constant folding.
|
|
*/
|
|
-#define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT - 1) <= 25 ? \
|
|
- (MAX_ORDER + PAGE_SHIFT - 1) : 25)
|
|
+#define KMALLOC_SHIFT_HIGH ((MAX_ORDER + PAGE_SHIFT - 1) <= 17 ? \
|
|
+ (MAX_ORDER + PAGE_SHIFT - 1) : 17)
|
|
#define KMALLOC_SHIFT_MAX KMALLOC_SHIFT_HIGH
|
|
#ifndef KMALLOC_SHIFT_LOW
|
|
#define KMALLOC_SHIFT_LOW 5
|