From: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
To: xen-devel@lists.xensource.com
Cc: Stefano Stabellini <stefano.stabellini@eu.citrix.com>,
Ian Campbell <ian.campbell@citrix.com>,
Tim.Deegan@citrix.com
Subject: [PATCH v6 03/27] A collection of fixes to Xen common files
Date: Fri, 20 Jan 2012 16:35:51 +0000 [thread overview]
Message-ID: <1327077375-7623-3-git-send-email-stefano.stabellini@eu.citrix.com> (raw)
In-Reply-To: <alpine.DEB.2.00.1201201605370.3196@kaball-desktop>
- call free_xenoprof_pages only ifdef CONFIG_XENOPROF;
- define PRI_stime as PRId64 in an header file;
- respect boundaries in is_kernel_*;
- implement is_kernel_rodata;
- guest_physmap_add_page should be ((void)0).
Changes in v4:
- fix guest_physmap_add_page;
Changes in v2:
- introduce CONFIG_XENOPROF;
- define _srodata and _erodata as const char*.
Signed-off-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Signed-off-by: Tim Deegan <Tim.Deegan@citrix.com>
---
xen/common/domain.c | 2 ++
xen/common/sched_credit2.c | 6 ------
xen/include/asm-ia64/config.h | 1 +
xen/include/asm-x86/config.h | 2 ++
xen/include/xen/kernel.h | 12 +++++++++---
xen/include/xen/paging.h | 2 +-
xen/include/xen/time.h | 1 +
7 files changed, 16 insertions(+), 10 deletions(-)
diff --git a/xen/common/domain.c b/xen/common/domain.c
index 1100517..3c6c5af 100644
--- a/xen/common/domain.c
+++ b/xen/common/domain.c
@@ -635,7 +635,9 @@ static void complete_domain_destroy(struct rcu_head *head)
sched_destroy_domain(d);
/* Free page used by xen oprofile buffer. */
+#ifdef CONFIG_XENOPROF
free_xenoprof_pages(d);
+#endif
xfree(d->mem_event);
diff --git a/xen/common/sched_credit2.c b/xen/common/sched_credit2.c
index 65825b4..ac2be2a 100644
--- a/xen/common/sched_credit2.c
+++ b/xen/common/sched_credit2.c
@@ -26,12 +26,6 @@
#include <xen/trace.h>
#include <xen/cpu.h>
-#if __i386__
-#define PRI_stime "lld"
-#else
-#define PRI_stime "ld"
-#endif
-
#define d2printk(x...)
//#define d2printk printk
diff --git a/xen/include/asm-ia64/config.h b/xen/include/asm-ia64/config.h
index be94b48..0173487 100644
--- a/xen/include/asm-ia64/config.h
+++ b/xen/include/asm-ia64/config.h
@@ -20,6 +20,7 @@
#define CONFIG_EFI
#define CONFIG_EFI_PCDP
#define CONFIG_SERIAL_SGI_L1_CONSOLE
+#define CONFIG_XENOPROF 1
#define CONFIG_XEN_SMP
diff --git a/xen/include/asm-x86/config.h b/xen/include/asm-x86/config.h
index e8f8211..18d0a05 100644
--- a/xen/include/asm-x86/config.h
+++ b/xen/include/asm-x86/config.h
@@ -48,6 +48,8 @@
#define CONFIG_HOTPLUG 1
#define CONFIG_HOTPLUG_CPU 1
+#define CONFIG_XENOPROF 1
+
#define HZ 100
#define OPT_CONSOLE_STR "vga"
diff --git a/xen/include/xen/kernel.h b/xen/include/xen/kernel.h
index fd03f74..92de428 100644
--- a/xen/include/xen/kernel.h
+++ b/xen/include/xen/kernel.h
@@ -66,19 +66,25 @@
extern char _start[], _end[];
#define is_kernel(p) ({ \
char *__p = (char *)(unsigned long)(p); \
- (__p >= _start) && (__p <= _end); \
+ (__p >= _start) && (__p < _end); \
})
extern char _stext[], _etext[];
#define is_kernel_text(p) ({ \
char *__p = (char *)(unsigned long)(p); \
- (__p >= _stext) && (__p <= _etext); \
+ (__p >= _stext) && (__p < _etext); \
+})
+
+extern const char _srodata[], _erodata[];
+#define is_kernel_rodata(p) ({ \
+ const char *__p = (const char *)(unsigned long)(p); \
+ (__p >= _srodata) && (__p < _erodata); \
})
extern char _sinittext[], _einittext[];
#define is_kernel_inittext(p) ({ \
char *__p = (char *)(unsigned long)(p); \
- (__p >= _sinittext) && (__p <= _einittext); \
+ (__p >= _sinittext) && (__p < _einittext); \
})
#endif /* _LINUX_KERNEL_H */
diff --git a/xen/include/xen/paging.h b/xen/include/xen/paging.h
index 213ece4..123cc58 100644
--- a/xen/include/xen/paging.h
+++ b/xen/include/xen/paging.h
@@ -18,7 +18,7 @@
#define paging_mode_translate(d) (0)
#define paging_mode_external(d) (0)
-#define guest_physmap_add_page(d, p, m, o) (0)
+#define guest_physmap_add_page(d, p, m, o) ((void)0)
#define guest_physmap_remove_page(d, p, m, o) ((void)0)
#endif
diff --git a/xen/include/xen/time.h b/xen/include/xen/time.h
index a194340..31c9ce5 100644
--- a/xen/include/xen/time.h
+++ b/xen/include/xen/time.h
@@ -30,6 +30,7 @@ struct vcpu;
*/
typedef s64 s_time_t;
+#define PRI_stime PRId64
s_time_t get_s_time(void);
unsigned long get_localtime(struct domain *d);
--
1.7.2.5
next prev parent reply other threads:[~2012-01-20 16:35 UTC|newest]
Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-20 16:35 [PATCH v6 00/27] xen: ARMv7 with virtualization extensions Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 01/27] Move cpufreq option parsing to cpufreq.c Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 02/27] Include some header files that are not automatically included on all archs Stefano Stabellini
2012-01-20 16:35 ` Stefano Stabellini [this message]
2012-01-20 16:35 ` [PATCH v6 04/27] xen: implement an signed 64 bit division helper function Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 05/27] Introduce clear_user and clear_guest Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 06/27] libelf-loader: introduce elf_load_image Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 07/27] xen/common/Makefile: introduce HAS_CPUFREQ, HAS_PCI, HAS_PASSTHROUGH, HAS_NS16550, HAS_KEXEC Stefano Stabellini
2012-01-27 15:15 ` Ian Campbell
2012-02-08 8:35 ` Keir Fraser
2012-01-20 16:35 ` [PATCH v6 08/27] arm: compile tmem Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 09/27] arm: header files Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 10/27] arm: bit manipulation, copy and division libraries Stefano Stabellini
2012-01-20 16:35 ` [PATCH v6 11/27] arm: entry.S and head.S Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 12/27] arm: domain Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 13/27] arm: domain_build Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 14/27] arm: driver for CoreLink GIC-400 Generic Interrupt Controller Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 15/27] arm: mmio handlers Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 16/27] arm: irq Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 17/27] arm: mm and p2m Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 19/27] arm: early setup code Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 20/27] arm: shutdown, smp and smpboot Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 21/27] arm: driver for the generic timer for ARMv7 Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 22/27] arm: trap handlers Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 23/27] arm: vgic emulation Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 24/27] arm: vtimer Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 25/27] arm: makefiles Stefano Stabellini
2012-02-02 16:46 ` Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 26/27] ARM: support zImage format kernels for dom0 Stefano Stabellini
2012-01-20 16:36 ` [PATCH v6 27/27] ARM: copy DTB appended to zImage Stefano Stabellini
2012-02-09 11:49 ` [PATCH v6 00/27] xen: ARMv7 with virtualization extensions Ian Campbell
2012-02-09 14:45 ` Ian Campbell
2012-02-09 14:53 ` [PATCH] arm: define domain_pirq_to_irq Ian Campbell
2012-02-09 15:18 ` Stefano Stabellini
2012-02-09 15:21 ` Ian Campbell
2012-02-09 15:28 ` Stefano Stabellini
2012-02-09 15:52 ` Ian Campbell
2012-02-09 14:53 ` [PATCH] arm: define stub arch_dump_shared_mem_info Ian Campbell
2012-02-09 15:19 ` Stefano Stabellini
2012-02-09 15:22 ` Ian Campbell
2012-02-09 15:28 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1327077375-7623-3-git-send-email-stefano.stabellini@eu.citrix.com \
--to=stefano.stabellini@eu.citrix.com \
--cc=Tim.Deegan@citrix.com \
--cc=ian.campbell@citrix.com \
--cc=xen-devel@lists.xensource.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).