direct-io.hg

changeset 11221:a58ffedb59ce

[LINUX] Revert bits of cset 11202 since they break the -xenU build for x86/64.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
author Ian Campbell <ian.campbell@xensource.com>
date Tue Aug 22 11:30:13 2006 +0100 (2006-08-22)
parents f681ffc9b01a
children cd4e7ace4e58
files linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c	Mon Aug 21 12:05:11 2006 -0400
     1.2 +++ b/linux-2.6-xen-sparse/arch/x86_64/kernel/genapic_xen.c	Tue Aug 22 11:30:13 2006 +0100
     1.3 @@ -17,8 +17,14 @@
     1.4  #include <linux/kernel.h>
     1.5  #include <linux/ctype.h>
     1.6  #include <linux/init.h>
     1.7 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
     1.8  #include <asm/smp.h>
     1.9  #include <asm/ipi.h>
    1.10 +#else
    1.11 +#include <asm/apic.h>
    1.12 +#include <asm/apicdef.h>
    1.13 +#include <asm/genapic.h>
    1.14 +#endif
    1.15  #include <xen/evtchn.h>
    1.16  
    1.17  DECLARE_PER_CPU(int, ipi_to_irq[NR_IPIS]);
    1.18 @@ -112,12 +118,14 @@ static void xen_send_IPI_mask(cpumask_t 
    1.19  	local_irq_restore(flags);
    1.20  }
    1.21  
    1.22 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.23  static int xen_apic_id_registered(void)
    1.24  {
    1.25  	/* better be set */
    1.26  	Dprintk("%s\n", __FUNCTION__);
    1.27  	return physid_isset(smp_processor_id(), phys_cpu_present_map);
    1.28  }
    1.29 +#endif
    1.30  
    1.31  static unsigned int xen_cpu_mask_to_apicid(cpumask_t cpumask)
    1.32  {
    1.33 @@ -136,11 +144,15 @@ static unsigned int phys_pkg_id(int inde
    1.34  
    1.35  struct genapic apic_xen =  {
    1.36  	.name = "xen",
    1.37 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.38  	.int_delivery_mode = dest_LowestPrio,
    1.39 +#endif
    1.40  	.int_dest_mode = (APIC_DEST_LOGICAL != 0),
    1.41  	.int_delivery_dest = APIC_DEST_LOGICAL | APIC_DM_LOWEST,
    1.42  	.target_cpus = xen_target_cpus,
    1.43 +#ifdef CONFIG_XEN_PRIVILEGED_GUEST
    1.44  	.apic_id_registered = xen_apic_id_registered,
    1.45 +#endif
    1.46  	.init_apic_ldr = xen_init_apic_ldr,
    1.47  	.send_IPI_all = xen_send_IPI_all,
    1.48  	.send_IPI_allbutself = xen_send_IPI_allbutself,