[Xen-changelog] Merge firebug.cl.cam.ac.uk:/auto/homes/maw48/xen-3.0-resources.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1434, 2005/05/12 15:00:28+01:00, cl349@xxxxxxxxxxxxxxxxxxxx

        Merge firebug.cl.cam.ac.uk:/auto/homes/maw48/xen-3.0-resources.bk
        into firebug.cl.cam.ac.uk:/local/scratch/cl349/xen-unstable.bk-clean



 setup.c |    9 +++++++--
 1 files changed, 7 insertions(+), 2 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-12 
12:04:27 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-12 
12:04:27 -04:00
@@ -289,6 +289,10 @@
        unsigned char *rom;
        int           i;
 
+        /* Nothing to do if not running in dom0. */
+       if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
+                return;
+
        /* video rom */
        upper = adapter_rom_resources[0].start;
        for (start = video_rom_resource.start; start < upper; start += 2048) {
@@ -1213,8 +1217,9 @@
        else
                legacy_init_iomem_resources(&code_resource, &data_resource);
 
-       /* EFI systems may still have VGA */
-       request_resource(&iomem_resource, &video_ram_resource);
+       if ( xen_start_info.flags & SIF_INITDOMAIN )
+                /* EFI systems may still have VGA */
+                request_resource(&iomem_resource, &video_ram_resource);
 
        /* request I/O space for devices used on all i[345]86 PCs */
        for (i = 0; i < STANDARD_IO_RESOURCES; i++)

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