# HG changeset patch
# User awilliam@xxxxxxxxxxx
# Node ID 6a49e02dc169540992956eb35b7736ee698a2029
# Parent 0fff4c07af186f6772060a4b3b40a05329c598fb
[IA64] remove xenia64_init.c
Relocate the few bits left to ia64 specific parts of the tree.
Signed-off-by: Alex Williamson <alex.williamson@xxxxxx>
---
linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c | 60 --------------
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c | 16 ++-
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre | 3
linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile | 1
linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c | 9 ++
linux-2.6-xen-sparse/arch/ia64/xen/util.c | 15 +++
6 files changed, 34 insertions(+), 70 deletions(-)
diff -r 0fff4c07af18 -r 6a49e02dc169
linux-2.6-xen-sparse/arch/ia64/kernel/setup.c
--- a/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Tue Jun 06 09:01:38
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/kernel/setup.c Tue Jun 06 09:06:19
2006 -0600
@@ -519,14 +519,18 @@ setup_arch (char **cmdline_p)
}
#ifdef CONFIG_XEN
if (is_running_on_xen()) {
- extern shared_info_t *HYPERVISOR_shared_info;
- extern int xen_init (void);
-
- xen_init ();
+ shared_info_t *s = HYPERVISOR_shared_info;
+
+ xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
+ xen_start_info->flags = s->arch.flags;
+
+ printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld "
+ "flags=0x%x\n", s->arch.start_info_pfn,
+ xen_start_info->nr_pages, xen_start_info->flags);
/* xen_start_info isn't setup yet, get the flags manually */
- if (HYPERVISOR_shared_info->arch.flags & SIF_INITDOMAIN) {
- if (!(HYPERVISOR_shared_info->arch.flags &
SIF_PRIVILEGED))
+ if (s->arch.flags & SIF_INITDOMAIN) {
+ if (!(s->arch.flags & SIF_PRIVILEGED))
panic("Xen granted us console access "
"but not privileged status");
} else {
diff -r 0fff4c07af18 -r 6a49e02dc169
linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre
--- a/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Tue Jun 06
09:01:38 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen-mkbuildtree-pre Tue Jun 06
09:06:19 2006 -0600
@@ -16,9 +16,6 @@ ln -sf ../../arch/ia64/xen/drivers/Makef
ln -sf ../../arch/ia64/xen/drivers/Makefile drivers/xen/Makefile
ln -sf ../../../arch/ia64/xen/drivers/coreMakefile drivers/xen/core/Makefile
-#not sure where these ia64-specific files will end up in the future
-ln -sf ../../../arch/ia64/xen/drivers/xenia64_init.c drivers/xen/core
-
#still a few x86-ism's in various drivers/xen files, patch them
#cd drivers/xen
#if [ ! -e ia64.patch.semaphore ]
diff -r 0fff4c07af18 -r 6a49e02dc169
linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile Tue Jun 06
09:01:38 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/drivers/coreMakefile Tue Jun 06
09:06:19 2006 -0600
@@ -7,7 +7,6 @@ obj-$(CONFIG_PROC_FS) += xen_proc.o
ifeq ($(ARCH),ia64)
obj-y += evtchn.o
-obj-y += xenia64_init.o
ifeq ($(CONFIG_XEN_IA64_DOM0_VP),y)
obj-$(CONFIG_NET) += skbuff.o
endif
diff -r 0fff4c07af18 -r 6a49e02dc169
linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Tue Jun 06 09:01:38
2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/hypervisor.c Tue Jun 06 09:06:19
2006 -0600
@@ -23,12 +23,21 @@
//#include <linux/kernel.h>
#include <linux/spinlock.h>
#include <linux/bootmem.h>
+#include <linux/module.h>
#include <linux/vmalloc.h>
#include <asm/page.h>
#include <asm/hypervisor.h>
#include <asm/hypercall.h>
#include <xen/interface/memory.h>
#include <xen/balloon.h>
+
+shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
+EXPORT_SYMBOL(HYPERVISOR_shared_info);
+
+start_info_t *xen_start_info;
+
+int running_on_xen;
+EXPORT_SYMBOL(running_on_xen);
//XXX xen/ia64 copy_from_guest() is broken.
// This is a temporal work around until it is fixed.
diff -r 0fff4c07af18 -r 6a49e02dc169 linux-2.6-xen-sparse/arch/ia64/xen/util.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/util.c Tue Jun 06 09:01:38 2006 -0600
+++ b/linux-2.6-xen-sparse/arch/ia64/xen/util.c Tue Jun 06 09:06:19 2006 -0600
@@ -104,6 +104,21 @@ void unlock_vm_area(struct vm_struct *ar
}
EXPORT_SYMBOL_GPL(unlock_vm_area);
+#ifndef CONFIG_XEN_IA64_DOM0_VP
+/* We just need a range of legal va here, though finally identity
+ * mapped one is instead used for gnttab mapping.
+ */
+unsigned long alloc_empty_foreign_map_page_range(unsigned long pages)
+{
+ struct vm_struct *vma;
+
+ if ( (vma = get_vm_area(PAGE_SIZE * pages, VM_ALLOC)) == NULL )
+ return NULL;
+
+ return (unsigned long)vma->addr;
+}
+#endif
+
/*
* Local variables:
* c-file-style: "linux"
diff -r 0fff4c07af18 -r 6a49e02dc169
linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c
--- a/linux-2.6-xen-sparse/arch/ia64/xen/drivers/xenia64_init.c Tue Jun 06
09:01:38 2006 -0600
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-#ifdef __ia64__
-#include <linux/config.h>
-#include <linux/module.h>
-#include <linux/efi.h>
-#include <asm/sal.h>
-#include <asm/hypervisor.h>
-/* #include <asm-xen/evtchn.h> */
-#include <xen/interface/arch-ia64.h>
-#include <linux/vmalloc.h>
-
-shared_info_t *HYPERVISOR_shared_info = (shared_info_t *)XSI_BASE;
-EXPORT_SYMBOL(HYPERVISOR_shared_info);
-
-start_info_t *xen_start_info;
-
-int running_on_xen;
-EXPORT_SYMBOL(running_on_xen);
-
-int xen_init(void)
-{
- static int initialized;
- shared_info_t *s = HYPERVISOR_shared_info;
-
- if (initialized)
- return running_on_xen ? 0 : -1;
-
- if (!is_running_on_xen())
- return -1;
-
- xen_start_info = __va(s->arch.start_info_pfn << PAGE_SHIFT);
- xen_start_info->flags = s->arch.flags;
- printk("Running on Xen! start_info_pfn=0x%lx nr_pages=%ld flags=0x%x\n",
- s->arch.start_info_pfn, xen_start_info->nr_pages,
- xen_start_info->flags);
-
- initialized = 1;
- return 0;
-}
-
-#ifndef CONFIG_XEN_IA64_DOM0_VP
-/* We just need a range of legal va here, though finally identity
- * mapped one is instead used for gnttab mapping.
- */
-unsigned long alloc_empty_foreign_map_page_range(unsigned long pages)
-{
- struct vm_struct *vma;
-
- if ( (vma = get_vm_area(PAGE_SIZE * pages, VM_ALLOC)) == NULL )
- return NULL;
-
- return (unsigned long)vma->addr;
-}
-#endif
-
-#if 0
-/* These should be define'd but some drivers use them without
- * a convenient arch include */
-unsigned long mfn_to_pfn(unsigned long mfn) { return mfn; }
-#endif
-#endif
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home