diff options
Diffstat (limited to 'linux-2.6.9-xen-sparse')
20 files changed, 33 insertions, 33 deletions
diff --git a/linux-2.6.9-xen-sparse/arch/xen/Makefile b/linux-2.6.9-xen-sparse/arch/xen/Makefile index 224e0aa34f..bda9cb8665 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/Makefile +++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile @@ -33,16 +33,16 @@ include/asm-xen/asm: @echo ' SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)' @ln -fsn asm-$(XENARCH) $@ -include/asm-xen/asm-$(XENARCH)/hypervisor-ifs: - @echo ' SYMLINK $@ -> include/asm-xen/hypervisor-ifs' - @ln -fsn ../hypervisor-ifs $@ +include/asm-xen/asm-$(XENARCH)/xen-public: + @echo ' SYMLINK $@ -> include/asm-xen/xen-public' + @ln -fsn ../xen-public $@ arch/xen/arch: @rm -f $@ @ln -fsn $(XENARCH) $@ prepare: include/.asm-ignore include/asm-xen/asm \ - include/asm-xen/asm-$(XENARCH)/hypervisor-ifs \ + include/asm-xen/asm-$(XENARCH)/xen-public \ arch/xen/arch ; all: vmlinuz diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S index f1e60cc06c..e6978360e8 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S @@ -48,7 +48,7 @@ #include <asm/smp.h> #include <asm/page.h> #include "irq_vectors.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #define nr_syscalls ((syscall_table_size)/4) diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S index b41a96db42..b773a18e5e 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S @@ -15,7 +15,7 @@ #include <asm/segment.h> #include <asm/thread_info.h> #include <asm/asm_offsets.h> -#include <asm/hypervisor-ifs/arch-x86_32.h> +#include <asm/xen-public/arch-x86_32.h> /* * References to members of the new_cpu_data structure. diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c index bb3b0f3090..3c85bee294 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c @@ -8,7 +8,7 @@ #include <linux/smp_lock.h> #include <linux/stddef.h> #include <linux/slab.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> asmlinkage long sys_iopl(unsigned int new_io_pl) { diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c index 930e9151a3..66d9d6e4d0 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c @@ -47,7 +47,7 @@ #include <asm/irq.h> #include <asm/desc.h> #include <asm-xen/multicall.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #ifdef CONFIG_MATH_EMULATION #include <asm/math_emu.h> #endif diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c index 661221379b..e964ae00f1 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c @@ -6,8 +6,8 @@ #include <linux/init.h> #include "pci.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/physdev.h> /* * Functions for accessing PCI configuration space with type xen accesses diff --git a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c index 7dc8dfb0ba..b7761350a9 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c @@ -19,8 +19,8 @@ #include "pci.h" -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/physdev.h> /* * Never use: 0, 1, 2 (timer, keyboard, and cascade) diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c index b779ac114c..37ba61846a 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c @@ -38,8 +38,8 @@ #include <asm/system.h> #include <asm/ptrace.h> #include <asm/synch_bitops.h> -#include <asm/hypervisor-ifs/event_channel.h> -#include <asm/hypervisor-ifs/physdev.h> +#include <asm/xen-public/event_channel.h> +#include <asm/xen-public/physdev.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> diff --git a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c index 9b9761e841..2e81929624 100644 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/reboot.c @@ -12,7 +12,7 @@ static int errno; #include <asm/mmu_context.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/dom0_ops.h> +#include <asm-xen/xen-public/dom0_ops.h> #include <asm-xen/suspend.h> #include <asm-xen/queues.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h b/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h index 0fa60cdceb..4a12ca8fe9 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkback/common.h @@ -14,7 +14,7 @@ #include <asm/pgalloc.h> #include <asm-xen/ctrl_if.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/io/blkif.h> +#include <asm-xen/xen-public/io/blkif.h> #if 0 #define ASSERT(_p) \ diff --git a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h index 76255e8637..8503cfedcc 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h @@ -44,8 +44,8 @@ #include <linux/blkdev.h> #include <linux/major.h> #include <linux/devfs_fs_kernel.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm-xen/hypervisor-ifs/io/blkif.h> +#include <asm/xen-public/xen.h> +#include <asm-xen/xen-public/io/blkif.h> #include <asm/io.h> #include <asm/atomic.h> #include <asm/uaccess.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c index 8309c253d0..f2da97e1f4 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c @@ -47,7 +47,7 @@ #include <asm/io.h> #include <asm/irq.h> #include <asm/uaccess.h> -#include <asm/hypervisor-ifs/event_channel.h> +#include <asm/xen-public/event_channel.h> #include <asm-xen/hypervisor.h> #include <asm-xen/evtchn.h> #include <asm-xen/ctrl_if.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h b/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h index 6646f5339f..a8eeac8aac 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h +++ b/linux-2.6.9-xen-sparse/drivers/xen/netback/common.h @@ -15,7 +15,7 @@ #include <linux/netdevice.h> #include <linux/etherdevice.h> #include <asm-xen/ctrl_if.h> -#include <asm-xen/hypervisor-ifs/io/netif.h> +#include <asm-xen/xen-public/io/netif.h> #include <asm/io.h> #include <asm/pgalloc.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c b/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c index 831572b4b2..6f702fa8f8 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/netfront/netfront.c @@ -44,7 +44,7 @@ #include <asm/io.h> #include <asm-xen/evtchn.h> #include <asm-xen/ctrl_if.h> -#include <asm-xen/hypervisor-ifs/io/netif.h> +#include <asm-xen/xen-public/io/netif.h> #include <asm/page.h> #include <net/arp.h> diff --git a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c index 42c5b1309c..62994ba302 100644 --- a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c +++ b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c @@ -26,7 +26,7 @@ #include <asm/uaccess.h> #include <asm/tlb.h> #include <asm-xen/proc_cmd.h> -#include <asm/hypervisor-ifs/dom0_ops.h> +#include <asm/xen-public/dom0_ops.h> #include <asm-xen/xen_proc.h> static struct proc_dir_entry *privcmd_intf; diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h index 34e8f7f9eb..e2604817b6 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h @@ -15,7 +15,7 @@ #include <linux/config.h> #include <linux/string.h> #include <linux/types.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> +#include <asm/xen-public/xen.h> #ifdef CONFIG_XEN_SCRUB_PAGES #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT) diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h index 2ad902ed6b..ace8984b08 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h @@ -35,7 +35,7 @@ #include <asm-xen/hypervisor.h> #include <asm/ptrace.h> #include <asm/synch_bitops.h> -#include <asm/hypervisor-ifs/event_channel.h> +#include <asm/xen-public/event_channel.h> /* * LOW-LEVEL DEFINITIONS diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h b/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h index 6e52923b17..fa166ec6b1 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/gnttab.h @@ -14,7 +14,7 @@ #include <linux/config.h> #include <asm-xen/hypervisor.h> -#include <asm-xen/hypervisor-ifs/grant_table.h> +#include <asm-xen/xen-public/grant_table.h> int gnttab_grant_foreign_access( diff --git a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h index 3054b30779..f3536bf38d 100644 --- a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h +++ b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h @@ -33,9 +33,9 @@ #include <linux/types.h> #include <linux/kernel.h> #include <linux/version.h> -#include <asm/hypervisor-ifs/hypervisor-if.h> -#include <asm/hypervisor-ifs/dom0_ops.h> -#include <asm/hypervisor-ifs/io/domain_controller.h> +#include <asm/xen-public/xen.h> +#include <asm/xen-public/dom0_ops.h> +#include <asm/xen-public/io/domain_controller.h> #include <asm/ptrace.h> #include <asm/page.h> diff --git a/linux-2.6.9-xen-sparse/mkbuildtree b/linux-2.6.9-xen-sparse/mkbuildtree index 20513e6ead..d353015ff2 100755 --- a/linux-2.6.9-xen-sparse/mkbuildtree +++ b/linux-2.6.9-xen-sparse/mkbuildtree @@ -103,9 +103,9 @@ relative_lndir ${RS} rm -f mkbuildtree -# Create links to the shared definitions of the hypervisor interface -rm -rf ${AD}/include/asm-xen/hypervisor-ifs -mkdir ${AD}/include/asm-xen/hypervisor-ifs -cd ${AD}/include/asm-xen/hypervisor-ifs -relative_lndir ../../../${RS}/../xen/include/hypervisor-ifs +# Create links to the shared definitions of the Xen interfaces. +rm -rf ${AD}/include/asm-xen/xen-public +mkdir ${AD}/include/asm-xen/xen-public +cd ${AD}/include/asm-xen/xen-public +relative_lndir ../../../${RS}/../xen/include/public |