diff --git a/[refs] b/[refs] index ab5ef980bfea..34e03e88874d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0937502af7c9b648ed4e884ccb7f504b01a005a1 +refs/heads/master: 88e4ccf294ca62c2da998012a83533ce150c8dce diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index b3f2e713cdf1..488400d10700 100644 --- a/trunk/mm/slub.c +++ b/trunk/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(); - p->pid = current ? current->pid : -1; + p->pid = current->pid; p->when = jiffies; } else memset(p, 0, sizeof(struct track));