From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759212AbYLPUcm (ORCPT ); Tue, 16 Dec 2008 15:32:42 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751010AbYLPUc3 (ORCPT ); Tue, 16 Dec 2008 15:32:29 -0500 Received: from gw.goop.org ([64.81.55.164]:57988 "EHLO mail.goop.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751522AbYLPUc2 (ORCPT ); Tue, 16 Dec 2008 15:32:28 -0500 Message-ID: <49481057.2030307@goop.org> Date: Tue, 16 Dec 2008 12:32:23 -0800 From: Jeremy Fitzhardinge User-Agent: Thunderbird 2.0.0.18 (X11/20081119) MIME-Version: 1.0 To: Ingo Molnar CC: the arch/x86 maintainers , Linux Kernel Mailing List Subject: [PATCH] x86: make sure we really have an hpet mapping before using it 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 When booting in Xen dom0, the hpet isn't really accessible, so make sure the mapping is non-NULL before use. Signed-off-by: Jeremy Fitzhardinge --- arch/x86/kernel/hpet.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) =================================================================== --- a/arch/x86/kernel/hpet.c +++ b/arch/x86/kernel/hpet.c @@ -818,9 +818,10 @@ hpet_address = force_hpet_address; hpet_enable(); - if (!hpet_virt_address) - return -ENODEV; } + + if (!hpet_virt_address) + return -ENODEV; hpet_reserve_platform_timers(hpet_readl(HPET_ID));