Re: [PATCH] uv/x2apic: update for change in pci bridge handling.

[Dave Airlie]

On Thu, 2011-06-09 at 09:09 +0200, Ingo Molnar wrote:
> * Dave Airlie <airlied@xxxxxxxxx> wrote:
> 
> > On Wed, May 25, 2011 at 2:00 PM, Dave Airlie <airlied@xxxxxxxxx> wrote:
> > > From: Dave Airlie <airlied@xxxxxxxxxx>
> > >
> > > I forgot about the special uv handling code for this, so this
> > > patch fixes it up.
> > 
> > ping?
> > 
> > This fixes a warning and bug in Linus tree,
> > 
> >   CC      arch/x86/kernel/apic/x2apic_uv_x.o
> > /home/airlied/git/linux-2.6/arch/x86/kernel/apic/x2apic_uv_x.c: In
> > function âuv_system_initâ:
> > /home/airlied/git/linux-2.6/arch/x86/kernel/apic/x2apic_uv_x.c:882:2:
> > warning: passing argument 1 of âpci_register_set_vga_stateâ from
> > incompatible pointer type [enabled by default]
> > /home/airlied/git/linux-2.6/include/linux/pci.h:1094:13: note:
> > expected âarch_set_vga_state_tâ but argument is of type âint
> > (*)(struct pci_dev *, bool,  unsigned int,  bool)â
> > 
> > 
> > Dave.
> > 
> > >
> > > Signed-off-by: Dave Airlie <airlied@xxxxxxxxxx>
> > > ---
> > >  arch/x86/kernel/apic/x2apic_uv_x.c |    8 ++++----
> > >  drivers/pci/pci.c                  |    4 ++--
> > >  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> Bug introduced via the DRM tree? Then the fix should go via the DRM 
> tree or via the PCI tree i suspect.

So I can take that as an ack for the x86 bit? :-)

I don't mind pushing it, just didn't want to step outside my box

Dave.


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/