[Xen-changelog] Merge linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/test1.bk

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1472.2.4, 2005/05/22 12:25:39-07:00, adsharma@xxxxxxxxxxxxxxxxxxxxxx

        Merge linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/test1.bk
        into 
linux-t08.sc.intel.com:/disk2/adsharma/xen-ia64/xeno-unstable-ia64-staging.bk



 config.h |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletion(-)


diff -Nru a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
--- a/xen/include/asm-ia64/config.h     2005-05-23 12:04:19 -04:00
+++ b/xen/include/asm-ia64/config.h     2005-05-23 12:04:19 -04:00
@@ -1,3 +1,6 @@
+#ifndef        _IA64_CONFIG_H_
+#define _IA64_CONFIG_H_
+
 // control flags for turning on/off features under test
 #undef CLONE_DOMAIN0
 //#define CLONE_DOMAIN0 1
@@ -41,6 +44,8 @@
 extern unsigned long xenheap_phys_end;
 extern unsigned long xen_pstart;
 extern unsigned long xenheap_size;
+extern unsigned long dom0_start;
+extern unsigned long dom0_size;
 
 // from linux/include/linux/mm.h
 extern struct page *mem_map;
@@ -159,7 +164,11 @@
 #define NO_UART_CONFIG_OK
 
 // see drivers/char/console.c
+#ifndef CONFIG_VTI
 #define        OPT_CONSOLE_STR "com1"
+#else // CONFIG_VTI
+#define        OPT_CONSOLE_STR "com2"
+#endif // CONFIG_VTI
 
 #define __attribute_used__     __attribute__ ((unused))
 
@@ -268,4 +277,4 @@
 #else
 # define __attribute_used__    __attribute__((__unused__))
 #endif
-
+#endif /* _IA64_CONFIG_H_ */

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