tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6

* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
[IA64] Move include/asm-ia64 to arch/ia64/include/asm

Linus Torvalds 2b12a4c5 4744b434

+18 -38
+5 -5
arch/ia64/kernel/asm-offsets.c
··· 10 10 #include <linux/pid.h> 11 11 #include <linux/clocksource.h> 12 12 #include <linux/kbuild.h> 13 - #include <asm-ia64/processor.h> 14 - #include <asm-ia64/ptrace.h> 15 - #include <asm-ia64/siginfo.h> 16 - #include <asm-ia64/sigcontext.h> 17 - #include <asm-ia64/mca.h> 13 + #include <asm/processor.h> 14 + #include <asm/ptrace.h> 15 + #include <asm/siginfo.h> 16 + #include <asm/sigcontext.h> 17 + #include <asm/mca.h> 18 18 19 19 #include "../kernel/sigframe.h" 20 20 #include "../kernel/fsyscall_gtod_data.h"
+1 -1
arch/ia64/kernel/head.S
··· 1123 1123 * p15 - used to track flag status. 1124 1124 * 1125 1125 * If you patch this code to use more registers, do not forget to update 1126 - * the clobber lists for spin_lock() in include/asm-ia64/spinlock.h. 1126 + * the clobber lists for spin_lock() in arch/ia64/include/asm/spinlock.h. 1127 1127 */ 1128 1128 1129 1129 #if (__GNUC__ == 3 && __GNUC_MINOR__ < 3)
+1 -1
arch/ia64/kernel/iosapic.c
··· 69 69 * systems, we use one-to-one mapping between IA-64 vector and IRQ. A 70 70 * platform can implement platform_irq_to_vector(irq) and 71 71 * platform_local_vector_to_irq(vector) APIs to differentiate the mapping. 72 - * Please see also include/asm-ia64/hw_irq.h for those APIs. 72 + * Please see also arch/ia64/include/asm/hw_irq.h for those APIs. 73 73 * 74 74 * To sum up, there are three levels of mappings involved: 75 75 *
+1 -1
arch/ia64/kernel/jprobes.S
··· 45 45 * to the correct location. 46 46 */ 47 47 #include <asm/asmmacro.h> 48 - #include <asm-ia64/break.h> 48 + #include <asm/break.h> 49 49 50 50 /* 51 51 * void jprobe_break(void)
+1 -1
arch/ia64/kernel/nr-irqs.c
··· 9 9 10 10 #include <linux/kbuild.h> 11 11 #include <linux/threads.h> 12 - #include <asm-ia64/native/irq.h> 12 + #include <asm/native/irq.h> 13 13 14 14 void foo(void) 15 15 {
+1 -1
arch/ia64/kernel/setup.c
··· 314 314 * 315 315 * Setup the reserved memory areas set aside for the boot parameters, 316 316 * initrd, etc. There are currently %IA64_MAX_RSVD_REGIONS defined, 317 - * see include/asm-ia64/meminit.h if you need to define more. 317 + * see arch/ia64/include/asm/meminit.h if you need to define more. 318 318 */ 319 319 void __init 320 320 reserve_memory (void)
+1 -1
arch/ia64/sn/kernel/iomv.c
··· 63 63 /** 64 64 * __sn_mmiowb - I/O space memory barrier 65 65 * 66 - * See include/asm-ia64/io.h and Documentation/DocBook/deviceiobook.tmpl 66 + * See arch/ia64/include/asm/io.h and Documentation/DocBook/deviceiobook.tmpl 67 67 * for details. 68 68 * 69 69 * On SN2, we wait for the PIO_WRITE_STATUS SHub register to clear.
include/asm-ia64/Kbuild arch/ia64/include/asm/Kbuild
include/asm-ia64/a.out.h arch/ia64/include/asm/a.out.h
include/asm-ia64/acpi-ext.h arch/ia64/include/asm/acpi-ext.h
-2
include/asm-ia64/acpi.h arch/ia64/include/asm/acpi.h
··· 1 1 /* 2 - * asm-ia64/acpi.h 3 - * 4 2 * Copyright (C) 1999 VA Linux Systems 5 3 * Copyright (C) 1999 Walt Drummond <drummond@valinux.com> 6 4 * Copyright (C) 2000,2001 J.I. Lee <jung-ik.lee@intel.com>
include/asm-ia64/agp.h arch/ia64/include/asm/agp.h
include/asm-ia64/asmmacro.h arch/ia64/include/asm/asmmacro.h
include/asm-ia64/atomic.h arch/ia64/include/asm/atomic.h
include/asm-ia64/auxvec.h arch/ia64/include/asm/auxvec.h
include/asm-ia64/bitops.h arch/ia64/include/asm/bitops.h
include/asm-ia64/break.h arch/ia64/include/asm/break.h
include/asm-ia64/bug.h arch/ia64/include/asm/bug.h
include/asm-ia64/bugs.h arch/ia64/include/asm/bugs.h
include/asm-ia64/byteorder.h arch/ia64/include/asm/byteorder.h
include/asm-ia64/cache.h arch/ia64/include/asm/cache.h
include/asm-ia64/cacheflush.h arch/ia64/include/asm/cacheflush.h
include/asm-ia64/checksum.h arch/ia64/include/asm/checksum.h
include/asm-ia64/compat.h arch/ia64/include/asm/compat.h
include/asm-ia64/cpu.h arch/ia64/include/asm/cpu.h
+1 -2
include/asm-ia64/cputime.h arch/ia64/include/asm/cputime.h
··· 1 1 /* 2 - * include/asm-ia64/cputime.h: 3 - * Definitions for measuring cputime on ia64 machines. 2 + * Definitions for measuring cputime on ia64 machines. 4 3 * 5 4 * Based on <asm-powerpc/cputime.h>. 6 5 *
include/asm-ia64/current.h arch/ia64/include/asm/current.h
include/asm-ia64/cyclone.h arch/ia64/include/asm/cyclone.h
include/asm-ia64/delay.h arch/ia64/include/asm/delay.h
include/asm-ia64/device.h arch/ia64/include/asm/device.h
include/asm-ia64/div64.h arch/ia64/include/asm/div64.h
include/asm-ia64/dma-mapping.h arch/ia64/include/asm/dma-mapping.h
include/asm-ia64/dma.h arch/ia64/include/asm/dma.h
include/asm-ia64/dmi.h arch/ia64/include/asm/dmi.h
include/asm-ia64/elf.h arch/ia64/include/asm/elf.h
include/asm-ia64/emergency-restart.h arch/ia64/include/asm/emergency-restart.h
include/asm-ia64/errno.h arch/ia64/include/asm/errno.h
include/asm-ia64/esi.h arch/ia64/include/asm/esi.h
include/asm-ia64/fb.h arch/ia64/include/asm/fb.h
include/asm-ia64/fcntl.h arch/ia64/include/asm/fcntl.h
include/asm-ia64/fpswa.h arch/ia64/include/asm/fpswa.h
include/asm-ia64/fpu.h arch/ia64/include/asm/fpu.h
include/asm-ia64/futex.h arch/ia64/include/asm/futex.h
include/asm-ia64/gcc_intrin.h arch/ia64/include/asm/gcc_intrin.h
include/asm-ia64/hardirq.h arch/ia64/include/asm/hardirq.h
include/asm-ia64/hpsim.h arch/ia64/include/asm/hpsim.h
include/asm-ia64/hugetlb.h arch/ia64/include/asm/hugetlb.h
include/asm-ia64/hw_irq.h arch/ia64/include/asm/hw_irq.h
include/asm-ia64/ia32.h arch/ia64/include/asm/ia32.h
include/asm-ia64/ia64regs.h arch/ia64/include/asm/ia64regs.h
include/asm-ia64/intel_intrin.h arch/ia64/include/asm/intel_intrin.h
include/asm-ia64/intrinsics.h arch/ia64/include/asm/intrinsics.h
include/asm-ia64/io.h arch/ia64/include/asm/io.h
include/asm-ia64/ioctl.h arch/ia64/include/asm/ioctl.h
include/asm-ia64/ioctls.h arch/ia64/include/asm/ioctls.h
include/asm-ia64/iosapic.h arch/ia64/include/asm/iosapic.h
include/asm-ia64/ipcbuf.h arch/ia64/include/asm/ipcbuf.h
include/asm-ia64/irq.h arch/ia64/include/asm/irq.h
include/asm-ia64/irq_regs.h arch/ia64/include/asm/irq_regs.h
-2
include/asm-ia64/kdebug.h arch/ia64/include/asm/kdebug.h
··· 1 1 #ifndef _IA64_KDEBUG_H 2 2 #define _IA64_KDEBUG_H 1 3 3 /* 4 - * include/asm-ia64/kdebug.h 5 - * 6 4 * This program is free software; you can redistribute it and/or modify 7 5 * it under the terms of the GNU General Public License as published by 8 6 * the Free Software Foundation; either version 2 of the License, or
include/asm-ia64/kexec.h arch/ia64/include/asm/kexec.h
include/asm-ia64/kmap_types.h arch/ia64/include/asm/kmap_types.h
-1
include/asm-ia64/kprobes.h arch/ia64/include/asm/kprobes.h
··· 2 2 #define _ASM_KPROBES_H 3 3 /* 4 4 * Kernel Probes (KProbes) 5 - * include/asm-ia64/kprobes.h 6 5 * 7 6 * This program is free software; you can redistribute it and/or modify 8 7 * it under the terms of the GNU General Public License as published by
include/asm-ia64/kregs.h arch/ia64/include/asm/kregs.h
+1 -1
include/asm-ia64/kvm.h arch/ia64/include/asm/kvm.h
··· 2 2 #define __ASM_IA64_KVM_H 3 3 4 4 /* 5 - * asm-ia64/kvm.h: kvm structure definitions for ia64 5 + * kvm structure definitions for ia64 6 6 * 7 7 * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com> 8 8 *
include/asm-ia64/kvm_host.h arch/ia64/include/asm/kvm_host.h
-2
include/asm-ia64/kvm_para.h arch/ia64/include/asm/kvm_para.h
··· 2 2 #define __IA64_KVM_PARA_H 3 3 4 4 /* 5 - * asm-ia64/kvm_para.h 6 - * 7 5 * Copyright (C) 2007 Xiantao Zhang <xiantao.zhang@intel.com> 8 6 * 9 7 * This program is free software; you can redistribute it and/or modify it
include/asm-ia64/libata-portmap.h arch/ia64/include/asm/libata-portmap.h
include/asm-ia64/linkage.h arch/ia64/include/asm/linkage.h
include/asm-ia64/local.h arch/ia64/include/asm/local.h
+1 -1
include/asm-ia64/machvec.h arch/ia64/include/asm/machvec.h
··· 290 290 extern void machvec_init_from_cmdline(const char *cmdline); 291 291 292 292 # else 293 - # error Unknown configuration. Update asm-ia64/machvec.h. 293 + # error Unknown configuration. Update arch/ia64/include/asm/machvec.h. 294 294 # endif /* CONFIG_IA64_GENERIC */ 295 295 296 296 /*
include/asm-ia64/machvec_dig.h arch/ia64/include/asm/machvec_dig.h
include/asm-ia64/machvec_hpsim.h arch/ia64/include/asm/machvec_hpsim.h
include/asm-ia64/machvec_hpzx1.h arch/ia64/include/asm/machvec_hpzx1.h
include/asm-ia64/machvec_hpzx1_swiotlb.h arch/ia64/include/asm/machvec_hpzx1_swiotlb.h
include/asm-ia64/machvec_init.h arch/ia64/include/asm/machvec_init.h
include/asm-ia64/machvec_sn2.h arch/ia64/include/asm/machvec_sn2.h
include/asm-ia64/machvec_uv.h arch/ia64/include/asm/machvec_uv.h
include/asm-ia64/mc146818rtc.h arch/ia64/include/asm/mc146818rtc.h
include/asm-ia64/mca.h arch/ia64/include/asm/mca.h
include/asm-ia64/mca_asm.h arch/ia64/include/asm/mca_asm.h
include/asm-ia64/meminit.h arch/ia64/include/asm/meminit.h
include/asm-ia64/mman.h arch/ia64/include/asm/mman.h
include/asm-ia64/mmu.h arch/ia64/include/asm/mmu.h
include/asm-ia64/mmu_context.h arch/ia64/include/asm/mmu_context.h
include/asm-ia64/mmzone.h arch/ia64/include/asm/mmzone.h
include/asm-ia64/module.h arch/ia64/include/asm/module.h
include/asm-ia64/msgbuf.h arch/ia64/include/asm/msgbuf.h
include/asm-ia64/mutex.h arch/ia64/include/asm/mutex.h
+1 -1
include/asm-ia64/native/inst.h arch/ia64/include/asm/native/inst.h
··· 1 1 /****************************************************************************** 2 - * include/asm-ia64/native/inst.h 2 + * arch/ia64/include/asm/native/inst.h 3 3 * 4 4 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> 5 5 * VA Linux Systems Japan K.K.
+1 -3
include/asm-ia64/native/irq.h arch/ia64/include/asm/native/irq.h
··· 1 1 /****************************************************************************** 2 - * include/asm-ia64/native/irq.h 2 + * arch/ia64/include/asm/native/irq.h 3 3 * 4 4 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> 5 5 * VA Linux Systems Japan K.K. ··· 17 17 * You should have received a copy of the GNU General Public License 18 18 * along with this program; if not, write to the Free Software 19 19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 20 - * 21 - * moved from linux/include/asm-ia64/irq.h. 22 20 */ 23 21 24 22 #ifndef _ASM_IA64_NATIVE_IRQ_H
include/asm-ia64/nodedata.h arch/ia64/include/asm/nodedata.h
include/asm-ia64/numa.h arch/ia64/include/asm/numa.h
include/asm-ia64/page.h arch/ia64/include/asm/page.h
include/asm-ia64/pal.h arch/ia64/include/asm/pal.h
include/asm-ia64/param.h arch/ia64/include/asm/param.h
-2
include/asm-ia64/paravirt.h arch/ia64/include/asm/paravirt.h
··· 1 1 /****************************************************************************** 2 - * include/asm-ia64/paravirt.h 3 - * 4 2 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> 5 3 * VA Linux Systems Japan K.K. 6 4 *
-2
include/asm-ia64/paravirt_privop.h arch/ia64/include/asm/paravirt_privop.h
··· 1 1 /****************************************************************************** 2 - * include/asm-ia64/paravirt_privops.h 3 - * 4 2 * Copyright (c) 2008 Isaku Yamahata <yamahata at valinux co jp> 5 3 * VA Linux Systems Japan K.K. 6 4 *
include/asm-ia64/parport.h arch/ia64/include/asm/parport.h
include/asm-ia64/patch.h arch/ia64/include/asm/patch.h
include/asm-ia64/pci.h arch/ia64/include/asm/pci.h
include/asm-ia64/percpu.h arch/ia64/include/asm/percpu.h
include/asm-ia64/perfmon.h arch/ia64/include/asm/perfmon.h
include/asm-ia64/perfmon_default_smpl.h arch/ia64/include/asm/perfmon_default_smpl.h
include/asm-ia64/pgalloc.h arch/ia64/include/asm/pgalloc.h
include/asm-ia64/pgtable.h arch/ia64/include/asm/pgtable.h
include/asm-ia64/poll.h arch/ia64/include/asm/poll.h
include/asm-ia64/posix_types.h arch/ia64/include/asm/posix_types.h
include/asm-ia64/processor.h arch/ia64/include/asm/processor.h
include/asm-ia64/ptrace.h arch/ia64/include/asm/ptrace.h
include/asm-ia64/ptrace_offsets.h arch/ia64/include/asm/ptrace_offsets.h
include/asm-ia64/resource.h arch/ia64/include/asm/resource.h
include/asm-ia64/rse.h arch/ia64/include/asm/rse.h
+1 -1
include/asm-ia64/rwsem.h arch/ia64/include/asm/rwsem.h
··· 1 1 /* 2 - * asm-ia64/rwsem.h: R/W semaphores for ia64 2 + * R/W semaphores for ia64 3 3 * 4 4 * Copyright (C) 2003 Ken Chen <kenneth.w.chen@intel.com> 5 5 * Copyright (C) 2003 Asit Mallick <asit.k.mallick@intel.com>
include/asm-ia64/sal.h arch/ia64/include/asm/sal.h
include/asm-ia64/scatterlist.h arch/ia64/include/asm/scatterlist.h
include/asm-ia64/sections.h arch/ia64/include/asm/sections.h
include/asm-ia64/segment.h arch/ia64/include/asm/segment.h
include/asm-ia64/sembuf.h arch/ia64/include/asm/sembuf.h
-2
include/asm-ia64/serial.h arch/ia64/include/asm/serial.h
··· 1 1 /* 2 - * include/asm-ia64/serial.h 3 - * 4 2 * Derived from the i386 version. 5 3 */ 6 4
include/asm-ia64/setup.h arch/ia64/include/asm/setup.h
include/asm-ia64/shmbuf.h arch/ia64/include/asm/shmbuf.h
include/asm-ia64/shmparam.h arch/ia64/include/asm/shmparam.h
include/asm-ia64/sigcontext.h arch/ia64/include/asm/sigcontext.h
include/asm-ia64/siginfo.h arch/ia64/include/asm/siginfo.h
include/asm-ia64/signal.h arch/ia64/include/asm/signal.h
include/asm-ia64/smp.h arch/ia64/include/asm/smp.h
include/asm-ia64/sn/acpi.h arch/ia64/include/asm/sn/acpi.h
include/asm-ia64/sn/addrs.h arch/ia64/include/asm/sn/addrs.h
include/asm-ia64/sn/arch.h arch/ia64/include/asm/sn/arch.h
include/asm-ia64/sn/bte.h arch/ia64/include/asm/sn/bte.h
include/asm-ia64/sn/clksupport.h arch/ia64/include/asm/sn/clksupport.h
include/asm-ia64/sn/geo.h arch/ia64/include/asm/sn/geo.h
include/asm-ia64/sn/intr.h arch/ia64/include/asm/sn/intr.h
include/asm-ia64/sn/io.h arch/ia64/include/asm/sn/io.h
include/asm-ia64/sn/ioc3.h arch/ia64/include/asm/sn/ioc3.h
include/asm-ia64/sn/klconfig.h arch/ia64/include/asm/sn/klconfig.h
include/asm-ia64/sn/l1.h arch/ia64/include/asm/sn/l1.h
include/asm-ia64/sn/leds.h arch/ia64/include/asm/sn/leds.h
include/asm-ia64/sn/module.h arch/ia64/include/asm/sn/module.h
include/asm-ia64/sn/mspec.h arch/ia64/include/asm/sn/mspec.h
include/asm-ia64/sn/nodepda.h arch/ia64/include/asm/sn/nodepda.h
include/asm-ia64/sn/pcibr_provider.h arch/ia64/include/asm/sn/pcibr_provider.h
include/asm-ia64/sn/pcibus_provider_defs.h arch/ia64/include/asm/sn/pcibus_provider_defs.h
include/asm-ia64/sn/pcidev.h arch/ia64/include/asm/sn/pcidev.h
include/asm-ia64/sn/pda.h arch/ia64/include/asm/sn/pda.h
include/asm-ia64/sn/pic.h arch/ia64/include/asm/sn/pic.h
include/asm-ia64/sn/rw_mmr.h arch/ia64/include/asm/sn/rw_mmr.h
include/asm-ia64/sn/shub_mmr.h arch/ia64/include/asm/sn/shub_mmr.h
include/asm-ia64/sn/shubio.h arch/ia64/include/asm/sn/shubio.h
include/asm-ia64/sn/simulator.h arch/ia64/include/asm/sn/simulator.h
include/asm-ia64/sn/sn2/sn_hwperf.h arch/ia64/include/asm/sn/sn2/sn_hwperf.h
include/asm-ia64/sn/sn_cpuid.h arch/ia64/include/asm/sn/sn_cpuid.h
include/asm-ia64/sn/sn_feature_sets.h arch/ia64/include/asm/sn/sn_feature_sets.h
+1 -1
include/asm-ia64/sn/sn_sal.h arch/ia64/include/asm/sn/sn_sal.h
··· 1094 1094 /* 1095 1095 * This is the access point to the Altix PROM hardware performance 1096 1096 * and status monitoring interface. For info on using this, see 1097 - * include/asm-ia64/sn/sn2/sn_hwperf.h 1097 + * arch/ia64/include/asm/sn/sn2/sn_hwperf.h 1098 1098 */ 1099 1099 static inline int 1100 1100 ia64_sn_hwperf_op(nasid_t nasid, u64 opcode, u64 a0, u64 a1, u64 a2,
include/asm-ia64/sn/tioca.h arch/ia64/include/asm/sn/tioca.h
include/asm-ia64/sn/tioca_provider.h arch/ia64/include/asm/sn/tioca_provider.h
include/asm-ia64/sn/tioce.h arch/ia64/include/asm/sn/tioce.h
include/asm-ia64/sn/tioce_provider.h arch/ia64/include/asm/sn/tioce_provider.h
include/asm-ia64/sn/tiocp.h arch/ia64/include/asm/sn/tiocp.h
include/asm-ia64/sn/tiocx.h arch/ia64/include/asm/sn/tiocx.h
include/asm-ia64/sn/types.h arch/ia64/include/asm/sn/types.h
include/asm-ia64/socket.h arch/ia64/include/asm/socket.h
include/asm-ia64/sockios.h arch/ia64/include/asm/sockios.h
include/asm-ia64/sparsemem.h arch/ia64/include/asm/sparsemem.h
include/asm-ia64/spinlock.h arch/ia64/include/asm/spinlock.h
include/asm-ia64/spinlock_types.h arch/ia64/include/asm/spinlock_types.h
include/asm-ia64/stat.h arch/ia64/include/asm/stat.h
include/asm-ia64/statfs.h arch/ia64/include/asm/statfs.h
include/asm-ia64/string.h arch/ia64/include/asm/string.h
include/asm-ia64/suspend.h arch/ia64/include/asm/suspend.h
include/asm-ia64/system.h arch/ia64/include/asm/system.h
include/asm-ia64/termbits.h arch/ia64/include/asm/termbits.h
include/asm-ia64/termios.h arch/ia64/include/asm/termios.h
include/asm-ia64/thread_info.h arch/ia64/include/asm/thread_info.h
include/asm-ia64/timex.h arch/ia64/include/asm/timex.h
include/asm-ia64/tlb.h arch/ia64/include/asm/tlb.h
include/asm-ia64/tlbflush.h arch/ia64/include/asm/tlbflush.h
-2
include/asm-ia64/topology.h arch/ia64/include/asm/topology.h
··· 1 1 /* 2 - * linux/include/asm-ia64/topology.h 3 - * 4 2 * Copyright (C) 2002, Erich Focht, NEC 5 3 * 6 4 * All rights reserved.
include/asm-ia64/types.h arch/ia64/include/asm/types.h
include/asm-ia64/uaccess.h arch/ia64/include/asm/uaccess.h
include/asm-ia64/ucontext.h arch/ia64/include/asm/ucontext.h
include/asm-ia64/unaligned.h arch/ia64/include/asm/unaligned.h
include/asm-ia64/uncached.h arch/ia64/include/asm/uncached.h
include/asm-ia64/unistd.h arch/ia64/include/asm/unistd.h
include/asm-ia64/unwind.h arch/ia64/include/asm/unwind.h
include/asm-ia64/user.h arch/ia64/include/asm/user.h
include/asm-ia64/ustack.h arch/ia64/include/asm/ustack.h
include/asm-ia64/uv/uv_hub.h arch/ia64/include/asm/uv/uv_hub.h
include/asm-ia64/uv/uv_mmrs.h arch/ia64/include/asm/uv/uv_mmrs.h
include/asm-ia64/vga.h arch/ia64/include/asm/vga.h
-2
include/asm-ia64/xor.h arch/ia64/include/asm/xor.h
··· 1 1 /* 2 - * include/asm-ia64/xor.h 3 - * 4 2 * Optimized RAID-5 checksumming functions for IA-64. 5 3 * 6 4 * This program is free software; you can redistribute it and/or modify