[Xen-changelog] Merge

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1447, 2005/05/11 23:42:28+01:00, mwilli2@xxxxxxxxxxxxxxxxxxxx

        Merge



 setup.c |   23 ++++++++++++-----------
 1 files changed, 12 insertions(+), 11 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 
06:04:11 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/setup.c      2005-05-12 
06:04:11 -04:00
@@ -779,7 +779,7 @@
                        noexec_setup(from + 7);
 
 
-#ifdef  CONFIG_X86_SMP
+#ifdef  CONFIG_X86_MPPARSE
                /*
                 * If the BIOS enumerates physical processors before logical,
                 * maxcpus=N at enumeration-time can be used to disable HT.
@@ -1133,12 +1133,6 @@
         */
        acpi_reserve_bootmem();
 #endif
-#ifdef CONFIG_X86_FIND_SMP_CONFIG
-       /*
-        * Find and reserve possible boot-time SMP configuration:
-        */
-       find_smp_config();
-#endif
 
 #ifdef CONFIG_BLK_DEV_INITRD
        if (xen_start_info.mod_start) {
@@ -1503,6 +1497,13 @@
 #endif
        paging_init();
 
+#ifdef CONFIG_X86_FIND_SMP_CONFIG
+       /*
+        * Find and reserve possible boot-time SMP configuration:
+        */
+       find_smp_config();
+#endif
+
        /* Make sure we have a correctly sized P->M table. */
        if (max_pfn != xen_start_info.nr_pages) {
                phys_to_machine_mapping = alloc_bootmem_low_pages(
@@ -1566,6 +1567,10 @@
        if (efi_enabled)
                efi_map_memmap();
 
+       op.cmd             = PHYSDEVOP_SET_IOPL;
+       op.u.set_iopl.iopl = current->thread.io_pl = 1;
+       HYPERVISOR_physdev_op(&op);
+
        if ( !(xen_start_info.flags & SIF_INITDOMAIN) )
        {
             printk(KERN_INFO "Not running in dom0: Disabling ACPI\n");
@@ -1589,10 +1594,6 @@
        noirqdebug_setup("");
 
        register_memory();
-
-       op.cmd             = PHYSDEVOP_SET_IOPL;
-       op.u.set_iopl.iopl = current->thread.io_pl = 1;
-       HYPERVISOR_physdev_op(&op);
 
        if (xen_start_info.flags & SIF_INITDOMAIN) {
                if (!(xen_start_info.flags & SIF_PRIVILEGED))

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