]> pilppa.com Git - linux-2.6-omap-h63xx.git/commitdiff
[IA64] Move include/asm-ia64 to arch/ia64/include/asm
authorTony Luck <tony.luck@intel.com>
Fri, 1 Aug 2008 17:13:32 +0000 (10:13 -0700)
committerTony Luck <tony.luck@intel.com>
Fri, 1 Aug 2008 17:21:21 +0000 (10:21 -0700)
After moving the the include files there were a few clean-ups:

1) Some files used #include <asm-ia64/xyz.h>, changed to <asm/xyz.h>

2) Some comments alerted maintainers to look at various header files to
make matching updates if certain code were to be changed. Updated these
comments to use the new include paths.

3) Some header files mentioned their own names in initial comments. Just
deleted these self references.

Signed-off-by: Tony Luck <tony.luck@intel.com>
192 files changed:
arch/ia64/include/asm/Kbuild [moved from include/asm-ia64/Kbuild with 100% similarity]
arch/ia64/include/asm/a.out.h [moved from include/asm-ia64/a.out.h with 100% similarity]
arch/ia64/include/asm/acpi-ext.h [moved from include/asm-ia64/acpi-ext.h with 100% similarity]
arch/ia64/include/asm/acpi.h [moved from include/asm-ia64/acpi.h with 99% similarity]
arch/ia64/include/asm/agp.h [moved from include/asm-ia64/agp.h with 100% similarity]
arch/ia64/include/asm/asmmacro.h [moved from include/asm-ia64/asmmacro.h with 100% similarity]
arch/ia64/include/asm/atomic.h [moved from include/asm-ia64/atomic.h with 100% similarity]
arch/ia64/include/asm/auxvec.h [moved from include/asm-ia64/auxvec.h with 100% similarity]
arch/ia64/include/asm/bitops.h [moved from include/asm-ia64/bitops.h with 100% similarity]
arch/ia64/include/asm/break.h [moved from include/asm-ia64/break.h with 100% similarity]
arch/ia64/include/asm/bug.h [moved from include/asm-ia64/bug.h with 100% similarity]
arch/ia64/include/asm/bugs.h [moved from include/asm-ia64/bugs.h with 100% similarity]
arch/ia64/include/asm/byteorder.h [moved from include/asm-ia64/byteorder.h with 100% similarity]
arch/ia64/include/asm/cache.h [moved from include/asm-ia64/cache.h with 100% similarity]
arch/ia64/include/asm/cacheflush.h [moved from include/asm-ia64/cacheflush.h with 100% similarity]
arch/ia64/include/asm/checksum.h [moved from include/asm-ia64/checksum.h with 100% similarity]
arch/ia64/include/asm/compat.h [moved from include/asm-ia64/compat.h with 100% similarity]
arch/ia64/include/asm/cpu.h [moved from include/asm-ia64/cpu.h with 100% similarity]
arch/ia64/include/asm/cputime.h [moved from include/asm-ia64/cputime.h with 97% similarity]
arch/ia64/include/asm/current.h [moved from include/asm-ia64/current.h with 100% similarity]
arch/ia64/include/asm/cyclone.h [moved from include/asm-ia64/cyclone.h with 100% similarity]
arch/ia64/include/asm/delay.h [moved from include/asm-ia64/delay.h with 100% similarity]
arch/ia64/include/asm/device.h [moved from include/asm-ia64/device.h with 100% similarity]
arch/ia64/include/asm/div64.h [moved from include/asm-ia64/div64.h with 100% similarity]
arch/ia64/include/asm/dma-mapping.h [moved from include/asm-ia64/dma-mapping.h with 100% similarity]
arch/ia64/include/asm/dma.h [moved from include/asm-ia64/dma.h with 100% similarity]
arch/ia64/include/asm/dmi.h [moved from include/asm-ia64/dmi.h with 100% similarity]
arch/ia64/include/asm/elf.h [moved from include/asm-ia64/elf.h with 100% similarity]
arch/ia64/include/asm/emergency-restart.h [moved from include/asm-ia64/emergency-restart.h with 100% similarity]
arch/ia64/include/asm/errno.h [moved from include/asm-ia64/errno.h with 100% similarity]
arch/ia64/include/asm/esi.h [moved from include/asm-ia64/esi.h with 100% similarity]
arch/ia64/include/asm/fb.h [moved from include/asm-ia64/fb.h with 100% similarity]
arch/ia64/include/asm/fcntl.h [moved from include/asm-ia64/fcntl.h with 100% similarity]
arch/ia64/include/asm/fpswa.h [moved from include/asm-ia64/fpswa.h with 100% similarity]
arch/ia64/include/asm/fpu.h [moved from include/asm-ia64/fpu.h with 100% similarity]
arch/ia64/include/asm/futex.h [moved from include/asm-ia64/futex.h with 100% similarity]
arch/ia64/include/asm/gcc_intrin.h [moved from include/asm-ia64/gcc_intrin.h with 100% similarity]
arch/ia64/include/asm/hardirq.h [moved from include/asm-ia64/hardirq.h with 100% similarity]
arch/ia64/include/asm/hpsim.h [moved from include/asm-ia64/hpsim.h with 100% similarity]
arch/ia64/include/asm/hugetlb.h [moved from include/asm-ia64/hugetlb.h with 100% similarity]
arch/ia64/include/asm/hw_irq.h [moved from include/asm-ia64/hw_irq.h with 100% similarity]
arch/ia64/include/asm/ia32.h [moved from include/asm-ia64/ia32.h with 100% similarity]
arch/ia64/include/asm/ia64regs.h [moved from include/asm-ia64/ia64regs.h with 100% similarity]
arch/ia64/include/asm/intel_intrin.h [moved from include/asm-ia64/intel_intrin.h with 100% similarity]
arch/ia64/include/asm/intrinsics.h [moved from include/asm-ia64/intrinsics.h with 100% similarity]
arch/ia64/include/asm/io.h [moved from include/asm-ia64/io.h with 100% similarity]
arch/ia64/include/asm/ioctl.h [moved from include/asm-ia64/ioctl.h with 100% similarity]
arch/ia64/include/asm/ioctls.h [moved from include/asm-ia64/ioctls.h with 100% similarity]
arch/ia64/include/asm/iosapic.h [moved from include/asm-ia64/iosapic.h with 100% similarity]
arch/ia64/include/asm/ipcbuf.h [moved from include/asm-ia64/ipcbuf.h with 100% similarity]
arch/ia64/include/asm/irq.h [moved from include/asm-ia64/irq.h with 100% similarity]
arch/ia64/include/asm/irq_regs.h [moved from include/asm-ia64/irq_regs.h with 100% similarity]
arch/ia64/include/asm/kdebug.h [moved from include/asm-ia64/kdebug.h with 98% similarity]
arch/ia64/include/asm/kexec.h [moved from include/asm-ia64/kexec.h with 100% similarity]
arch/ia64/include/asm/kmap_types.h [moved from include/asm-ia64/kmap_types.h with 100% similarity]
arch/ia64/include/asm/kprobes.h [moved from include/asm-ia64/kprobes.h with 99% similarity]
arch/ia64/include/asm/kregs.h [moved from include/asm-ia64/kregs.h with 100% similarity]
arch/ia64/include/asm/kvm.h [moved from include/asm-ia64/kvm.h with 98% similarity]
arch/ia64/include/asm/kvm_host.h [moved from include/asm-ia64/kvm_host.h with 100% similarity]
arch/ia64/include/asm/kvm_para.h [moved from include/asm-ia64/kvm_para.h with 97% similarity]
arch/ia64/include/asm/libata-portmap.h [moved from include/asm-ia64/libata-portmap.h with 100% similarity]
arch/ia64/include/asm/linkage.h [moved from include/asm-ia64/linkage.h with 100% similarity]
arch/ia64/include/asm/local.h [moved from include/asm-ia64/local.h with 100% similarity]
arch/ia64/include/asm/machvec.h [moved from include/asm-ia64/machvec.h with 99% similarity]
arch/ia64/include/asm/machvec_dig.h [moved from include/asm-ia64/machvec_dig.h with 100% similarity]
arch/ia64/include/asm/machvec_hpsim.h [moved from include/asm-ia64/machvec_hpsim.h with 100% similarity]
arch/ia64/include/asm/machvec_hpzx1.h [moved from include/asm-ia64/machvec_hpzx1.h with 100% similarity]
arch/ia64/include/asm/machvec_hpzx1_swiotlb.h [moved from include/asm-ia64/machvec_hpzx1_swiotlb.h with 100% similarity]
arch/ia64/include/asm/machvec_init.h [moved from include/asm-ia64/machvec_init.h with 100% similarity]
arch/ia64/include/asm/machvec_sn2.h [moved from include/asm-ia64/machvec_sn2.h with 100% similarity]
arch/ia64/include/asm/machvec_uv.h [moved from include/asm-ia64/machvec_uv.h with 100% similarity]
arch/ia64/include/asm/mc146818rtc.h [moved from include/asm-ia64/mc146818rtc.h with 100% similarity]
arch/ia64/include/asm/mca.h [moved from include/asm-ia64/mca.h with 100% similarity]
arch/ia64/include/asm/mca_asm.h [moved from include/asm-ia64/mca_asm.h with 100% similarity]
arch/ia64/include/asm/meminit.h [moved from include/asm-ia64/meminit.h with 100% similarity]
arch/ia64/include/asm/mman.h [moved from include/asm-ia64/mman.h with 100% similarity]
arch/ia64/include/asm/mmu.h [moved from include/asm-ia64/mmu.h with 100% similarity]
arch/ia64/include/asm/mmu_context.h [moved from include/asm-ia64/mmu_context.h with 100% similarity]
arch/ia64/include/asm/mmzone.h [moved from include/asm-ia64/mmzone.h with 100% similarity]
arch/ia64/include/asm/module.h [moved from include/asm-ia64/module.h with 100% similarity]
arch/ia64/include/asm/msgbuf.h [moved from include/asm-ia64/msgbuf.h with 100% similarity]
arch/ia64/include/asm/mutex.h [moved from include/asm-ia64/mutex.h with 100% similarity]
arch/ia64/include/asm/native/inst.h [moved from include/asm-ia64/native/inst.h with 99% similarity]
arch/ia64/include/asm/native/irq.h [moved from include/asm-ia64/native/irq.h with 93% similarity]
arch/ia64/include/asm/nodedata.h [moved from include/asm-ia64/nodedata.h with 100% similarity]
arch/ia64/include/asm/numa.h [moved from include/asm-ia64/numa.h with 100% similarity]
arch/ia64/include/asm/page.h [moved from include/asm-ia64/page.h with 100% similarity]
arch/ia64/include/asm/pal.h [moved from include/asm-ia64/pal.h with 100% similarity]
arch/ia64/include/asm/param.h [moved from include/asm-ia64/param.h with 100% similarity]
arch/ia64/include/asm/paravirt.h [moved from include/asm-ia64/paravirt.h with 99% similarity]
arch/ia64/include/asm/paravirt_privop.h [moved from include/asm-ia64/paravirt_privop.h with 98% similarity]
arch/ia64/include/asm/parport.h [moved from include/asm-ia64/parport.h with 100% similarity]
arch/ia64/include/asm/patch.h [moved from include/asm-ia64/patch.h with 100% similarity]
arch/ia64/include/asm/pci.h [moved from include/asm-ia64/pci.h with 100% similarity]
arch/ia64/include/asm/percpu.h [moved from include/asm-ia64/percpu.h with 100% similarity]
arch/ia64/include/asm/perfmon.h [moved from include/asm-ia64/perfmon.h with 100% similarity]
arch/ia64/include/asm/perfmon_default_smpl.h [moved from include/asm-ia64/perfmon_default_smpl.h with 100% similarity]
arch/ia64/include/asm/pgalloc.h [moved from include/asm-ia64/pgalloc.h with 100% similarity]
arch/ia64/include/asm/pgtable.h [moved from include/asm-ia64/pgtable.h with 100% similarity]
arch/ia64/include/asm/poll.h [moved from include/asm-ia64/poll.h with 100% similarity]
arch/ia64/include/asm/posix_types.h [moved from include/asm-ia64/posix_types.h with 100% similarity]
arch/ia64/include/asm/processor.h [moved from include/asm-ia64/processor.h with 100% similarity]
arch/ia64/include/asm/ptrace.h [moved from include/asm-ia64/ptrace.h with 100% similarity]
arch/ia64/include/asm/ptrace_offsets.h [moved from include/asm-ia64/ptrace_offsets.h with 100% similarity]
arch/ia64/include/asm/resource.h [moved from include/asm-ia64/resource.h with 100% similarity]
arch/ia64/include/asm/rse.h [moved from include/asm-ia64/rse.h with 100% similarity]
arch/ia64/include/asm/rwsem.h [moved from include/asm-ia64/rwsem.h with 99% similarity]
arch/ia64/include/asm/sal.h [moved from include/asm-ia64/sal.h with 100% similarity]
arch/ia64/include/asm/scatterlist.h [moved from include/asm-ia64/scatterlist.h with 100% similarity]
arch/ia64/include/asm/sections.h [moved from include/asm-ia64/sections.h with 100% similarity]
arch/ia64/include/asm/segment.h [moved from include/asm-ia64/segment.h with 100% similarity]
arch/ia64/include/asm/sembuf.h [moved from include/asm-ia64/sembuf.h with 100% similarity]
arch/ia64/include/asm/serial.h [moved from include/asm-ia64/serial.h with 93% similarity]
arch/ia64/include/asm/setup.h [moved from include/asm-ia64/setup.h with 100% similarity]
arch/ia64/include/asm/shmbuf.h [moved from include/asm-ia64/shmbuf.h with 100% similarity]
arch/ia64/include/asm/shmparam.h [moved from include/asm-ia64/shmparam.h with 100% similarity]
arch/ia64/include/asm/sigcontext.h [moved from include/asm-ia64/sigcontext.h with 100% similarity]
arch/ia64/include/asm/siginfo.h [moved from include/asm-ia64/siginfo.h with 100% similarity]
arch/ia64/include/asm/signal.h [moved from include/asm-ia64/signal.h with 100% similarity]
arch/ia64/include/asm/smp.h [moved from include/asm-ia64/smp.h with 100% similarity]
arch/ia64/include/asm/sn/acpi.h [moved from include/asm-ia64/sn/acpi.h with 100% similarity]
arch/ia64/include/asm/sn/addrs.h [moved from include/asm-ia64/sn/addrs.h with 100% similarity]
arch/ia64/include/asm/sn/arch.h [moved from include/asm-ia64/sn/arch.h with 100% similarity]
arch/ia64/include/asm/sn/bte.h [moved from include/asm-ia64/sn/bte.h with 100% similarity]
arch/ia64/include/asm/sn/clksupport.h [moved from include/asm-ia64/sn/clksupport.h with 100% similarity]
arch/ia64/include/asm/sn/geo.h [moved from include/asm-ia64/sn/geo.h with 100% similarity]
arch/ia64/include/asm/sn/intr.h [moved from include/asm-ia64/sn/intr.h with 100% similarity]
arch/ia64/include/asm/sn/io.h [moved from include/asm-ia64/sn/io.h with 100% similarity]
arch/ia64/include/asm/sn/ioc3.h [moved from include/asm-ia64/sn/ioc3.h with 100% similarity]
arch/ia64/include/asm/sn/klconfig.h [moved from include/asm-ia64/sn/klconfig.h with 100% similarity]
arch/ia64/include/asm/sn/l1.h [moved from include/asm-ia64/sn/l1.h with 100% similarity]
arch/ia64/include/asm/sn/leds.h [moved from include/asm-ia64/sn/leds.h with 100% similarity]
arch/ia64/include/asm/sn/module.h [moved from include/asm-ia64/sn/module.h with 100% similarity]
arch/ia64/include/asm/sn/mspec.h [moved from include/asm-ia64/sn/mspec.h with 100% similarity]
arch/ia64/include/asm/sn/nodepda.h [moved from include/asm-ia64/sn/nodepda.h with 100% similarity]
arch/ia64/include/asm/sn/pcibr_provider.h [moved from include/asm-ia64/sn/pcibr_provider.h with 100% similarity]
arch/ia64/include/asm/sn/pcibus_provider_defs.h [moved from include/asm-ia64/sn/pcibus_provider_defs.h with 100% similarity]
arch/ia64/include/asm/sn/pcidev.h [moved from include/asm-ia64/sn/pcidev.h with 100% similarity]
arch/ia64/include/asm/sn/pda.h [moved from include/asm-ia64/sn/pda.h with 100% similarity]
arch/ia64/include/asm/sn/pic.h [moved from include/asm-ia64/sn/pic.h with 100% similarity]
arch/ia64/include/asm/sn/rw_mmr.h [moved from include/asm-ia64/sn/rw_mmr.h with 100% similarity]
arch/ia64/include/asm/sn/shub_mmr.h [moved from include/asm-ia64/sn/shub_mmr.h with 100% similarity]
arch/ia64/include/asm/sn/shubio.h [moved from include/asm-ia64/sn/shubio.h with 100% similarity]
arch/ia64/include/asm/sn/simulator.h [moved from include/asm-ia64/sn/simulator.h with 100% similarity]
arch/ia64/include/asm/sn/sn2/sn_hwperf.h [moved from include/asm-ia64/sn/sn2/sn_hwperf.h with 100% similarity]
arch/ia64/include/asm/sn/sn_cpuid.h [moved from include/asm-ia64/sn/sn_cpuid.h with 100% similarity]
arch/ia64/include/asm/sn/sn_feature_sets.h [moved from include/asm-ia64/sn/sn_feature_sets.h with 100% similarity]
arch/ia64/include/asm/sn/sn_sal.h [moved from include/asm-ia64/sn/sn_sal.h with 99% similarity]
arch/ia64/include/asm/sn/tioca.h [moved from include/asm-ia64/sn/tioca.h with 100% similarity]
arch/ia64/include/asm/sn/tioca_provider.h [moved from include/asm-ia64/sn/tioca_provider.h with 100% similarity]
arch/ia64/include/asm/sn/tioce.h [moved from include/asm-ia64/sn/tioce.h with 100% similarity]
arch/ia64/include/asm/sn/tioce_provider.h [moved from include/asm-ia64/sn/tioce_provider.h with 100% similarity]
arch/ia64/include/asm/sn/tiocp.h [moved from include/asm-ia64/sn/tiocp.h with 100% similarity]
arch/ia64/include/asm/sn/tiocx.h [moved from include/asm-ia64/sn/tiocx.h with 100% similarity]
arch/ia64/include/asm/sn/types.h [moved from include/asm-ia64/sn/types.h with 100% similarity]
arch/ia64/include/asm/socket.h [moved from include/asm-ia64/socket.h with 100% similarity]
arch/ia64/include/asm/sockios.h [moved from include/asm-ia64/sockios.h with 100% similarity]
arch/ia64/include/asm/sparsemem.h [moved from include/asm-ia64/sparsemem.h with 100% similarity]
arch/ia64/include/asm/spinlock.h [moved from include/asm-ia64/spinlock.h with 100% similarity]
arch/ia64/include/asm/spinlock_types.h [moved from include/asm-ia64/spinlock_types.h with 100% similarity]
arch/ia64/include/asm/stat.h [moved from include/asm-ia64/stat.h with 100% similarity]
arch/ia64/include/asm/statfs.h [moved from include/asm-ia64/statfs.h with 100% similarity]
arch/ia64/include/asm/string.h [moved from include/asm-ia64/string.h with 100% similarity]
arch/ia64/include/asm/suspend.h [moved from include/asm-ia64/suspend.h with 100% similarity]
arch/ia64/include/asm/system.h [moved from include/asm-ia64/system.h with 100% similarity]
arch/ia64/include/asm/termbits.h [moved from include/asm-ia64/termbits.h with 100% similarity]
arch/ia64/include/asm/termios.h [moved from include/asm-ia64/termios.h with 100% similarity]
arch/ia64/include/asm/thread_info.h [moved from include/asm-ia64/thread_info.h with 100% similarity]
arch/ia64/include/asm/timex.h [moved from include/asm-ia64/timex.h with 100% similarity]
arch/ia64/include/asm/tlb.h [moved from include/asm-ia64/tlb.h with 100% similarity]
arch/ia64/include/asm/tlbflush.h [moved from include/asm-ia64/tlbflush.h with 100% similarity]
arch/ia64/include/asm/topology.h [moved from include/asm-ia64/topology.h with 98% similarity]
arch/ia64/include/asm/types.h [moved from include/asm-ia64/types.h with 100% similarity]
arch/ia64/include/asm/uaccess.h [moved from include/asm-ia64/uaccess.h with 100% similarity]
arch/ia64/include/asm/ucontext.h [moved from include/asm-ia64/ucontext.h with 100% similarity]
arch/ia64/include/asm/unaligned.h [moved from include/asm-ia64/unaligned.h with 100% similarity]
arch/ia64/include/asm/uncached.h [moved from include/asm-ia64/uncached.h with 100% similarity]
arch/ia64/include/asm/unistd.h [moved from include/asm-ia64/unistd.h with 100% similarity]
arch/ia64/include/asm/unwind.h [moved from include/asm-ia64/unwind.h with 100% similarity]
arch/ia64/include/asm/user.h [moved from include/asm-ia64/user.h with 100% similarity]
arch/ia64/include/asm/ustack.h [moved from include/asm-ia64/ustack.h with 100% similarity]
arch/ia64/include/asm/uv/uv_hub.h [moved from include/asm-ia64/uv/uv_hub.h with 100% similarity]
arch/ia64/include/asm/uv/uv_mmrs.h [moved from include/asm-ia64/uv/uv_mmrs.h with 100% similarity]
arch/ia64/include/asm/vga.h [moved from include/asm-ia64/vga.h with 100% similarity]
arch/ia64/include/asm/xor.h [moved from include/asm-ia64/xor.h with 97% similarity]
arch/ia64/kernel/asm-offsets.c
arch/ia64/kernel/head.S
arch/ia64/kernel/iosapic.c
arch/ia64/kernel/jprobes.S
arch/ia64/kernel/nr-irqs.c
arch/ia64/kernel/setup.c
arch/ia64/sn/kernel/iomv.c

