# HG changeset patch
# User yamahata@xxxxxxxxxxxxx
# Date 1164087772 -32400
# Node ID ab6c1b607484d3b273d091a11334a3458d36349c
# Parent  e8fba03edf517b88a91aee47afbc15ab89e5d434
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.
PATCHNAME: xenoprof_linux_side_update

Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>

diff -r e8fba03edf51 -r ab6c1b607484 linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c	Tue Nov 14 15:34:22 2006 +0900
+++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c	Tue Nov 21 14:42:52 2006 +0900
@@ -48,7 +48,7 @@ static void xenoprof_stop(void);
 static void xenoprof_stop(void);
 
 static int xenoprof_enabled = 0;
-int xenoprof_is_primary = 0;
+static int xenoprof_is_primary = 0;
 static int active_defined;
 
 /* Number of buffers in shared area (one per VCPU) */
diff -r e8fba03edf51 -r ab6c1b607484 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h
--- a/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h	Tue Nov 14 15:34:22 2006 +0900
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h	Tue Nov 21 14:42:52 2006 +0900
@@ -21,7 +21,7 @@
  */
 #ifndef __ASM_XENOPROF_H__
 #define __ASM_XENOPROF_H__
-#ifdef CONFIG_OPROFILE
+#ifdef CONFIG_XEN
 
 struct super_block;
 struct dentry;
@@ -44,5 +44,5 @@ struct xenoprof_passive;
 struct xenoprof_passive;
 int xenoprof_arch_set_passive(struct xenoprof_passive* pdomain, struct xenoprof_shared_buffer* sbuf);
 
-#endif /* CONFIG_OPROFILE */
+#endif /* CONFIG_XEN */
 #endif /* __ASM_XENOPROF_H__ */
diff -r e8fba03edf51 -r ab6c1b607484 linux-2.6-xen-sparse/include/xen/xenoprof.h
--- a/linux-2.6-xen-sparse/include/xen/xenoprof.h	Tue Nov 14 15:34:22 2006 +0900
+++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h	Tue Nov 21 14:42:52 2006 +0900
@@ -22,24 +22,21 @@
 
 #ifndef __XEN_XENOPROF_H__
 #define __XEN_XENOPROF_H__
+#ifdef CONFIG_XEN
 
-#ifdef CONFIG_OPROFILE
 #include <asm/xenoprof.h>
 
 struct oprofile_operations;
 int xenoprofile_init(struct oprofile_operations * ops);
 void xenoprofile_exit(void);
 
-extern int xenoprof_is_primary;
-#define is_xenoprof_primary()	(xenoprof_is_primary)
 struct xenoprof_shared_buffer {
 	char					*buffer;
 	struct xenoprof_arch_shared_buffer	arch;
 };
 #else
-#define xenoprofile_init(ops)	do { } while (0)
+#define xenoprofile_init(ops)	(-ENOSYS)
 #define xenoprofile_exit()	do { } while (0)
-#define is_xenoprof_primary()	(0)
-#endif /* CONFIG_OPROFILE */
 
+#endif /* CONFIG_XEN */
 #endif /* __XEN_XENOPROF_H__ */