mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 02:30:03 +01:00
Adapt Xenlinux/ia64 to build in the new subarch environment.
From: "Magenheimer, Dan (HP Labs Fort Collins)" <dan.magenheimer@hp.com> Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
This commit is contained in:
cl349@firebug.cl.cam.ac.uk committed
1 parent
3d5a38f03d
commit
1ba8680ea4
8 files changed
+2682
-30
No files matched your search
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -11,9 +11,6 @@
|
||||
NM := $(CROSS_COMPILE)nm -B
|
||||
READELF := $(CROSS_COMPILE)readelf
|
||||
|
||||
# following is temporary pending xen directory restructuring
|
||||
NOSTDINC_FLAGS += -Iinclude/asm-xen
|
||||
|
||||
export AWK
|
||||
|
||||
CHECKFLAGS += -m64 -D__ia64=1 -D__ia64__=1 -D_LP64 -D__LP64__
|
||||
@@ -92,8 +89,6 @@ archclean:
|
||||
$(Q)$(MAKE) $(clean)=$(boot)
|
||||
|
||||
CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
|
||||
#CLEAN_FILES += include/asm-xen/xen-public include/asm-ia64/xen/asm-xsi-offsets.h
|
||||
#CLEAN_FILES += include/asm-xen/linux-public include/asm-xen/asm-ia64/hypervisor.h
|
||||
|
||||
MRPROPER_FILES += include/asm-ia64/offsets.h
|
||||
|
||||
@@ -106,27 +101,11 @@ include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
|
||||
|
||||
arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
|
||||
|
||||
#XEN_PATH ?= $(srctree)/../xen-ia64-unstable.hg/
|
||||
include/asm-ia64/.offsets.h.stamp:
|
||||
mkdir -p include/asm-ia64
|
||||
[ -s include/asm-ia64/offsets.h ] \
|
||||
|| echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h
|
||||
touch $@
|
||||
[ -e include/asm-xen/asm ] \
|
||||
|| ln -s asm-ia64 include/asm-xen/asm
|
||||
# [ -e include/asm-xen/xen-public ] \
|
||||
# || ln -s $(XEN_PATH)/xen/include/public \
|
||||
# include/asm-xen/xen-public
|
||||
# [ -e include/asm-ia64/xen/asm-xsi-offsets.h ] \
|
||||
# || ln -s $(XEN_PATH)/xen/include/asm-ia64/asm-xsi-offsets.h \
|
||||
# include/asm-ia64/xen/asm-xsi-offsets.h
|
||||
# [ -e include/asm-xen/linux-public ] \
|
||||
# || ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/linux-public \
|
||||
include/asm-xen/linux-public
|
||||
[ -e include/asm-xen/asm-ia64/hypervisor.h ] \
|
||||
|| ln -s $(XEN_PATH)/linux-2.6-xen-sparse/include/asm-xen/asm-ia64/hypervisor.h \
|
||||
include/asm-xen/asm-ia64/hypervisor.h
|
||||
|
||||
|
||||
boot: lib/lib.a vmlinux
|
||||
$(Q)$(MAKE) $(build)=$(boot) $@
|
||||
|
||||
@@ -13,10 +13,10 @@ then
|
||||
mv net net.xen-x86
|
||||
mv kernel kernel.xen-x86
|
||||
mv drivers/acpi/tables.c drivers/acpi/tables.c.xen-x86
|
||||
mv arch/xen/kernel drivers/xen/core
|
||||
mv arch/xen arch/xen.xen-x86
|
||||
mkdir arch/xen
|
||||
mv arch/xen.xen-x86/configs arch/xen
|
||||
# mv arch/xen/kernel drivers/xen/core
|
||||
# mv arch/xen arch/xen.xen-x86
|
||||
# mkdir arch/xen
|
||||
# mv arch/xen.xen-x86/configs arch/xen
|
||||
# mv include/asm-generic include/asm-generic.xen-x86
|
||||
mv include/linux include/linux.xen-x86
|
||||
mkdir include/linux
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
#include <linux/config.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <asm/hw_irq.h>
|
||||
#include <asm-xen/evtchn.h>
|
||||
#include <xen/evtchn.h>
|
||||
|
||||
#define MAX_EVTCHN 1024
|
||||
|
||||
|
||||
@@ -353,8 +353,13 @@ gnttab_resume(void)
|
||||
BUG_ON(HYPERVISOR_grant_table_op(GNTTABOP_setup_table, &setup, 1));
|
||||
BUG_ON(setup.status != 0);
|
||||
|
||||
#ifdef __ia64__
|
||||
shared = __va(frames[0] << PAGE_SHIFT);
|
||||
printk("grant table at %p\n", shared);
|
||||
#else
|
||||
for (i = 0; i < NR_GRANT_FRAMES; i++)
|
||||
set_fixmap(FIX_GNTTAB_END - i, frames[i] << PAGE_SHIFT);
|
||||
#endif
|
||||
|
||||
return 0;
|
||||
}
|
||||
@@ -380,7 +385,9 @@ gnttab_init(void)
|
||||
|
||||
BUG_ON(gnttab_resume());
|
||||
|
||||
#ifndef __ia64__
|
||||
shared = (grant_entry_t *)fix_to_virt(FIX_GNTTAB_END);
|
||||
#endif
|
||||
|
||||
for (i = NR_RESERVED_ENTRIES; i < NR_GRANT_ENTRIES; i++)
|
||||
gnttab_list[i] = i + 1;
|
||||
|
||||
@@ -30,8 +30,8 @@
|
||||
#ifndef __HYPERCALL_H__
|
||||
#define __HYPERCALL_H__
|
||||
|
||||
#include <asm-xen/xen-public/xen.h>
|
||||
#include <asm-xen/xen-public/sched.h>
|
||||
#include <xen/interface/xen.h>
|
||||
#include <xen/interface/sched.h>
|
||||
|
||||
/* FIXME: temp place to hold these page related macros */
|
||||
#include <asm/page.h>
|
||||
|
||||
@@ -34,8 +34,8 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/version.h>
|
||||
#include <asm-xen/xen-public/xen.h>
|
||||
#include <asm-xen/xen-public/dom0_ops.h>
|
||||
#include <xen/interface/xen.h>
|
||||
#include <xen/interface/dom0_ops.h>
|
||||
#include <asm/ptrace.h>
|
||||
#include <asm/page.h>
|
||||
|
||||
|
||||