From: Konrad Rzeszutek Wilk Date: Wed, 19 Oct 2011 19:49:59 +0000 (-0400) Subject: Merge branch 'stable/cleanups-3.2.rebased' into uek2-merge X-Git-Tag: v2.6.39-400.9.0~854^2~5 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=259e329005fe701247b68f241e9a8d6806b204ce;p=users%2Fjedix%2Flinux-maple.git Merge branch 'stable/cleanups-3.2.rebased' into uek2-merge * stable/cleanups-3.2.rebased: Xen: fix braces and tabs coding style issue in xenbus_probe.c Xen: fix braces coding style issue in xenbus_probe.h Xen: fix whitespaces,tabs coding style issue in drivers/xen/pci.c Xen: fix braces coding style issue in gntdev.c and grant-table.c Xen: fix whitespaces,tabs coding style issue in drivers/xen/events.c Xen: fix whitespaces,tabs coding style issue in drivers/xen/balloon.c Conflicts: drivers/xen/pci.c --- 259e329005fe701247b68f241e9a8d6806b204ce diff --cc drivers/xen/pci.c index 66057075d6e2,c4448ee5595f..b1923dcb3811 --- a/drivers/xen/pci.c +++ b/drivers/xen/pci.c @@@ -96,9 -36,9 +96,9 @@@ static int xen_add_device(struct devic struct physdev_manage_pci_ext manage_pci_ext = { .bus = pci_dev->bus->number, .devfn = pci_dev->devfn, - .is_virtfn = 1, + .is_virtfn = 1, - .physfn.bus = pci_dev->physfn->bus->number, - .physfn.devfn = pci_dev->physfn->devfn, + .physfn.bus = physfn->bus->number, + .physfn.devfn = physfn->devfn, }; r = HYPERVISOR_physdev_op(PHYSDEVOP_manage_pci_add_ext,