[Xen-changelog] [xen-unstable] [XENOPROFILE] Update xenoprof linux side patch following Renato's comment.

[Xen patchbot-unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User kfraser@xxxxxxxxxxxxxxxxxxxxx
# Node ID 1ef9954a26686b35b946d889726d4d35c283c2a0
# Parent  b63584cc9376209fccb1afc79f6185f64650a62e
[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@xxxxxxxxxxxxx>
---
 linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c       |    2 +-
 linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h |    4 ++--
 linux-2.6-xen-sparse/include/xen/xenoprof.h                   |    9 +++------
 3 files changed, 6 insertions(+), 9 deletions(-)

diff -r b63584cc9376 -r 1ef9954a2668 
linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c
--- a/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c   Wed Nov 22 
09:50:37 2006 +0000
+++ b/linux-2.6-xen-sparse/drivers/xen/xenoprof/xenoprofile.c   Wed Nov 22 
09:51:20 2006 +0000
@@ -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 b63584cc9376 -r 1ef9954a2668 
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     Wed Nov 
22 09:50:37 2006 +0000
+++ b/linux-2.6-xen-sparse/include/asm-i386/mach-xen/asm/xenoprof.h     Wed Nov 
22 09:51:20 2006 +0000
@@ -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 b63584cc9376 -r 1ef9954a2668 linux-2.6-xen-sparse/include/xen/xenoprof.h
--- a/linux-2.6-xen-sparse/include/xen/xenoprof.h       Wed Nov 22 09:50:37 
2006 +0000
+++ b/linux-2.6-xen-sparse/include/xen/xenoprof.h       Wed Nov 22 09:51:20 
2006 +0000
@@ -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__ */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog