aboutsummaryrefslogtreecommitdiffstats
path: root/linux-2.4.27-xen-sparse/arch
diff options
context:
space:
mode:
Diffstat (limited to 'linux-2.4.27-xen-sparse/arch')
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/Makefile2
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h4
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c4
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/kernel/process.c2
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c4
-rw-r--r--linux-2.4.27-xen-sparse/arch/xen/kernel/time.c2
6 files changed, 9 insertions, 9 deletions
diff --git a/linux-2.4.27-xen-sparse/arch/xen/Makefile b/linux-2.4.27-xen-sparse/arch/xen/Makefile
index f8f1e96214..1db1b7f1b6 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/Makefile
+++ b/linux-2.4.27-xen-sparse/arch/xen/Makefile
@@ -127,7 +127,7 @@ archclean:
@$(MAKEBOOT) clean
archmrproper:
- rm -f include/asm-xen/hypervisor-ifs/arch
+ rm -f include/asm-xen/xen-public/arch
archdep:
@$(MAKEBOOT) dep
diff --git a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
index 03937e0e4c..d16895d2c2 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
+++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h
@@ -18,11 +18,11 @@
#include <linux/hdreg.h>
#include <linux/blkdev.h>
#include <linux/major.h>
-#include <asm/hypervisor-ifs/hypervisor-if.h>
+#include <asm/xen-public/xen.h>
#include <asm/io.h>
#include <asm/atomic.h>
#include <asm/uaccess.h>
-#include <asm-xen/hypervisor-ifs/io/blkif.h>
+#include <asm/xen-public/io/blkif.h>
#if 0
#define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
index 48dcecd6ec..b77703ac89 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c
@@ -18,8 +18,8 @@
#include <asm/segment.h>
#include <asm/io.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>
#include "pci-i386.h"
diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
index 9c1123b740..806e9a73f6 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c
@@ -44,7 +44,7 @@
#include <asm/desc.h>
#include <asm/mmu_context.h>
#include <asm/multicall.h>
-#include <asm/hypervisor-ifs/dom0_ops.h>
+#include <asm/xen-public/dom0_ops.h>
#include <linux/irq.h>
diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
index 61c2f73a07..92312734b8 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c
@@ -48,7 +48,7 @@ static int errno;
#include <asm/mmu_context.h>
#include <asm/ctrl_if.h>
#include <asm/hypervisor.h>
-#include <asm/hypervisor-ifs/dom0_ops.h>
+#include <asm/xen-public/dom0_ops.h>
#include <linux/netdevice.h>
#include <linux/rtnetlink.h>
#include <linux/tqueue.h>
@@ -335,7 +335,7 @@ void __init setup_arch(char **cmdline_p)
* and the bootmem bitmap.
* NB. There is definitely enough room for the bootmem bitmap in the
* bootstrap page table. We are guaranteed to get >=512kB unused 'padding'
- * for our own use after all bootstrap elements (see hypervisor-if.h).
+ * for our own use after all bootstrap elements (see asm/xen-public/xen.h).
*/
boot_pfn = min((int)xen_start_info.nr_pages,lmax_low_pfn);
bootmap_size = init_bootmem(start_pfn,boot_pfn);
diff --git a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
index 3a4f8bf2c5..d4b6f5edac 100644
--- a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
+++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c
@@ -52,7 +52,7 @@
#include <asm/div64.h>
#include <asm/hypervisor.h>
-#include <asm/hypervisor-ifs/dom0_ops.h>
+#include <asm/xen-public/dom0_ops.h>
#include <linux/mc146818rtc.h>
#include <linux/kernel.h>