96f49098f2
This commit: 1) Copies 3.14 patches 2) Drops mainlined stuff 3) Modifies some patches to apply Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43093
14 lines
534 B
Diff
14 lines
534 B
Diff
--- a/include/linux/slab.h
|
|
+++ b/include/linux/slab.h
|
|
@@ -172,8 +172,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
|