projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kgdb: support for ARCH=arm
[firefly-linux-kernel-4.4.55.git]
/
mm
/
slub.c
diff --git
a/mm/slub.c
b/mm/slub.c
index 5f6e2c4a2ba7cbf51e85961eaa56b9d3f82981f0..6d4a49c1ff2fc27bef0616c03016394d551fc5be 100644
(file)
--- a/
mm/slub.c
+++ b/
mm/slub.c
@@
-411,7
+411,7
@@
static void set_track(struct kmem_cache *s, void *object,
if (addr) {
p->addr = addr;
p->cpu = smp_processor_id();
if (addr) {
p->addr = addr;
p->cpu = smp_processor_id();
- p->pid = current
? current->pid : -1
;
+ p->pid = current
->pid
;
p->when = jiffies;
} else
memset(p, 0, sizeof(struct track));
p->when = jiffies;
} else
memset(p, 0, sizeof(struct track));
@@
-492,7
+492,7
@@
static void print_trailer(struct kmem_cache *s, struct page *page, u8 *p)
if (p > addr + 16)
print_section("Bytes b4", p - 16, 16);
if (p > addr + 16)
print_section("Bytes b4", p - 16, 16);
- print_section("Object", p, min
(s->objsize, 128
));
+ print_section("Object", p, min
_t(unsigned long, s->objsize, PAGE_SIZE
));
if (s->flags & SLAB_RED_ZONE)
print_section("Redzone", p + s->objsize,
if (s->flags & SLAB_RED_ZONE)
print_section("Redzone", p + s->objsize,
@@
-1495,15
+1495,7
@@
static void flush_cpu_slab(void *d)
static void flush_all(struct kmem_cache *s)
{
static void flush_all(struct kmem_cache *s)
{
-#ifdef CONFIG_SMP
- on_each_cpu(flush_cpu_slab, s, 1, 1);
-#else
- unsigned long flags;
-
- local_irq_save(flags);
- flush_cpu_slab(s);
- local_irq_restore(flags);
-#endif
+ on_each_cpu(flush_cpu_slab, s, 1);
}
/*
}
/*
@@
-2766,6
+2758,7
@@
void kfree(const void *x)
page = virt_to_head_page(x);
if (unlikely(!PageSlab(page))) {
page = virt_to_head_page(x);
if (unlikely(!PageSlab(page))) {
+ BUG_ON(!PageCompound(page));
put_page(page);
return;
}
put_page(page);
return;
}