ia64/xen-unstable

changeset 12661:52e6bf6dc744

[IA64] Fix sparse tree xenoprof/perfmon/oprofile build dependencies

Compile xenoprof perfmon related hypercall even when
CONFIG_PERFMON, CONFIG_OPROFILE, CONFIG_OPROFILE_MODULE are disabled.
They should be compiled in vmlinux unconditionally because they
might be called by other modules in theory.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author awilliam@xenbuild.aw
date Thu Nov 30 15:57:15 2006 -0700 (2006-11-30)
parents d8c32fa3e3a9
children 251630d85510
files linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c linux-2.6-xen-sparse/include/asm-ia64/hypercall.h linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c	Wed Nov 29 11:07:28 2006 -0700
     1.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_hcall.c	Thu Nov 30 15:57:15 2006 -0700
     1.3 @@ -304,7 +304,6 @@ xencomm_hypercall_suspend(unsigned long 
     1.4  	return xencomm_arch_hypercall_suspend(xencomm_create_inline(&arg));
     1.5  }
     1.6  
     1.7 -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
     1.8  int
     1.9  xencomm_hypercall_xenoprof_op(int op, void *arg)
    1.10  {
    1.11 @@ -336,9 +335,7 @@ xencomm_hypercall_xenoprof_op(int op, vo
    1.12  	return xencomm_arch_hypercall_xenoprof_op(op,
    1.13  						  xencomm_create_inline(arg));
    1.14  }
    1.15 -#endif
    1.16  
    1.17 -#ifdef CONFIG_PERFMON
    1.18  int
    1.19  xencomm_hypercall_perfmon_op(unsigned long cmd, void* arg, unsigned long count)
    1.20  {
    1.21 @@ -366,4 +363,3 @@ xencomm_hypercall_perfmon_op(unsigned lo
    1.22  	                                         xencomm_create_inline(arg),
    1.23  	                                         count);
    1.24  }
    1.25 -#endif
     2.1 --- a/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c	Wed Nov 29 11:07:28 2006 -0700
     2.2 +++ b/linux-2.6-xen-sparse/arch/ia64/xen/xcom_mini.c	Thu Nov 30 15:57:15 2006 -0700
     2.3 @@ -323,7 +323,6 @@ xencomm_mini_hypercall_xen_version(int c
     2.4  }
     2.5  EXPORT_SYMBOL(xencomm_mini_hypercall_xen_version);
     2.6  
     2.7 -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
     2.8  int
     2.9  xencomm_mini_hypercall_xenoprof_op(int op, void *arg)
    2.10  {
    2.11 @@ -372,9 +371,7 @@ xencomm_mini_hypercall_xenoprof_op(int o
    2.12  	return xencomm_arch_hypercall_xenoprof_op(op, desc);
    2.13  }
    2.14  EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_xenoprof_op);
    2.15 -#endif
    2.16  
    2.17 -#ifdef CONFIG_PERFMON
    2.18  int
    2.19  xencomm_mini_hypercall_perfmon_op(unsigned long cmd, void* arg,
    2.20                                    unsigned long count)
    2.21 @@ -418,4 +415,3 @@ xencomm_mini_hypercall_perfmon_op(unsign
    2.22  	return xencomm_arch_hypercall_perfmon_op(cmd, desc, count);
    2.23  }
    2.24  EXPORT_SYMBOL_GPL(xencomm_mini_hypercall_perfmon_op);
    2.25 -#endif
     3.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Wed Nov 29 11:07:28 2006 -0700
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/hypercall.h	Thu Nov 30 15:57:15 2006 -0700
     3.3 @@ -399,7 +399,6 @@ HYPERVISOR_expose_p2m(unsigned long conv
     3.4  }
     3.5  #endif
     3.6  
     3.7 -#ifdef CONFIG_PERFMON
     3.8  static inline int
     3.9  xencomm_arch_hypercall_perfmon_op(unsigned long cmd,
    3.10                                    struct xencomm_handle *arg,
    3.11 @@ -408,7 +407,6 @@ xencomm_arch_hypercall_perfmon_op(unsign
    3.12  	return _hypercall4(int, ia64_dom0vp_op,
    3.13  			   IA64_DOM0VP_perfmon, cmd, arg, count);
    3.14  }
    3.15 -#endif
    3.16  
    3.17  // for balloon driver
    3.18  #define HYPERVISOR_update_va_mapping(va, new_val, flags) (0)
     4.1 --- a/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h	Wed Nov 29 11:07:28 2006 -0700
     4.2 +++ b/linux-2.6-xen-sparse/include/asm-ia64/xen/xcom_hcall.h	Thu Nov 30 15:57:15 2006 -0700
     4.3 @@ -46,14 +46,10 @@ extern unsigned long xencomm_hypercall_h
     4.4  
     4.5  extern int xencomm_hypercall_suspend(unsigned long srec);
     4.6  
     4.7 -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
     4.8  extern int xencomm_hypercall_xenoprof_op(int op, void *arg);
     4.9 -#endif
    4.10  
    4.11 -#ifdef CONFIG_PERFMON
    4.12  extern int xencomm_hypercall_perfmon_op(unsigned long cmd, void* arg,
    4.13                                          unsigned long count);
    4.14 -#endif
    4.15  
    4.16  /* Using mini xencomm.  */
    4.17  extern int xencomm_mini_hypercall_console_io(int cmd, int count, char *str);
    4.18 @@ -77,14 +73,10 @@ extern int xencomm_mini_hypercall_memory
    4.19  
    4.20  extern unsigned long xencomm_mini_hypercall_hvm_op(int cmd, void *arg);
    4.21  
    4.22 -#if defined(CONFIG_OPROFILE) || defined(CONFIG_OPROFILE_MODULE)
    4.23  extern int xencomm_mini_hypercall_xenoprof_op(int op, void *arg);
    4.24 -#endif
    4.25  
    4.26 -#ifdef CONFIG_PERFMON
    4.27  extern int xencomm_mini_hypercall_perfmon_op(unsigned long cmd, void* arg,
    4.28                                               unsigned long count);
    4.29 -#endif
    4.30  
    4.31  /* For privcmd.  Locally declare argument type to avoid include storm.
    4.32     Type coherency will be checked within privcmd.c  */