From 9190cc9f5a75aa350e8f0bc33933c4fadf04677b Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Thu, 3 Jul 2008 23:28:35 +0100 Subject: [PATCH] --- yaml --- r: 98667 b: refs/heads/master c: 50952026036c7b4212b90091bf23a264c0ccc1fb h: refs/heads/master i: 98665: 9c08ca56930b6e9af9ec3171f07e378e3d4a9b15 98663: db309331ee085c143db0fcbdfc6d50f1773459c3 v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 22 +++++++++++++++++++--- trunk/include/asm-mips/atomic.h | 4 ++-- trunk/include/linux/slub_def.h | 2 -- trunk/mm/slub.c | 12 ++---------- 5 files changed, 24 insertions(+), 18 deletions(-) diff --git a/[refs] b/[refs] index 8a22a3d8e155..a71d682ad0f9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3ea9eed49346eb80f17f1c6539c47dc508be1173 +refs/heads/master: 50952026036c7b4212b90091bf23a264c0ccc1fb diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 460e699fd280..e6c06fa3290e 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -2474,11 +2474,9 @@ M: James.Bottomley@HansenPartnership.com W: http://www.hansenpartnership.com/voyager S: Maintained -LINUX FOR POWERPC (32-BIT AND 64-BIT) +LINUX FOR POWERPC P: Paul Mackerras M: paulus@samba.org -P: Benjamin Herrenschmidt -M: benh@kernel.crashing.org W: http://www.penguinppc.org/ L: linuxppc-dev@ozlabs.org T: git kernel.org:/pub/scm/linux/kernel/git/paulus/powerpc.git @@ -2518,6 +2516,13 @@ W: http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex L: linuxppc-dev@ozlabs.org S: Maintained +LINUX FOR POWERPC BOOT CODE +P: Tom Rini +M: trini@kernel.crashing.org +W: http://www.penguinppc.org/ +L: linuxppc-dev@ozlabs.org +S: Maintained + LINUX FOR POWERPC EMBEDDED PPC8XX P: Vitaly Bordug M: vitb@kernel.crashing.org @@ -2546,6 +2551,17 @@ P: Arnaldo Carvalho de Melo M: acme@ghostprotocols.net S: Maintained +LINUX FOR 64BIT POWERPC +P: Paul Mackerras +M: paulus@samba.org +M: paulus@au.ibm.com +P: Anton Blanchard +M: anton@samba.org +M: anton@au.ibm.com +W: http://www.penguinppc.org/ppc64/ +L: linuxppc-dev@ozlabs.org +S: Supported + LINUX SECURITY MODULE (LSM) FRAMEWORK P: Chris Wright M: chrisw@sous-sol.org diff --git a/trunk/include/asm-mips/atomic.h b/trunk/include/asm-mips/atomic.h index a798d6299a79..1232be3885b0 100644 --- a/trunk/include/asm-mips/atomic.h +++ b/trunk/include/asm-mips/atomic.h @@ -283,10 +283,10 @@ static __inline__ int atomic_sub_if_positive(int i, atomic_t * v) " beqz %0, 2f \n" " subu %0, %1, %3 \n" " .set reorder \n" - "1: \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n" + "1: \n" " .set mips0 \n" : "=&r" (result), "=&r" (temp), "=m" (v->counter) : "Ir" (i), "m" (v->counter) @@ -664,10 +664,10 @@ static __inline__ long atomic64_sub_if_positive(long i, atomic64_t * v) " beqz %0, 2f \n" " dsubu %0, %1, %3 \n" " .set reorder \n" - "1: \n" " .subsection 2 \n" "2: b 1b \n" " .previous \n" + "1: \n" " .set mips0 \n" : "=&r" (result), "=&r" (temp), "=m" (v->counter) : "Ir" (i), "m" (v->counter) diff --git a/trunk/include/linux/slub_def.h b/trunk/include/linux/slub_def.h index cef6f8fddd7d..71e43a12ebbb 100644 --- a/trunk/include/linux/slub_def.h +++ b/trunk/include/linux/slub_def.h @@ -137,12 +137,10 @@ static __always_inline int kmalloc_index(size_t size) if (size <= KMALLOC_MIN_SIZE) return KMALLOC_SHIFT_LOW; -#if KMALLOC_MIN_SIZE <= 64 if (size > 64 && size <= 96) return 1; if (size > 128 && size <= 192) return 2; -#endif if (size <= 8) return 3; if (size <= 16) return 4; if (size <= 32) return 5; diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 2c9a62d1f429..0987d1cd943c 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -2995,6 +2995,8 @@ void __init kmem_cache_init(void) create_kmalloc_cache(&kmalloc_caches[1], "kmalloc-96", 96, GFP_KERNEL); caches++; + } + if (KMALLOC_MIN_SIZE <= 128) { create_kmalloc_cache(&kmalloc_caches[2], "kmalloc-192", 192, GFP_KERNEL); caches++; @@ -3024,16 +3026,6 @@ void __init kmem_cache_init(void) for (i = 8; i < KMALLOC_MIN_SIZE; i += 8) size_index[(i - 1) / 8] = KMALLOC_SHIFT_LOW; - if (KMALLOC_MIN_SIZE == 128) { - /* - * The 192 byte sized cache is not used if the alignment - * is 128 byte. Redirect kmalloc to use the 256 byte cache - * instead. - */ - for (i = 128 + 8; i <= 192; i += 8) - size_index[(i - 1) / 8] = 8; - } - slab_state = UP; /* Provide the correct kmalloc names now that the caches are up */