From 9730c5e3607f641328171cac17fa7095d626047d Mon Sep 17 00:00:00 2001 From: KyongHo Date: Tue, 29 May 2012 15:06:49 -0700 Subject: [PATCH] --- yaml --- r: 308887 b: refs/heads/master c: dbda591d920b4c7692725b13e3f68ecb251e9080 h: refs/heads/master i: 308885: d117c453917bdd2f83cc1a8097fbb8fcafba52cc 308883: f9cfd99c2c856baad522b6daf2672c0cccfec5f3 308879: 805c72aae55787a7fff54b664af1612fa631415b v: v3 --- [refs] | 2 +- trunk/mm/vmalloc.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23dce4e92eec..cd983f75e4d7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 26c191788f18129af0eb32a358cdaea0c7479626 +refs/heads/master: dbda591d920b4c7692725b13e3f68ecb251e9080 diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c index c28b0b9e5cc0..2aad49981b57 100644 --- a/trunk/mm/vmalloc.c +++ b/trunk/mm/vmalloc.c @@ -1185,9 +1185,10 @@ void __init vmalloc_init(void) /* Import existing vmlist entries. */ for (tmp = vmlist; tmp; tmp = tmp->next) { va = kzalloc(sizeof(struct vmap_area), GFP_NOWAIT); - va->flags = tmp->flags | VM_VM_AREA; + va->flags = VM_VM_AREA; va->va_start = (unsigned long)tmp->addr; va->va_end = va->va_start + tmp->size; + va->vm = tmp; __insert_vmap_area(va); }