similarity index 99%
rename from include/asm-ia64/acpi.h
rename to arch/ia64/include/asm/acpi.h
index fcfad326f4c721cdf06301beee8487be2f4c06e9..0f82cc2934e16a264c96a911127add063433a06c 100644 (file)
@@ -1,6 +1,4 @@
 /*
- *  asm-ia64/acpi.h
- *
  *  Copyright (C) 1999 VA Linux Systems
  *  Copyright (C) 1999 Walt Drummond <drummond@valinux.com>
  *  Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
similarity index 97%
rename from include/asm-ia64/cputime.h
rename to arch/ia64/include/asm/cputime.h
index f9abdec6577a6841535ea4dc36455b9da6ead0f3..d20b998cb91d1eb4a4fa0d148eaf1a8dd4ae5c20 100644 (file)
@@ -1,6 +1,5 @@
 /*
- * include/asm-ia64/cputime.h:
- *             Definitions for measuring cputime on ia64 machines.
+ * Definitions for measuring cputime on ia64 machines.
  *
  * Based on <asm-powerpc/cputime.h>.
  *
similarity index 98%
rename from include/asm-ia64/kdebug.h
rename to arch/ia64/include/asm/kdebug.h
index 35e49407d06c6bdada5952abca95a9a45786c23d..d11a698550365c0340b90b2228ba8928a3c13c87 100644 (file)
@@ -1,8 +1,6 @@
 #ifndef _IA64_KDEBUG_H
 #define _IA64_KDEBUG_H 1
 /*
- * include/asm-ia64/kdebug.h
- *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
similarity index 99%
rename from include/asm-ia64/kprobes.h
rename to arch/ia64/include/asm/kprobes.h
index ef71b57fc2f40bb7edc6c6fec979891c981d62ae..dbf83fb28db318849f3a148d215e4977d6fd1760 100644 (file)
@@ -2,7 +2,6 @@
 #define _ASM_KPROBES_H
 /*
  *  Kernel Probes (KProbes)
- *  include/asm-ia64/kprobes.h
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
similarity index 98%
rename from include/asm-ia64/kvm.h
rename to arch/ia64/include/asm/kvm.h
index 3f6a090cbd9abeef0ba6732a369bf77cc48b8bb7..f38472ac22675b14322b648387b79d52958d59c7 100644 (file)
@@ -2,7 +2,7 @@
 #define __ASM_IA64_KVM_H
 
 /*
- * asm-ia64/kvm.h: kvm structure definitions  for ia64
+ * kvm structure definitions  for ia64
  *
  * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
  *
similarity index 97%
rename from include/asm-ia64/kvm_para.h
rename to arch/ia64/include/asm/kvm_para.h
index 9f9796bb344103ca663e88033a331975dd08f64c..0d6d8ca07b8ce194eb26fb8e1aadb07c3d41fe25 100644 (file)
@@ -2,8 +2,6 @@
 #define __IA64_KVM_PARA_H
 
 /*
- * asm-ia64/kvm_para.h
- *
  * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com>
  *
  * This program is free software; you can redistribute it and/or modify it
similarity index 99%
rename from include/asm-ia64/machvec.h
rename to arch/ia64/include/asm/machvec.h
index a6d50c77b6bfaa467eb5ef51c645348316082316..2b850ccafef58105192e0ba5b1aab6b555ddc811 100644 (file)
@@ -290,7 +290,7 @@ extern void machvec_init (const char *name);
 extern void machvec_init_from_cmdline(const char *cmdline);
 
 # else
-#  error Unknown configuration.  Update asm-ia64/machvec.h.
+#  error Unknown configuration.  Update arch/ia64/include/asm/machvec.h.
 # endif /* CONFIG_IA64_GENERIC */
 
 /*
similarity index 99%
rename from include/asm-ia64/native/inst.h
rename to arch/ia64/include/asm/native/inst.h
index c953a2ca4fceca495d8836c98ab393987b8e54f7..c8efbf7b849ef4959f606bd6e4d3afd0b78f9199 100644 (file)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * include/asm-ia64/native/inst.h
+ * arch/ia64/include/asm/native/inst.h
  *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
similarity index 93%
rename from include/asm-ia64/native/irq.h
rename to arch/ia64/include/asm/native/irq.h
index efe9ff74a3c4f8cf6bde23d171a3dcf873bda044..887a228e2edb1d2ff81912f7c23e9696d4e39bab 100644 (file)
@@ -1,5 +1,5 @@
 /******************************************************************************
- * include/asm-ia64/native/irq.h
+ * arch/ia64/include/asm/native/irq.h
  *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
@@ -17,8 +17,6 @@
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- * moved from linux/include/asm-ia64/irq.h.
  */
 
 #ifndef _ASM_IA64_NATIVE_IRQ_H
