Re: [Xen-devel] [PATCH] conditionalize PCI reassign code

["Jan Beulich" <jbeulich@xxxxxxxxxx>]

>>> "Zhao, Yu" <yu.zhao@xxxxxxxxx> 17.10.08 09:27 >>>
>+#ifdef CONFIG_PCI_REASSIGN
>  extern int reassign_resources;
>  extern int is_reassigndev(struct pci_dev *dev);
>  extern void pci_update_bridge(struct pci_dev *dev, int resno);
>+#else
>+#define reassign_resources 0
>+#define is_reassigndev(dev) 0
>+#endif
>
>When the CONFIG_PCI_REASSIGN is not set, e.g., a domU kernel, the 
>following line fails to be compiled (drivers/pci/quirks.c):
>
>int reassign_resources = 0;

Ah, yes, I overlooked that, because when I merged these changes into
our kernel the main change to quirks.c needed to be done differently
(and then properly in reassigndev.c) anyway, and hence I at once
moved the misplaced (and as we agreed elsewhere unnecessary) option
into reassigndev.c. So the (untested) patch below should fix it until the
patch to eliminate the option will arrive from the original submitter.

Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>

--- a/drivers/pci/quirks.c
+++ b/drivers/pci/quirks.c
@@ -33,19 +33,6 @@
 }
 __setup("pci-mem-align", set_pci_mem_align);
 
-
-int reassign_resources = 0;
-
-static int __init set_reassign_resources(char *str)
-{
-       /* resources reassign on */
-       reassign_resources = 1;
-       printk(KERN_DEBUG "PCI: resource reassign ON.\n");
-
-       return 1;
-}
-__setup("reassign_resources", set_reassign_resources);
-
 /* This quirk function enables us to force all memory resources which are 
  * assigned to PCI devices, to be page-aligned.
  */
--- a/drivers/pci/reassigndev.c
+++ b/drivers/pci/reassigndev.c
@@ -34,6 +34,18 @@ static int pbus_size_mem(struct pci_bus 
 }
 __setup("reassigndev=", reassigndev_setup);
 
+int reassign_resources = 0;
+
+static int __init set_reassign_resources(char *str)
+{
+       /* resources reassign on */
+       reassign_resources = 1;
+       printk(KERN_DEBUG "PCI: resource reassign ON.\n");
+
+       return 1;
+}
+__setup("reassign_resources", set_reassign_resources);
+
 int is_reassigndev(struct pci_dev *dev)
 {
        char dev_str[TOKEN_MAX+1];



_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-devel