Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6

Conflicts:

	drivers/net/wireless/rt2x00/rt2x00dev.c
	net/8021q/vlan_dev.c

1 files changed, 4 insertions, 5 deletions

diff --git a/mm/slab.c b/mm/slab.c
index 473e6c2eaefb..e6c698f55674 100644
--- a/mm/slab.c
+++ b/mm/slab.c
@@ -333,7 +333,7 @@ static __always_inline int index_of(const size_t size)
                 return i; \
         else \
                 i++;
-#include "linux/kmalloc_sizes.h"
+#include <linux/kmalloc_sizes.h>
 #undef CACHE
                 __bad_size();
         } else
@@ -2964,11 +2964,10 @@ static void *cache_alloc_refill(struct kmem_cache *cachep, gfp_t flags)
         struct array_cache *ac;
         int node;
 
-        node = numa_node_id();
-
+retry:
         check_irq_off();
+        node = numa_node_id();
         ac = cpu_cache_get(cachep);
-retry:
         batchcount = ac->batchcount;
         if (!ac->touched && batchcount > BATCHREFILL_LIMIT) {
                 /*
@@ -3280,7 +3279,7 @@ retry:
                 if (local_flags & __GFP_WAIT)
                         local_irq_enable();
                 kmem_flagcheck(cache, flags);
-                obj = kmem_getpages(cache, flags, -1);
+                obj = kmem_getpages(cache, local_flags, -1);
                 if (local_flags & __GFP_WAIT)
                         local_irq_disable();
                 if (obj) {