similarity index 99%
rename from include/asm-ia64/paravirt.h
rename to arch/ia64/include/asm/paravirt.h
index 1b4df129f579138c8f1f2f44c5c2bb74d324bd78..660cab044834b448b1b82e67361f62db1d20384f 100644 (file)
@@ -1,6 +1,4 @@
 /******************************************************************************
- * include/asm-ia64/paravirt.h
- *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
  *
similarity index 98%
rename from include/asm-ia64/paravirt_privop.h
rename to arch/ia64/include/asm/paravirt_privop.h
index 52482e6940ac4c33d85ebe69568d12d39c82a7f1..d577aac1183571c02db0f527e899495c1bf29cdb 100644 (file)
@@ -1,6 +1,4 @@
 /******************************************************************************
- * include/asm-ia64/paravirt_privops.h
- *
  * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp>
  *                    VA Linux Systems Japan K.K.
  *
similarity index 99%
rename from include/asm-ia64/rwsem.h
rename to arch/ia64/include/asm/rwsem.h
index 8aba06a7b0389cca8401c20a04029b3ec4ad454b..fbee74b15782752b04754c2999d6f0d149e4fbb8 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * asm-ia64/rwsem.h: R/W semaphores for ia64
+ * R/W semaphores for ia64
  *
  * Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com>
  * Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
similarity index 93%
rename from include/asm-ia64/serial.h
rename to arch/ia64/include/asm/serial.h
index 0c7a2f3dcf13cb8f631b75dc1df9be741e727731..068be11583df425c69189c70899c4da231cf9315 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * include/asm-ia64/serial.h
- *
  * Derived from the i386 version.
  */
 
