On Tue, 2008-03-18 at 21:51 +0800, Dong, Eddie wrote:
> 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.
I disagree, these are xen specific.
Alex
> 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;
> _______________________________________________
> Xen-ia64-devel mailing list
> Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
> http://lists.xensource.com/xen-ia64-devel
--
Alex Williamson HP Open Source & Linux Org.
_______________________________________________
Xen-ia64-devel mailing list
Xen-ia64-devel@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-ia64-devel
|
Home