ia64/xen-unstable

changeset 2817:d60426da6f4c

bitkeeper revision 1.1159.1.328 (41868fc0ltqwD-JwEuH-hRskylY8aw)

Be consistent about naming includes: asm/xen-public -> asm-xen/xen-public
author iap10@labyrinth.cl.cam.ac.uk
date Mon Nov 01 19:34:24 2004 +0000 (2004-11-01)
parents 5e2a9d23a580
children fe33dd531fd0 60b89851a69a
files linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c linux-2.4.27-xen-sparse/arch/xen/kernel/process.c linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c linux-2.4.27-xen-sparse/arch/xen/kernel/time.c linux-2.4.27-xen-sparse/include/asm-xen/page.h linux-2.4.27-xen-sparse/include/asm-xen/segment.h linux-2.6.9-xen-sparse/arch/xen/Makefile linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h linux-2.6.9-xen-sparse/drivers/xen/console/console.c linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h
line diff
     1.1 --- a/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h	Mon Nov 01 18:36:41 2004 +0000
     1.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/drivers/blkif/frontend/common.h	Mon Nov 01 19:34:24 2004 +0000
     1.3 @@ -18,11 +18,11 @@
     1.4  #include <linux/hdreg.h>
     1.5  #include <linux/blkdev.h>
     1.6  #include <linux/major.h>
     1.7 -#include <asm/xen-public/xen.h>
     1.8 +#include <asm-xen/xen-public/xen.h>
     1.9  #include <asm/io.h>
    1.10  #include <asm/atomic.h>
    1.11  #include <asm/uaccess.h>
    1.12 -#include <asm/xen-public/io/blkif.h>
    1.13 +#include <asm-xen/xen-public/io/blkif.h>
    1.14  
    1.15  #if 0
    1.16  #define DPRINTK(_f, _a...) printk ( KERN_ALERT _f , ## _a )
     2.1 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c	Mon Nov 01 18:36:41 2004 +0000
     2.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/pci-pc.c	Mon Nov 01 19:34:24 2004 +0000
     2.3 @@ -18,8 +18,8 @@
     2.4  #include <asm/segment.h>
     2.5  #include <asm/io.h>
     2.6  
     2.7 -#include <asm/xen-public/xen.h>
     2.8 -#include <asm/xen-public/physdev.h>
     2.9 +#include <asm-xen/xen-public/xen.h>
    2.10 +#include <asm-xen/xen-public/physdev.h>
    2.11  
    2.12  #include "pci-i386.h"
    2.13  
     3.1 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c	Mon Nov 01 18:36:41 2004 +0000
     3.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/process.c	Mon Nov 01 19:34:24 2004 +0000
     3.3 @@ -44,7 +44,7 @@
     3.4  #include <asm/desc.h>
     3.5  #include <asm/mmu_context.h>
     3.6  #include <asm/multicall.h>
     3.7 -#include <asm/xen-public/dom0_ops.h>
     3.8 +#include <asm-xen/xen-public/dom0_ops.h>
     3.9  
    3.10  #include <linux/irq.h>
    3.11  
     4.1 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c	Mon Nov 01 18:36:41 2004 +0000
     4.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/setup.c	Mon Nov 01 19:34:24 2004 +0000
     4.3 @@ -48,7 +48,7 @@ static int errno;
     4.4  #include <asm/mmu_context.h>
     4.5  #include <asm/ctrl_if.h>
     4.6  #include <asm/hypervisor.h>
     4.7 -#include <asm/xen-public/dom0_ops.h>
     4.8 +#include <asm-xen/xen-public/dom0_ops.h>
     4.9  #include <linux/netdevice.h>
    4.10  #include <linux/rtnetlink.h>
    4.11  #include <linux/tqueue.h>
    4.12 @@ -335,7 +335,8 @@ void __init setup_arch(char **cmdline_p)
    4.13       * and the bootmem bitmap. 
    4.14       * NB. There is definitely enough room for the bootmem bitmap in the
    4.15       * bootstrap page table. We are guaranteed to get >=512kB unused 'padding'
    4.16 -     * for our own use after all bootstrap elements (see asm/xen-public/xen.h).
    4.17 +     * for our own use after all bootstrap elements 
    4.18 +     * (see asm-xen/xen-public/xen.h).
    4.19       */
    4.20      boot_pfn = min((int)xen_start_info.nr_pages,lmax_low_pfn);
    4.21      bootmap_size = init_bootmem(start_pfn,boot_pfn);
     5.1 --- a/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c	Mon Nov 01 18:36:41 2004 +0000
     5.2 +++ b/linux-2.4.27-xen-sparse/arch/xen/kernel/time.c	Mon Nov 01 19:34:24 2004 +0000
     5.3 @@ -52,7 +52,7 @@
     5.4  
     5.5  #include <asm/div64.h>
     5.6  #include <asm/hypervisor.h>
     5.7 -#include <asm/xen-public/dom0_ops.h>
     5.8 +#include <asm-xen/xen-public/dom0_ops.h>
     5.9  
    5.10  #include <linux/mc146818rtc.h>
    5.11  #include <linux/kernel.h>
     6.1 --- a/linux-2.4.27-xen-sparse/include/asm-xen/page.h	Mon Nov 01 18:36:41 2004 +0000
     6.2 +++ b/linux-2.4.27-xen-sparse/include/asm-xen/page.h	Mon Nov 01 19:34:24 2004 +0000
     6.3 @@ -12,7 +12,7 @@
     6.4  #include <linux/config.h>
     6.5  #include <linux/string.h>
     6.6  #include <asm/types.h>
     6.7 -#include <asm/xen-public/xen.h>
     6.8 +#include <asm-xen/xen-public/xen.h>
     6.9  
    6.10  #ifdef CONFIG_XEN_SCRUB_PAGES
    6.11  #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT)
     7.1 --- a/linux-2.4.27-xen-sparse/include/asm-xen/segment.h	Mon Nov 01 18:36:41 2004 +0000
     7.2 +++ b/linux-2.4.27-xen-sparse/include/asm-xen/segment.h	Mon Nov 01 19:34:24 2004 +0000
     7.3 @@ -4,7 +4,7 @@
     7.4  #ifndef __ASSEMBLY__
     7.5  #include <linux/types.h>
     7.6  #endif
     7.7 -#include <asm/xen-public/xen.h>
     7.8 +#include <asm-xen/xen-public/xen.h>
     7.9  
    7.10  #define __KERNEL_CS	FLAT_RING1_CS
    7.11  #define __KERNEL_DS	FLAT_RING1_DS
     8.1 --- a/linux-2.6.9-xen-sparse/arch/xen/Makefile	Mon Nov 01 18:36:41 2004 +0000
     8.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/Makefile	Mon Nov 01 19:34:24 2004 +0000
     8.3 @@ -33,16 +33,11 @@ include/asm-xen/asm:
     8.4  	@echo '  SYMLINK $@ -> include/asm-xen/asm-$(XENARCH)'
     8.5  	@ln -fsn asm-$(XENARCH) $@
     8.6  
     8.7 -include/asm-xen/asm-$(XENARCH)/xen-public:
     8.8 -	@echo '  SYMLINK $@ -> include/asm-xen/xen-public'
     8.9 -	@ln -fsn ../xen-public $@
    8.10 -
    8.11  arch/xen/arch:
    8.12  	@rm -f $@
    8.13  	@ln -fsn $(XENARCH) $@
    8.14  
    8.15  prepare: include/.asm-ignore include/asm-xen/asm \
    8.16 -	include/asm-xen/asm-$(XENARCH)/xen-public \
    8.17  	arch/xen/arch ;
    8.18  
    8.19  all: vmlinuz
     9.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Mon Nov 01 18:36:41 2004 +0000
     9.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/entry.S	Mon Nov 01 19:34:24 2004 +0000
     9.3 @@ -48,7 +48,7 @@
     9.4  #include <asm/smp.h>
     9.5  #include <asm/page.h>
     9.6  #include "irq_vectors.h"
     9.7 -#include <asm/xen-public/xen.h>
     9.8 +#include <asm-xen/xen-public/xen.h>
     9.9  
    9.10  #define nr_syscalls ((syscall_table_size)/4)
    9.11  
    10.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S	Mon Nov 01 18:36:41 2004 +0000
    10.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/head.S	Mon Nov 01 19:34:24 2004 +0000
    10.3 @@ -15,7 +15,7 @@
    10.4  #include <asm/segment.h>
    10.5  #include <asm/thread_info.h>
    10.6  #include <asm/asm_offsets.h>
    10.7 -#include <asm/xen-public/arch-x86_32.h>
    10.8 +#include <asm-xen/xen-public/arch-x86_32.h>
    10.9  
   10.10  /*
   10.11   * References to members of the new_cpu_data structure.
    11.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c	Mon Nov 01 18:36:41 2004 +0000
    11.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/ioport.c	Mon Nov 01 19:34:24 2004 +0000
    11.3 @@ -8,7 +8,7 @@
    11.4  #include <linux/smp_lock.h>
    11.5  #include <linux/stddef.h>
    11.6  #include <linux/slab.h>
    11.7 -#include <asm/xen-public/dom0_ops.h>
    11.8 +#include <asm-xen/xen-public/dom0_ops.h>
    11.9  
   11.10  asmlinkage long sys_iopl(unsigned int new_io_pl)
   11.11  {
    12.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c	Mon Nov 01 18:36:41 2004 +0000
    12.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/kernel/process.c	Mon Nov 01 19:34:24 2004 +0000
    12.3 @@ -47,7 +47,7 @@
    12.4  #include <asm/irq.h>
    12.5  #include <asm/desc.h>
    12.6  #include <asm-xen/multicall.h>
    12.7 -#include <asm/xen-public/dom0_ops.h>
    12.8 +#include <asm-xen/xen-public/dom0_ops.h>
    12.9  #ifdef CONFIG_MATH_EMULATION
   12.10  #include <asm/math_emu.h>
   12.11  #endif
    13.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c	Mon Nov 01 18:36:41 2004 +0000
    13.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/direct.c	Mon Nov 01 19:34:24 2004 +0000
    13.3 @@ -6,8 +6,8 @@
    13.4  #include <linux/init.h>
    13.5  #include "pci.h"
    13.6  
    13.7 -#include <asm/xen-public/xen.h>
    13.8 -#include <asm/xen-public/physdev.h>
    13.9 +#include <asm-xen/xen-public/xen.h>
   13.10 +#include <asm-xen/xen-public/physdev.h>
   13.11  
   13.12  /*
   13.13   * Functions for accessing PCI configuration space with type xen accesses
    14.1 --- a/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c	Mon Nov 01 18:36:41 2004 +0000
    14.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c	Mon Nov 01 19:34:24 2004 +0000
    14.3 @@ -19,8 +19,8 @@
    14.4  
    14.5  #include "pci.h"
    14.6  
    14.7 -#include <asm/xen-public/xen.h>
    14.8 -#include <asm/xen-public/physdev.h>
    14.9 +#include <asm-xen/xen-public/xen.h>
   14.10 +#include <asm-xen/xen-public/physdev.h>
   14.11  
   14.12  /*
   14.13   * Never use: 0, 1, 2 (timer, keyboard, and cascade)
    15.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Mon Nov 01 18:36:41 2004 +0000
    15.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c	Mon Nov 01 19:34:24 2004 +0000
    15.3 @@ -38,8 +38,8 @@
    15.4  #include <asm/system.h>
    15.5  #include <asm/ptrace.h>
    15.6  #include <asm/synch_bitops.h>
    15.7 -#include <asm/xen-public/event_channel.h>
    15.8 -#include <asm/xen-public/physdev.h>
    15.9 +#include <asm-xen/xen-public/event_channel.h>
   15.10 +#include <asm-xen/xen-public/physdev.h>
   15.11  #include <asm-xen/ctrl_if.h>
   15.12  #include <asm-xen/hypervisor.h>
   15.13  
    16.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h	Mon Nov 01 18:36:41 2004 +0000
    16.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/blkfront/block.h	Mon Nov 01 19:34:24 2004 +0000
    16.3 @@ -44,7 +44,7 @@
    16.4  #include <linux/blkdev.h>
    16.5  #include <linux/major.h>
    16.6  #include <linux/devfs_fs_kernel.h>
    16.7 -#include <asm/xen-public/xen.h>
    16.8 +#include <asm-xen/xen-public/xen.h>
    16.9  #include <asm-xen/xen-public/io/blkif.h>
   16.10  #include <asm/io.h>
   16.11  #include <asm/atomic.h>
    17.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/console/console.c	Mon Nov 01 18:36:41 2004 +0000
    17.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/console/console.c	Mon Nov 01 19:34:24 2004 +0000
    17.3 @@ -47,7 +47,7 @@
    17.4  #include <asm/io.h>
    17.5  #include <asm/irq.h>
    17.6  #include <asm/uaccess.h>
    17.7 -#include <asm/xen-public/event_channel.h>
    17.8 +#include <asm-xen/xen-public/event_channel.h>
    17.9  #include <asm-xen/hypervisor.h>
   17.10  #include <asm-xen/evtchn.h>
   17.11  #include <asm-xen/ctrl_if.h>
    18.1 --- a/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c	Mon Nov 01 18:36:41 2004 +0000
    18.2 +++ b/linux-2.6.9-xen-sparse/drivers/xen/privcmd/privcmd.c	Mon Nov 01 19:34:24 2004 +0000
    18.3 @@ -26,7 +26,7 @@
    18.4  #include <asm/uaccess.h>
    18.5  #include <asm/tlb.h>
    18.6  #include <asm-xen/proc_cmd.h>
    18.7 -#include <asm/xen-public/dom0_ops.h>
    18.8 +#include <asm-xen/xen-public/dom0_ops.h>
    18.9  #include <asm-xen/xen_proc.h>
   18.10  
   18.11  static struct proc_dir_entry *privcmd_intf;
    19.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h	Mon Nov 01 18:36:41 2004 +0000
    19.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/asm-i386/page.h	Mon Nov 01 19:34:24 2004 +0000
    19.3 @@ -15,7 +15,7 @@
    19.4  #include <linux/config.h>
    19.5  #include <linux/string.h>
    19.6  #include <linux/types.h>
    19.7 -#include <asm/xen-public/xen.h>
    19.8 +#include <asm-xen/xen-public/xen.h>
    19.9  
   19.10  #ifdef CONFIG_XEN_SCRUB_PAGES
   19.11  #define scrub_pages(_p,_n) memset((void *)(_p), 0, (_n) << PAGE_SHIFT)
    20.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h	Mon Nov 01 18:36:41 2004 +0000
    20.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/evtchn.h	Mon Nov 01 19:34:24 2004 +0000
    20.3 @@ -35,7 +35,7 @@
    20.4  #include <asm-xen/hypervisor.h>
    20.5  #include <asm/ptrace.h>
    20.6  #include <asm/synch_bitops.h>
    20.7 -#include <asm/xen-public/event_channel.h>
    20.8 +#include <asm-xen/xen-public/event_channel.h>
    20.9  
   20.10  /*
   20.11   * LOW-LEVEL DEFINITIONS
    21.1 --- a/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h	Mon Nov 01 18:36:41 2004 +0000
    21.2 +++ b/linux-2.6.9-xen-sparse/include/asm-xen/hypervisor.h	Mon Nov 01 19:34:24 2004 +0000
    21.3 @@ -33,9 +33,9 @@
    21.4  #include <linux/types.h>
    21.5  #include <linux/kernel.h>
    21.6  #include <linux/version.h>
    21.7 -#include <asm/xen-public/xen.h>
    21.8 -#include <asm/xen-public/dom0_ops.h>
    21.9 -#include <asm/xen-public/io/domain_controller.h>
   21.10 +#include <asm-xen/xen-public/xen.h>
   21.11 +#include <asm-xen/xen-public/dom0_ops.h>
   21.12 +#include <asm-xen/xen-public/io/domain_controller.h>
   21.13  #include <asm/ptrace.h>
   21.14  #include <asm/page.h>
   21.15