similarity index 99%
rename from include/asm-ia64/sn/sn_sal.h
rename to arch/ia64/include/asm/sn/sn_sal.h
index 676b31a08c61dc8fd366d1147b8572080fca4e65..57e649d388b895902c7d68b9b2fc3c64bba5314e 100644 (file)
@@ -1094,7 +1094,7 @@ ia64_sn_get_sn_info(int fc, u8 *shubtype, u16 *nasid_bitmask, u8 *nasid_shift,
 /*
  * This is the access point to the Altix PROM hardware performance
  * and status monitoring interface. For info on using this, see
- * include/asm-ia64/sn/sn2/sn_hwperf.h
+ * arch/ia64/include/asm/sn/sn2/sn_hwperf.h
  */
 static inline int
 ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
similarity index 98%
rename from include/asm-ia64/topology.h
rename to arch/ia64/include/asm/topology.h
index 32863b3bb1d3e9bdd8cba30a5eb3356b3cbbb467..35bcb641c9e5731abb025c879d0acbb65a957ad6 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * linux/include/asm-ia64/topology.h
- *
  * Copyright (C) 2002, Erich Focht, NEC
  *
  * All rights reserved.
similarity index 97%
rename from include/asm-ia64/xor.h
rename to arch/ia64/include/asm/xor.h
index 41fb8744d17a8cd6fc0115f83593228f29a6d10f..a349e23dea15c1de27854a889e28b80ccafe2717 100644 (file)
@@ -1,6 +1,4 @@
 /*
- * include/asm-ia64/xor.h
- *
  * Optimized RAID-5 checksumming functions for IA-64.
  *
  * This program is free software; you can redistribute it and/or modify
index c64a55af9b95b43651dd2c4e0cf281e8422c99d2..94c44b1ccfd0de7fb136247756b4ea1a4e08c4e1 100644 (file)
 #include <linux/pid.h>
 #include <linux/clocksource.h>
 #include <linux/kbuild.h>
-#include <asm-ia64/processor.h>
-#include <asm-ia64/ptrace.h>
-#include <asm-ia64/siginfo.h>
-#include <asm-ia64/sigcontext.h>
-#include <asm-ia64/mca.h>
+#include <asm/processor.h>
+#include <asm/ptrace.h>
+#include <asm/siginfo.h>
+#include <asm/sigcontext.h>
+#include <asm/mca.h>
 
 #include "../kernel/sigframe.h"
 #include "../kernel/fsyscall_gtod_data.h"
index db540e58c783b9e43a7d2b99b0843a6089c470df..41c712917ff706b595ee1683b3e6fdbcf0b46efe 100644 (file)
@@ -1123,7 +1123,7 @@ SET_REG(b5);
         *   p15    - used to track flag status.
         *
         * If you patch this code to use more registers, do not forget to update
-        * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h.
+        * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h.
         */
 
 #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
index 3bc2fa64f87f7f55047646e600614150d6b3c0eb..5c4674ae8aea0279f1abba8cff8bdade994e0131 100644 (file)
@@ -69,7 +69,7 @@
  *     systems, we use one-to-one mapping between IA-64 vector and IRQ.  A
  *     platform can implement platform_irq_to_vector(irq) and
  *     platform_local_vector_to_irq(vector) APIs to differentiate the mapping.
- *     Please see also include/asm-ia64/hw_irq.h for those APIs.
+ *     Please see also arch/ia64/include/asm/hw_irq.h for those APIs.
  *
  * To sum up, there are three levels of mappings involved:
  *
index 621630256c4aa053b30dbb6e54d56e95dfd0e842..f69389c7be1d8a8d22d9f8ecbdc4407d273e3c21 100644 (file)
@@ -45,7 +45,7 @@
  * to the correct location.
  */
 #include <asm/asmmacro.h>
-#include <asm-ia64/break.h>
+#include <asm/break.h>
 
        /*
         * void jprobe_break(void)
index 1ae049181e83f9b2bbfc7e1fa63cae8ba6ea6f73..8273afc32db8cf342a526e2c75c70cf3b3995e78 100644 (file)
@@ -9,7 +9,7 @@
 
 #include <linux/kbuild.h>
 #include <linux/threads.h>
-#include <asm-ia64/native/irq.h>
+#include <asm/native/irq.h>
 
 void foo(void)
 {
index e5c2de9b29a5738484af3265f5713b286bbc8906..593279f33e96e71fae02c6c335f20d2b699e23c6 100644 (file)
@@ -314,7 +314,7 @@ static inline void __init setup_crashkernel(unsigned long total, int *n)
  *
  * Setup the reserved memory areas set aside for the boot parameters,
  * initrd, etc.  There are currently %IA64_MAX_RSVD_REGIONS defined,
- * see include/asm-ia64/meminit.h if you need to define more.
+ * see arch/ia64/include/asm/meminit.h if you need to define more.
  */
 void __init
 reserve_memory (void)
index ab7e2fd40798ea8702d4b4c5bcd167b3310d0645..c77ebdf98119ea9202d9d3624f048874c0e9944c 100644 (file)
@@ -63,7 +63,7 @@ EXPORT_SYMBOL(sn_io_addr);
 /**
  * __sn_mmiowb - I/O space memory barrier
  *
- * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl
+ * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl
  * for details.
  *
  * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.