direct-io.hg

changeset 12509:1ef9954a2668

[XENOPROFILE] Update xenoprof linux side patch following Renato's comment.
- compilation fix when CONFIG_OPROFILE=m with minor clean up
- don't export xenoprof_is_primary.

Signed-off-by: Isaku Yamahata <yamahata@valinux.co.jp>
author kfraser@localhost.localdomain
date Wed Nov 22 09:51:20 2006 +0000 (2006-11-22)
parents b63584cc9376
children 1d7d5d48fcdc
files linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h linux-2.6-xen-sparse/include/xen/xenoprof.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c	Wed Nov 22 09:50:37 2006 +0000
     1.2 +++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c	Wed Nov 22 09:51:20 2006 +0000
     1.3 @@ -48,7 +48,7 @@ static int xenoprof_start(void);
     1.4  static void xenoprof_stop(void);
     1.5  
     1.6  static int xenoprof_enabled = 0;
     1.7 -int xenoprof_is_primary = 0;
     1.8 +static int xenoprof_is_primary = 0;
     1.9  static int active_defined;
    1.10  
    1.11  /* Number of buffers in shared area (one per VCPU) */
     2.1 --- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h	Wed Nov 22 09:50:37 2006 +0000
     2.2 +++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h	Wed Nov 22 09:51:20 2006 +0000
     2.3 @@ -21,7 +21,7 @@
     2.4   */
     2.5  #ifndef __ASM_XENOPROF_H__
     2.6  #define __ASM_XENOPROF_H__
     2.7 -#ifdef CONFIG_OPROFILE
     2.8 +#ifdef CONFIG_XEN
     2.9  
    2.10  struct super_block;
    2.11  struct dentry;
    2.12 @@ -44,5 +44,5 @@ int xenoprof_arch_map_shared_buffer(stru
    2.13  struct xenoprof_passive;
    2.14  int xenoprof_arch_set_passive(struct xenoprof_passive* pdomain, struct xenoprof_shared_buffer* sbuf);
    2.15  
    2.16 -#endif /* CONFIG_OPROFILE */
    2.17 +#endif /* CONFIG_XEN */
    2.18  #endif /* __ASM_XENOPROF_H__ */
     3.1 --- a/linux-2.6-xen-sparse/include/xen/xenoprof.h	Wed Nov 22 09:50:37 2006 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h	Wed Nov 22 09:51:20 2006 +0000
     3.3 @@ -22,24 +22,21 @@
     3.4  
     3.5  #ifndef __XEN_XENOPROF_H__
     3.6  #define __XEN_XENOPROF_H__
     3.7 +#ifdef CONFIG_XEN
     3.8  
     3.9 -#ifdef CONFIG_OPROFILE
    3.10  #include <asm/xenoprof.h>
    3.11  
    3.12  struct oprofile_operations;
    3.13  int xenoprofile_init(struct oprofile_operations * ops);
    3.14  void xenoprofile_exit(void);
    3.15  
    3.16 -extern int xenoprof_is_primary;
    3.17 -#define is_xenoprof_primary()	(xenoprof_is_primary)
    3.18  struct xenoprof_shared_buffer {
    3.19  	char					*buffer;
    3.20  	struct xenoprof_arch_shared_buffer	arch;
    3.21  };
    3.22  #else
    3.23 -#define xenoprofile_init(ops)	do { } while (0)
    3.24 +#define xenoprofile_init(ops)	(-ENOSYS)
    3.25  #define xenoprofile_exit()	do { } while (0)
    3.26 -#define is_xenoprof_primary()	(0)
    3.27 -#endif /* CONFIG_OPROFILE */
    3.28  
    3.29 +#endif /* CONFIG_XEN */
    3.30  #endif /* __XEN_XENOPROF_H__ */