summaryrefslogtreecommitdiff
path: root/patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch
diff options
context:
space:
mode:
Diffstat (limited to 'patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch')
-rw-r--r--patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch10
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch b/patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch
index e67ba840d6c3..b63ef4e8f914 100644
--- a/patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch
+++ b/patches/0017-mm-slub-check-new-pages-with-restored-irqs.patch
@@ -24,7 +24,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (!PageSlab(page)) {
slab_err(s, page, "Not a valid slab page");
return 0;
-@@ -2772,10 +2770,10 @@ static void *___slab_alloc(struct kmem_c
+@@ -2775,10 +2773,10 @@ static void *___slab_alloc(struct kmem_c
lockdep_assert_irqs_disabled();
freelist = get_partial(s, gfpflags, node, &page);
@@ -36,7 +36,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
put_cpu_ptr(s->cpu_slab);
page = new_slab(s, gfpflags, node);
c = get_cpu_ptr(s->cpu_slab);
-@@ -2785,7 +2783,6 @@ static void *___slab_alloc(struct kmem_c
+@@ -2788,7 +2786,6 @@ static void *___slab_alloc(struct kmem_c
return NULL;
}
@@ -44,7 +44,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
/*
* No other reference to the page yet so we can
* muck around with it freely without cmpxchg
-@@ -2800,7 +2797,6 @@ static void *___slab_alloc(struct kmem_c
+@@ -2803,7 +2800,6 @@ static void *___slab_alloc(struct kmem_c
if (kmem_cache_debug(s)) {
if (!alloc_debug_processing(s, page, freelist, addr)) {
/* Slab failed checks. Next slab needed */
@@ -52,7 +52,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
goto new_slab;
} else {
/*
-@@ -2818,6 +2814,7 @@ static void *___slab_alloc(struct kmem_c
+@@ -2821,6 +2817,7 @@ static void *___slab_alloc(struct kmem_c
*/
goto return_single;
@@ -60,7 +60,7 @@ Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
if (unlikely(c->page))
flush_slab(s, c);
c->page = page;
-@@ -2826,6 +2823,7 @@ static void *___slab_alloc(struct kmem_c
+@@ -2829,6 +2826,7 @@ static void *___slab_alloc(struct kmem_c
return_single: