WARNING - OLD ARCHIVES

This is an archived copy of the Xen.org mailing list, which we have preserved to ensure that existing links to archives are not broken. The live archive, which contains the latest emails, can be found at http://lists.xen.org/
   
 
 
Xen 
 
Home Products Support Community News
 
   
 

xen-ia64-devel

[Xen-ia64-devel] (no subject)

To: <xen-ia64-devel@xxxxxxxxxxxxxxxxxxx>
Subject: [Xen-ia64-devel] (no subject)
From: "Dong, Eddie" <eddie.dong@xxxxxxxxx>
Date: Tue, 18 Mar 2008 21:51:25 +0800
Delivery-date: Tue, 18 Mar 2008 06:51:52 -0700
Envelope-to: www-data@xxxxxxxxxxxxxxxxxx
List-help: <mailto:xen-ia64-devel-request@lists.xensource.com?subject=help>
List-id: Discussion of the ia64 port of Xen <xen-ia64-devel.lists.xensource.com>
List-post: <mailto:xen-ia64-devel@lists.xensource.com>
List-subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=subscribe>
List-unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-ia64-devel>, <mailto:xen-ia64-devel-request@lists.xensource.com?subject=unsubscribe>
Sender: xen-ia64-devel-bounces@xxxxxxxxxxxxxxxxxxx
Thread-index: AciI/yhi+yj+RlK4RKOYxWtgK0G2+w==
Following CONFIG_XEN is kind of historic issue, with CONFIG_PARAVIRT,
those code should be always enabled, so replacing with CONFIG_PARAVIRT
makes more sense.

Signed-off-by: Yaozu (Eddie) Dong <eddie.dong@xxxxxxxxx>




diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index a80dd3f..61643f8 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -91,8 +91,8 @@ $(obj)/xen_%.o: $(src)/%.S FORCE
 #
 # xenivt.o, xen_switch_leave.o
 #
-obj-$(CONFIG_XEN) += xen_ivt.o xen_switch_leave.o
-ifeq ($(CONFIG_XEN), y)
+obj-$(CONFIG_PARAVIRT) += xen_ivt.o xen_switch_leave.o
+ifeq ($(CONFIG_PARAVIRT), y)
 targets += xen_ivt.o xen_switch_leave.o
 $(obj)/build-in.o: xen_ivt.o xen_switch_leave.o
 endif
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c
index 91bc631..dd6b986 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -378,7 +378,7 @@ salinfo_log_open(struct inode *inode, struct file
*file)
                data->open = 0;
                return -ENOMEM;
        }
-#ifdef CONFIG_XEN
+#ifdef CONFIG_PARAVIRT
        if (is_running_on_xen()) {
                ia64_mca_xencomm_t *entry;
                unsigned long flags;
@@ -408,7 +408,7 @@ salinfo_log_release(struct inode *inode, struct file
*file)
        struct salinfo_data *data = entry->data;
 
        if (data->state == STATE_NO_DATA) {
-#ifdef CONFIG_XEN
+#ifdef CONFIG_PARAVIRT
                if (is_running_on_xen()) {
                        struct list_head *pos, *n;
                        ia64_mca_xencomm_t *found_entry = NULL;
diff --git a/include/asm-ia64/hw_irq.h b/include/asm-ia64/hw_irq.h
diff --git a/include/asm-ia64/sal.h b/include/asm-ia64/sal.h
index 2965112..8aeefd2 100644
--- a/include/asm-ia64/sal.h
+++ b/include/asm-ia64/sal.h
@@ -682,7 +682,7 @@ ia64_sal_clear_state_info (u64 sal_info_type)
 /* Get the processor and platform information logged by SAL with
respect to the machine
  * state at the time of the MCAs, INITs, CMCs, or CPEs.
  */
-#ifdef CONFIG_XEN
+#ifdef CONFIG_PARAVIRT
 static inline u64 ia64_sal_get_state_info_size (u64 sal_info_type);
 typedef struct ia64_mca_xencomm_t {
        void *record;
@@ -697,7 +697,7 @@ static inline u64
 ia64_sal_get_state_info (u64 sal_info_type, u64 *sal_info)
 {
        struct ia64_sal_retval isrv;
-#ifdef CONFIG_XEN
+#ifdef CONFIG_PARAVIRT
        if (is_running_on_xen()) {
                ia64_mca_xencomm_t *entry;
                struct xencomm_handle *desc = NULL;

Attachment: x2
Description: x2

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