From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner+w=401wt.eu-S1754521AbYI0SpJ@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1754521AbYI0SpJ (ORCPT <rfc822;w@1wt.eu>);
	Sat, 27 Sep 2008 14:45:09 -0400
Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753457AbYI0So4
	(ORCPT <rfc822;linux-kernel-outgoing>);
	Sat, 27 Sep 2008 14:44:56 -0400
Received: from mx2.mail.elte.hu ([157.181.151.9]:42224 "EHLO mx2.mail.elte.hu"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1753454AbYI0Soz (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Sat, 27 Sep 2008 14:44:55 -0400
Date: Sat, 27 Sep 2008 20:44:44 +0200
From: Ingo Molnar <mingo@elte.hu>
To: Yinghai Lu <yinghai@kernel.org>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>, Len Brown <lenb@kernel.org>,
       Thomas Gleixner <tglx@linutronix.de>, "H. Peter Anvin" <hpa@zytor.com>,
       Andrew Morton <akpm@linux-foundation.org>, linux-kernel@vger.kernel.org,
       linux-pci@vger.kernel.org, linux-acpi@vger.kernel.org
Subject: Re: [PATCH 7/7] x86: print out irq nr for msi/ht -v2
Message-ID: <20080927184444.GB16926@elte.hu>
References: <1222323223-23529-1-git-send-email-yhlu.kernel@gmail.com> <20080925084212.GE4519@elte.hu> <20080925091211.GA4922@elte.hu> <86802c440809251020h54d1e42ck67b542f17e928bd7@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <86802c440809251020h54d1e42ck67b542f17e928bd7@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-ELTE-VirusStatus: clean
X-ELTE-SpamScore: -1.5
X-ELTE-SpamLevel: 
X-ELTE-SpamCheck: no
X-ELTE-SpamVersion: ELTE 2.0 
X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00 autolearn=no SpamAssassin version=3.2.3
	-1.5 BAYES_00               BODY: Bayesian spam probability is 0 to 1%
	[score: 0.0000]
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


* Yinghai Lu <yinghai@kernel.org> wrote:

> On Thu, Sep 25, 2008 at 2:12 AM, Ingo Molnar <mingo@elte.hu> wrote:
> >
> >> > v2: fix hpet compiling
> >
> > still bad:
> >
> > arch/x86/kernel/hpet.c: In function 'hpet_late_init':
> > arch/x86/kernel/hpet.c:828: error: 'dev' undeclared (first use in this function)
> > arch/x86/kernel/hpet.c:828: error: (Each undeclared identifier is reported only once
> > arch/x86/kernel/hpet.c:828: error: for each function it appears in.)
> >
> > we've got some changes in this area (per cpu hpet).
> >
> 
> looks there is some merge problem.
> 
> Index: linux-2.6/arch/x86/kernel/hpet.c
> ===================================================================
> --- linux-2.6.orig/arch/x86/kernel/hpet.c
> +++ linux-2.6/arch/x86/kernel/hpet.c
> @@ -467,6 +467,9 @@ static int hpet_setup_irq(struct hpet_de
>         irq_set_affinity(dev->irq, cpumask_of_cpu(dev->cpu));
>         enable_irq(dev->irq);
> 
> +       printk(KERN_DEBUG "hpet: %s is using irq %#x aka %d for MSI\n",
> +                        dev->name, dev->irq, dev->irq);
> +
>         return 0;
>  }
> 
> the change should be in hpet_setup_irq instead of hpet_late_init
> 
> the patch can be applied to tip/master cleanly.

ok, figure it out, the problem was that your change depended on 
tip/timers/hpet-percpu.

sorted it out.

	Ingo