# HG changeset patch
# User Alex Williamson <alex.williamson@xxxxxx>
# Date 1184881559 21600
# Node ID dc1cdd6bbbf2365f6e6c8fff63358280e528b95b
# Parent bf38300f5e6360aaabe0457f7bdd344fbe43357a
[IA64] Trivial compilation fix when CONFIG_XEN=n
Signed-off-by: Isaku Yamahata <yamahata@xxxxxxxxxxxxx>
---
arch/ia64/hp/common/sba_iommu.c | 1 +
arch/ia64/kernel/perfmon.c | 5 ++++-
arch/ia64/kernel/time.c | 1 +
arch/ia64/oprofile/init.c | 1 +
arch/ia64/oprofile/oprofile_perfmon.h | 4 +++-
include/asm-ia64/page.h | 7 ++++---
6 files changed, 14 insertions(+), 5 deletions(-)
diff -r bf38300f5e63 -r dc1cdd6bbbf2 arch/ia64/hp/common/sba_iommu.c
--- a/arch/ia64/hp/common/sba_iommu.c Sun Jul 15 13:48:57 2007 -0600
+++ b/arch/ia64/hp/common/sba_iommu.c Thu Jul 19 15:45:59 2007 -0600
@@ -42,6 +42,7 @@
#include <asm/system.h> /* wmb() */
#include <asm/acpi-ext.h>
+#include <asm/maddr.h> /* range_straddles_page_boundary() */
#ifdef CONFIG_XEN
#include <xen/gnttab.h>
#include <asm/gnttab_dma.h>
diff -r bf38300f5e63 -r dc1cdd6bbbf2 arch/ia64/kernel/perfmon.c
--- a/arch/ia64/kernel/perfmon.c Sun Jul 15 13:48:57 2007 -0600
+++ b/arch/ia64/kernel/perfmon.c Thu Jul 19 15:45:59 2007 -0600
@@ -52,6 +52,7 @@
#include <asm/delay.h>
#ifdef CONFIG_PERFMON
+#include <asm/hypervisor.h>
#ifdef CONFIG_XEN
//#include <xen/xenoprof.h>
#include <xen/interface/xenoprof.h>
@@ -71,7 +72,9 @@ static int xenoprof_is_primary = 0;
#define init_xenoprof_primary(is_primary) do { } while (0)
#define is_xenoprof_primary() (0)
#define XEN_NOT_SUPPORTED_YET do { } while (0)
-#define HYPERVISOR_perfmon_op(cmd, arg, count) do { } while (0)
+#define HYPERVISOR_perfmon_op(cmd, arg, count) (0)
+#define HYPERVISOR_xenoprof_op(op, arg) ({(void)arg;0;})
+struct xenoprof_init { /* dummy */ };
#endif
/*
diff -r bf38300f5e63 -r dc1cdd6bbbf2 arch/ia64/kernel/time.c
--- a/arch/ia64/kernel/time.c Sun Jul 15 13:48:57 2007 -0600
+++ b/arch/ia64/kernel/time.c Thu Jul 19 15:45:59 2007 -0600
@@ -29,6 +29,7 @@
#include <asm/sections.h>
#include <asm/system.h>
+#include <asm/hypervisor.h>
#ifdef CONFIG_XEN
#include <linux/kernel_stat.h>
#include <linux/posix-timers.h>
diff -r bf38300f5e63 -r dc1cdd6bbbf2 arch/ia64/oprofile/init.c
--- a/arch/ia64/oprofile/init.c Sun Jul 15 13:48:57 2007 -0600
+++ b/arch/ia64/oprofile/init.c Thu Jul 19 15:45:59 2007 -0600
@@ -11,6 +11,7 @@
#include <linux/oprofile.h>
#include <linux/init.h>
#include <linux/errno.h>
+#include <asm/hypervisor.h>
#include "oprofile_perfmon.h"
extern int perfmon_init(struct oprofile_operations * ops);
diff -r bf38300f5e63 -r dc1cdd6bbbf2 arch/ia64/oprofile/oprofile_perfmon.h
--- a/arch/ia64/oprofile/oprofile_perfmon.h Sun Jul 15 13:48:57 2007 -0600
+++ b/arch/ia64/oprofile/oprofile_perfmon.h Thu Jul 19 15:45:59 2007 -0600
@@ -2,10 +2,12 @@
#define OPROFILE_PERFMON_H
#ifdef CONFIG_PERFMON
+#ifdef CONFIG_XEN
int __perfmon_init(void);
void __perfmon_exit(void);
int perfmon_start(void);
void perfmon_stop(void);
+#endif
#else
#define __perfmon_init() (-ENOSYS)
#define __perfmon_exit() do {} while (0)
@@ -21,7 +23,7 @@ extern void xenoprofile_exit(void);
#define STATIC_IF_NO_XEN static
#define xen_perfmon_init() (-ENOSYS)
#define xen_perfmon_exit() do {} while (0)
-#define xenoprofile_init() (-ENOSYS)
+#define xenoprofile_init(ops) (-ENOSYS)
#define xenoprofile_exit() do {} while (0)
#endif /* CONFIG_XEN */
diff -r bf38300f5e63 -r dc1cdd6bbbf2 include/asm-ia64/page.h
--- a/include/asm-ia64/page.h Sun Jul 15 13:48:57 2007 -0600
+++ b/include/asm-ia64/page.h Thu Jul 19 15:45:59 2007 -0600
@@ -231,11 +231,12 @@ get_order (unsigned long size)
? VM_EXEC : 0))
#ifndef __ASSEMBLY__
+
+#include <linux/kernel.h>
+#include <asm/hypervisor.h> /* to compile ioremap.c */
+
#ifdef CONFIG_XEN
-#include <linux/kernel.h>
-#include <asm/hypervisor.h>
-#include <xen/features.h> // to compile netback, netfront
#include <asm/maddr.h>
#define arch_free_page(_page, _order) \
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home