From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752901AbYJ1IXL (ORCPT ); Tue, 28 Oct 2008 04:23:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751809AbYJ1IXB (ORCPT ); Tue, 28 Oct 2008 04:23:01 -0400 Received: from gw.goop.org ([64.81.55.164]:34291 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751756AbYJ1IXA (ORCPT ); Tue, 28 Oct 2008 04:23:00 -0400 Message-ID: <4906CBCA.6060908@goop.org> Date: Tue, 28 Oct 2008 19:22:34 +1100 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.17 (X11/20081009) MIME-Version: 1.0 To: Nick Piggin CC: Linux Kernel Mailing List , Linux Memory Management List , Ingo Molnar Subject: [PATCH 1/2] vmap: cope with vm_unmap_aliases before vmalloc_init() References: <49010D41.1080305@goop.org> <200810281619.10388.nickpiggin@yahoo.com.au> In-Reply-To: <200810281619.10388.nickpiggin@yahoo.com.au> X-Enigmail-Version: 0.95.6 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Xen can end up calling vm_unmap_aliases() before vmalloc_init() has been called. In this case its safe to make it a simple no-op. Signed-off-by: Jeremy Fitzhardinge --- mm/vmalloc.c | 7 +++++++ 1 file changed, 7 insertions(+) =================================================================== --- a/mm/vmalloc.c +++ b/mm/vmalloc.c @@ -592,6 +592,8 @@ #define VMAP_BLOCK_SIZE (VMAP_BBMAP_BITS * PAGE_SIZE) +static bool vmap_initialized __read_mostly = false; + struct vmap_block_queue { spinlock_t lock; struct list_head free; @@ -828,6 +830,9 @@ int cpu; int flush = 0; + if (unlikely(!vmap_initialized)) + return; + for_each_possible_cpu(cpu) { struct vmap_block_queue *vbq = &per_cpu(vmap_block_queue, cpu); struct vmap_block *vb; @@ -941,6 +946,8 @@ INIT_LIST_HEAD(&vbq->dirty); vbq->nr_dirty = 0; } + + vmap_initialized = true; } void unmap_kernel_range(unsigned long addr, unsigned long size)