[Xen-changelog] Merge http://xen-ia64.bkbits.net/xeno-unstable-ia64.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1706, 2005/06/09 16:10:19-06:00, djm@xxxxxxxxxxxxxxxxxx

        Merge http://xen-ia64.bkbits.net/xeno-unstable-ia64.bk
        into sportsman.spdomain:/home/djm/xeno-unstable-ia64.bk



 arch/ia64/domain.c        |   14 +++++++++-----
 arch/ia64/xensetup.c      |    4 ----
 include/asm-ia64/config.h |    1 -
 3 files changed, 9 insertions(+), 10 deletions(-)


diff -Nru a/xen/arch/ia64/domain.c b/xen/arch/ia64/domain.c
--- a/xen/arch/ia64/domain.c    2005-06-10 14:04:55 -04:00
+++ b/xen/arch/ia64/domain.c    2005-06-10 14:04:56 -04:00
@@ -687,7 +687,9 @@
       * Some old version linux, like 2.4, assumes physical memory existing
       * in 2nd 64M space.
       */
-     dom0_start = alloc_boot_pages(dom0_size,dom0_align);
+     dom0_start = alloc_boot_pages(
+         dom0_size >> PAGE_SHIFT, dom0_align >> PAGE_SHIFT);
+     dom0_start <<= PAGE_SHIFT;
        if (!dom0_start) {
        printf("construct_dom0: can't allocate contiguous memory size=%p\n",
                dom0_size);
@@ -705,7 +707,9 @@
 {
        domU_staging_size = 32*1024*1024; //FIXME: Should be configurable
        printf("alloc_domU_staging: starting (initializing %d 
MB...)\n",domU_staging_size/(1024*1024));
-       domU_staging_start= 
alloc_boot_pages(domU_staging_size,domU_staging_align);
+       domU_staging_start = alloc_boot_pages(
+            domU_staging_size >> PAGE_SHIFT, domU_staging_align >> PAGE_SHIFT);
+        domU_staging_start <<= PAGE_SHIFT;
        if (!domU_staging_size) {
                printf("alloc_domU_staging: can't allocate, spinning...\n");
                while(1);
@@ -830,14 +834,14 @@
 
     /* Temp workaround */
     if (running_on_sim)
-       dsi.xen_elf_image = 1;
+       dsi.xen_section_string = (char *)1;
 
-    if ((!vmx_enabled) && !dsi.xen_elf_image) {
+    if ((!vmx_enabled) && !dsi.xen_section_string) {
        printk("Lack of hardware support for unmodified vmx dom0\n");
        panic("");
     }
 
-    if (vmx_enabled && !dsi.xen_elf_image) {
+    if (vmx_enabled && !dsi.xen_section_string) {
        printk("Dom0 is vmx domain!\n");
        vmx_dom0 = 1;
     }
diff -Nru a/xen/arch/ia64/xensetup.c b/xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c  2005-06-10 14:04:56 -04:00
+++ b/xen/arch/ia64/xensetup.c  2005-06-10 14:04:56 -04:00
@@ -36,10 +36,6 @@
 int find_max_pfn (unsigned long, unsigned long, void *);
 void start_of_day(void);
 
-/* opt_noht: If true, Hyperthreading is ignored. */
-int opt_noht = 0;
-boolean_param("noht", opt_noht);
-
 /* opt_nosmp: If true, secondary processors are ignored. */
 static int opt_nosmp = 0;
 boolean_param("nosmp", opt_nosmp);
diff -Nru a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     2005-06-10 14:04:56 -04:00
+++ b/xen/include/asm-ia64/config.h     2005-06-10 14:04:56 -04:00
@@ -226,7 +226,6 @@
 #define FORCE_CRASH()  asm("break 0;;");
 
 // these declarations got moved at some point, find a better place for them
-extern int opt_noht;
 extern int ht_per_core;
 
 // needed for include/xen/smp.h

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