Skip to contentSkip to conversation

x86: use arch/x86/include

GIT PULL Sam Ravnborg 5 participants 11 messages Jul 30, 2008 – Jul 31, 2008

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

Hi x86 guys.

It turned out to be easy to enable um to use
arch/x86/include so here is a git pull.

The majority is the renames and the real changes are the diff below.
I have included the um bits too as the changes belongs together.

The commit can be pulled from:

git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86.git master

See below for full pull request.

Sam

arch/um/Makefile +14 -2
index ca40397..4a19886 100644
@@ -156,9 +156,21 @@ include/asm-um/arch:
 	@echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
 	$(Q)mkdir -p $(objtree)/include/asm-um
-	$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
+	$(Q)if [ -d $(srctree)/arch/$(HEADER_ARCH)/include/asm ]; then  \
+		ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm      \
+		        include/asm-um/arch;                            \
+	else                                                            \
+		ln -fsn $(srctree)/include/asm-$(HEADER_ARCH)           \
+		        include/asm-um/arch;                            \
+	fi
 else
-	$(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
+	$(Q)if [ -d arch/$(HEADER_ARCH)/include/asm ]; then             \
+		ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm      \
+                        include/asm-um/arch;                            \
+	else                                                            \
+		cd $(srctree)/include/asm-um &&                         \
+		ln -fsn ../asm-$(HEADER_ARCH) arch;                     \
+	fi
 endif
 
 $(objtree)/$(ARCH_DIR)/include:
arch/x86/Makefile +3 -3
index f5631da..c7493e7 100644
@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 mcore-y  := arch/x86/mach-default/
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-x86/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)	:= -Iarch/x86/include/mach-voyager
 mcore-$(CONFIG_X86_VOYAGER)	:= arch/x86/mach-voyager/
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/mach-generic
 fcore-$(CONFIG_X86_GENERICARCH)	+= arch/x86/mach-generic/
 mcore-$(CONFIG_X86_GENERICARCH)	:= arch/x86/mach-default/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-x86/mach-default
+mflags-y += -Iarch/x86/include/mach-default
 
 # 64 bit does not support subarch support - clear sub arch variables
 fcore-$(CONFIG_X86_64)  :=
scripts/checksyscalls.sh +1 -1
index 366f8c7..41564b1 100755
@@ -119,5 +119,5 @@ sed -n -e '/^\#define/ { s/[^_]*__NR_\([^[:space:]]*\).*/\
 \#endif/p }' $1
 }
 
-(ignore_list && syscall_list ${srctree}/include/asm-x86/unistd_32.h) | \
+(ignore_list && syscall_list ${srctree}/arch/x86/include/asm/unistd_32.h) | \
 $* -E -x c - > /dev/null

The following changes since commit 6e86841d05f371b5b9b86ce76c02aaee83352298:
Linus Torvalds (1):

        Linux 2.6.27-rc1

are available in the git repository at:

git://git.kernel.org/pub/scm/linux/kernel/git/sam/x86.git master

Sam Ravnborg (1):

      x86: use arch/x86/include
 arch/um/Makefile                                   |   16 ++++++++++++++--
 arch/x86/Makefile                                  |    6 +++---
 {include/asm-x86 => arch/x86/include/asm}/Kbuild   |    0
 .../asm-x86 => arch/x86/include/asm}/a.out-core.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/a.out.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/acpi.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/agp.h    |    0
 .../x86/include/asm}/alternative-asm.h             |    0
 .../asm-x86 => arch/x86/include/asm}/alternative.h |    0
 .../asm-x86 => arch/x86/include/asm}/amd_iommu.h   |    0
 .../x86/include/asm}/amd_iommu_types.h             |    0
 {include/asm-x86 => arch/x86/include/asm}/apic.h   |    0
 .../asm-x86 => arch/x86/include/asm}/apicdef.h     |    0
 .../asm-x86 => arch/x86/include/asm}/arch_hooks.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/asm.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/atomic.h |    0
 .../asm-x86 => arch/x86/include/asm}/atomic_32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/atomic_64.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/auxvec.h |    0
 .../asm-x86 => arch/x86/include/asm}/bios_ebda.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/bitops.h |    0
 {include/asm-x86 => arch/x86/include/asm}/boot.h   |    0
 .../asm-x86 => arch/x86/include/asm}/bootparam.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/bug.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/bugs.h   |    0
 .../asm-x86 => arch/x86/include/asm}/byteorder.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/cache.h  |    0
 .../asm-x86 => arch/x86/include/asm}/cacheflush.h  |    0
 .../asm-x86 => arch/x86/include/asm}/calgary.h     |    0
 .../asm-x86 => arch/x86/include/asm}/calling.h     |    0
 .../asm-x86 => arch/x86/include/asm}/checksum.h    |    0
 .../asm-x86 => arch/x86/include/asm}/checksum_32.h |    0
 .../asm-x86 => arch/x86/include/asm}/checksum_64.h |    0
 .../asm-x86 => arch/x86/include/asm}/cmpxchg.h     |    0
 .../asm-x86 => arch/x86/include/asm}/cmpxchg_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/cmpxchg_64.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/compat.h |    0
 {include/asm-x86 => arch/x86/include/asm}/cpu.h    |    0
 .../asm-x86 => arch/x86/include/asm}/cpufeature.h  |    0
 .../asm-x86 => arch/x86/include/asm}/cputime.h     |    0
 .../asm-x86 => arch/x86/include/asm}/current.h     |    0
 .../asm-x86 => arch/x86/include/asm}/debugreg.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/delay.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/desc.h   |    0
 .../asm-x86 => arch/x86/include/asm}/desc_defs.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/device.h |    0
 {include/asm-x86 => arch/x86/include/asm}/div64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/dma-mapping.h |    0
 {include/asm-x86 => arch/x86/include/asm}/dma.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/dmi.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/ds.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/dwarf2.h |    0
 {include/asm-x86 => arch/x86/include/asm}/e820.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/edac.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/efi.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/elf.h    |    0
 .../x86/include/asm}/emergency-restart.h           |    0
 {include/asm-x86 => arch/x86/include/asm}/errno.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/fb.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/fcntl.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/fixmap.h |    0
 .../asm-x86 => arch/x86/include/asm}/fixmap_32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/fixmap_64.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/floppy.h |    0
 {include/asm-x86 => arch/x86/include/asm}/frame.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/ftrace.h |    0
 {include/asm-x86 => arch/x86/include/asm}/futex.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/gart.h   |    0
 .../asm-x86 => arch/x86/include/asm}/genapic.h     |    0
 .../asm-x86 => arch/x86/include/asm}/genapic_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/genapic_64.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/geode.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/gpio.h   |    0
 .../asm-x86 => arch/x86/include/asm}/hardirq.h     |    0
 .../asm-x86 => arch/x86/include/asm}/hardirq_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/hardirq_64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/highmem.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/hpet.h   |    0
 .../asm-x86 => arch/x86/include/asm}/hugetlb.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/hw_irq.h |    0
 .../x86/include/asm}/hypertransport.h              |    0
 {include/asm-x86 => arch/x86/include/asm}/i387.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/i8253.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/i8259.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/ia32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/ia32_unistd.h |    0
 {include/asm-x86 => arch/x86/include/asm}/idle.h   |    0
 .../x86/include/asm}/intel_arch_perfmon.h          |    0
 {include/asm-x86 => arch/x86/include/asm}/io.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/io_32.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/io_64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/io_apic.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/ioctl.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/ioctls.h |    0
 {include/asm-x86 => arch/x86/include/asm}/iommu.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/ipcbuf.h |    0
 {include/asm-x86 => arch/x86/include/asm}/ipi.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/irq.h    |    0
 .../asm-x86 => arch/x86/include/asm}/irq_regs.h    |    0
 .../asm-x86 => arch/x86/include/asm}/irq_regs_32.h |    0
 .../asm-x86 => arch/x86/include/asm}/irq_regs_64.h |    0
 .../asm-x86 => arch/x86/include/asm}/irq_vectors.h |    0
 .../asm-x86 => arch/x86/include/asm}/irqflags.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/ist.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/k8.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/kdebug.h |    0
 {include/asm-x86 => arch/x86/include/asm}/kexec.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/kgdb.h   |    0
 .../asm-x86 => arch/x86/include/asm}/kmap_types.h  |    0
 .../asm-x86 => arch/x86/include/asm}/kprobes.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/kvm.h    |    0
 .../asm-x86 => arch/x86/include/asm}/kvm_host.h    |    0
 .../asm-x86 => arch/x86/include/asm}/kvm_para.h    |    0
 .../x86/include/asm}/kvm_x86_emulate.h             |    0
 {include/asm-x86 => arch/x86/include/asm}/ldt.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/lguest.h |    0
 .../x86/include/asm}/lguest_hcall.h                |    0
 .../asm-x86 => arch/x86/include/asm}/linkage.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/local.h  |    0
 .../asm-x86 => arch/x86/include/asm}/math_emu.h    |    0
 .../asm-x86 => arch/x86/include/asm}/mc146818rtc.h |    0
 {include/asm-x86 => arch/x86/include/asm}/mca.h    |    0
 .../asm-x86 => arch/x86/include/asm}/mca_dma.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/mce.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/mman.h   |    0
 .../asm-x86 => arch/x86/include/asm}/mmconfig.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/mmu.h    |    0
 .../asm-x86 => arch/x86/include/asm}/mmu_context.h |    0
 .../x86/include/asm}/mmu_context_32.h              |    0
 .../x86/include/asm}/mmu_context_64.h              |    0
 {include/asm-x86 => arch/x86/include/asm}/mmx.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/mmzone.h |    0
 .../asm-x86 => arch/x86/include/asm}/mmzone_32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/mmzone_64.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/module.h |    0
 {include/asm-x86 => arch/x86/include/asm}/mpspec.h |    0
 .../asm-x86 => arch/x86/include/asm}/mpspec_def.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/msgbuf.h |    0
 {include/asm-x86 => arch/x86/include/asm}/msidef.h |    0
 .../asm-x86 => arch/x86/include/asm}/msr-index.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/msr.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/mtrr.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/mutex.h  |    0
 .../asm-x86 => arch/x86/include/asm}/mutex_32.h    |    0
 .../asm-x86 => arch/x86/include/asm}/mutex_64.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/nmi.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/nops.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/numa.h   |    0
 .../asm-x86 => arch/x86/include/asm}/numa_32.h     |    0
 .../asm-x86 => arch/x86/include/asm}/numa_64.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/numaq.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/olpc.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/page.h   |    0
 .../asm-x86 => arch/x86/include/asm}/page_32.h     |    0
 .../asm-x86 => arch/x86/include/asm}/page_64.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/param.h  |    0
 .../asm-x86 => arch/x86/include/asm}/paravirt.h    |    0
 .../asm-x86 => arch/x86/include/asm}/parport.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/pat.h    |    0
 .../asm-x86 => arch/x86/include/asm}/pci-direct.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/pci.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/pci_32.h |    0
 {include/asm-x86 => arch/x86/include/asm}/pci_64.h |    0
 {include/asm-x86 => arch/x86/include/asm}/pda.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/percpu.h |    0
 .../asm-x86 => arch/x86/include/asm}/pgalloc.h     |    0
 .../x86/include/asm}/pgtable-2level-defs.h         |    0
 .../x86/include/asm}/pgtable-2level.h              |    0
 .../x86/include/asm}/pgtable-3level-defs.h         |    0
 .../x86/include/asm}/pgtable-3level.h              |    0
 .../asm-x86 => arch/x86/include/asm}/pgtable.h     |    0
 .../asm-x86 => arch/x86/include/asm}/pgtable_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/pgtable_64.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/poll.h   |    0
 .../asm-x86 => arch/x86/include/asm}/posix_types.h |    0
 .../x86/include/asm}/posix_types_32.h              |    0
 .../x86/include/asm}/posix_types_64.h              |    0
 {include/asm-x86 => arch/x86/include/asm}/prctl.h  |    0
 .../x86/include/asm}/processor-cyrix.h             |    0
 .../x86/include/asm}/processor-flags.h             |    0
 .../asm-x86 => arch/x86/include/asm}/processor.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/proto.h  |    0
 .../asm-x86 => arch/x86/include/asm}/ptrace-abi.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/ptrace.h |    0
 .../asm-x86 => arch/x86/include/asm}/pvclock-abi.h |    0
 .../asm-x86 => arch/x86/include/asm}/pvclock.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/reboot.h |    0
 .../x86/include/asm}/reboot_fixups.h               |    0
 .../x86/include/asm}/required-features.h           |    0
 .../asm-x86 => arch/x86/include/asm}/resource.h    |    0
 .../x86/include/asm}/resume-trace.h                |    0
 {include/asm-x86 => arch/x86/include/asm}/rio.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/rtc.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/rwlock.h |    0
 {include/asm-x86 => arch/x86/include/asm}/rwsem.h  |    0
 .../asm-x86 => arch/x86/include/asm}/scatterlist.h |    0
 .../asm-x86 => arch/x86/include/asm}/seccomp.h     |    0
 .../asm-x86 => arch/x86/include/asm}/seccomp_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/seccomp_64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/sections.h    |    0
 .../asm-x86 => arch/x86/include/asm}/segment.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/sembuf.h |    0
 {include/asm-x86 => arch/x86/include/asm}/serial.h |    0
 {include/asm-x86 => arch/x86/include/asm}/setup.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/shmbuf.h |    0
 .../asm-x86 => arch/x86/include/asm}/shmparam.h    |    0
 .../asm-x86 => arch/x86/include/asm}/sigcontext.h  |    0
 .../x86/include/asm}/sigcontext32.h                |    0
 .../asm-x86 => arch/x86/include/asm}/siginfo.h     |    0
 {include/asm-x86 => arch/x86/include/asm}/signal.h |    0
 {include/asm-x86 => arch/x86/include/asm}/smp.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/socket.h |    0
 .../asm-x86 => arch/x86/include/asm}/sockios.h     |    0
 .../asm-x86 => arch/x86/include/asm}/sparsemem.h   |    0
 .../asm-x86 => arch/x86/include/asm}/spinlock.h    |    0
 .../x86/include/asm}/spinlock_types.h              |    0
 {include/asm-x86 => arch/x86/include/asm}/srat.h   |    0
 .../asm-x86 => arch/x86/include/asm}/stacktrace.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/stat.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/statfs.h |    0
 {include/asm-x86 => arch/x86/include/asm}/string.h |    0
 .../asm-x86 => arch/x86/include/asm}/string_32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/string_64.h   |    0
 .../asm-x86 => arch/x86/include/asm}/suspend.h     |    0
 .../asm-x86 => arch/x86/include/asm}/suspend_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/suspend_64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/swiotlb.h     |    0
 .../asm-x86 => arch/x86/include/asm}/sync_bitops.h |    0
 {include/asm-x86 => arch/x86/include/asm}/system.h |    0
 .../asm-x86 => arch/x86/include/asm}/system_64.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/tce.h    |    0
 .../asm-x86 => arch/x86/include/asm}/termbits.h    |    0
 .../asm-x86 => arch/x86/include/asm}/termios.h     |    0
 .../asm-x86 => arch/x86/include/asm}/therm_throt.h |    0
 .../asm-x86 => arch/x86/include/asm}/thread_info.h |    0
 {include/asm-x86 => arch/x86/include/asm}/time.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/timer.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/timex.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/tlb.h    |    0
 .../asm-x86 => arch/x86/include/asm}/tlbflush.h    |    0
 .../asm-x86 => arch/x86/include/asm}/topology.h    |    0
 .../asm-x86 => arch/x86/include/asm}/trampoline.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/traps.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/tsc.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/types.h  |    0
 .../asm-x86 => arch/x86/include/asm}/uaccess.h     |    0
 .../asm-x86 => arch/x86/include/asm}/uaccess_32.h  |    0
 .../asm-x86 => arch/x86/include/asm}/uaccess_64.h  |    0
 .../asm-x86 => arch/x86/include/asm}/ucontext.h    |    0
 .../asm-x86 => arch/x86/include/asm}/unaligned.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/unistd.h |    0
 .../asm-x86 => arch/x86/include/asm}/unistd_32.h   |    0
 .../asm-x86 => arch/x86/include/asm}/unistd_64.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/unwind.h |    0
 {include/asm-x86 => arch/x86/include/asm}/user.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/user32.h |    0
 .../asm-x86 => arch/x86/include/asm}/user_32.h     |    0
 .../asm-x86 => arch/x86/include/asm}/user_64.h     |    0
 .../asm-x86 => arch/x86/include/asm}/uv/bios.h     |    0
 .../asm-x86 => arch/x86/include/asm}/uv/uv_bau.h   |    0
 .../asm-x86 => arch/x86/include/asm}/uv/uv_hub.h   |    0
 .../asm-x86 => arch/x86/include/asm}/uv/uv_mmrs.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/vdso.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/vga.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/vgtod.h  |    0
 {include/asm-x86 => arch/x86/include/asm}/vic.h    |    0
 .../x86/include/asm}/visws/cobalt.h                |    0
 .../x86/include/asm}/visws/lithium.h               |    0
 .../asm-x86 => arch/x86/include/asm}/visws/piix4.h |    0
 .../asm-x86 => arch/x86/include/asm}/visws/sgivw.h |    0
 {include/asm-x86 => arch/x86/include/asm}/vm86.h   |    0
 {include/asm-x86 => arch/x86/include/asm}/vmi.h    |    0
 .../asm-x86 => arch/x86/include/asm}/vmi_time.h    |    0
 .../asm-x86 => arch/x86/include/asm}/voyager.h     |    0
 .../asm-x86 => arch/x86/include/asm}/vsyscall.h    |    0
 .../asm-x86 => arch/x86/include/asm}/xen/events.h  |    0
 .../x86/include/asm}/xen/grant_table.h             |    0
 .../x86/include/asm}/xen/hypercall.h               |    0
 .../x86/include/asm}/xen/hypervisor.h              |    0
 .../x86/include/asm}/xen/interface.h               |    0
 .../x86/include/asm}/xen/interface_32.h            |    0
 .../x86/include/asm}/xen/interface_64.h            |    0
 .../asm-x86 => arch/x86/include/asm}/xen/page.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/xor.h    |    0
 {include/asm-x86 => arch/x86/include/asm}/xor_32.h |    0
 {include/asm-x86 => arch/x86/include/asm}/xor_64.h |    0
 .../x86/include}/mach-bigsmp/mach_apic.h           |    0
 .../x86/include}/mach-bigsmp/mach_apicdef.h        |    0
 .../x86/include}/mach-bigsmp/mach_ipi.h            |    0
 .../x86/include}/mach-default/apm.h                |    0
 .../x86/include}/mach-default/do_timer.h           |    0
 .../x86/include}/mach-default/entry_arch.h         |    0
 .../x86/include}/mach-default/mach_apic.h          |    0
 .../x86/include}/mach-default/mach_apicdef.h       |    0
 .../x86/include}/mach-default/mach_ipi.h           |    0
 .../x86/include}/mach-default/mach_mpparse.h       |    0
 .../x86/include}/mach-default/mach_mpspec.h        |    0
 .../x86/include}/mach-default/mach_timer.h         |    0
 .../x86/include}/mach-default/mach_traps.h         |    0
 .../x86/include}/mach-default/mach_wakecpu.h       |    0
 .../x86/include}/mach-default/pci-functions.h      |    0
 .../x86/include}/mach-default/setup_arch.h         |    0
 .../x86/include}/mach-default/smpboot_hooks.h      |    0
 .../x86/include}/mach-es7000/mach_apic.h           |    0
 .../x86/include}/mach-es7000/mach_apicdef.h        |    0
 .../x86/include}/mach-es7000/mach_ipi.h            |    0
 .../x86/include}/mach-es7000/mach_mpparse.h        |    0
 .../x86/include}/mach-es7000/mach_wakecpu.h        |    0
 .../x86/include}/mach-generic/gpio.h               |    0
 .../x86/include}/mach-generic/irq_vectors_limits.h |    0
 .../x86/include}/mach-generic/mach_apic.h          |    0
 .../x86/include}/mach-generic/mach_apicdef.h       |    0
 .../x86/include}/mach-generic/mach_ipi.h           |    0
 .../x86/include}/mach-generic/mach_mpparse.h       |    0
 .../x86/include}/mach-generic/mach_mpspec.h        |    0
 .../x86/include}/mach-numaq/mach_apic.h            |    0
 .../x86/include}/mach-numaq/mach_apicdef.h         |    0
 .../x86/include}/mach-numaq/mach_ipi.h             |    0
 .../x86/include}/mach-numaq/mach_mpparse.h         |    0
 .../x86/include}/mach-numaq/mach_wakecpu.h         |    0
 .../x86/include}/mach-rdc321x/gpio.h               |    0
 .../x86/include}/mach-rdc321x/rdc321x_defs.h       |    0
 .../x86/include}/mach-summit/irq_vectors_limits.h  |    0
 .../x86/include}/mach-summit/mach_apic.h           |    0
 .../x86/include}/mach-summit/mach_apicdef.h        |    0
 .../x86/include}/mach-summit/mach_ipi.h            |    0
 .../x86/include}/mach-summit/mach_mpparse.h        |    0
 .../x86/include}/mach-voyager/do_timer.h           |    0
 .../x86/include}/mach-voyager/entry_arch.h         |    0
 .../x86/include}/mach-voyager/setup_arch.h         |    0
 scripts/checksyscalls.sh                           |    2 +-
 331 files changed, 18 insertions(+), 6 deletions(-)
 rename {include/asm-x86 => arch/x86/include/asm}/Kbuild (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/a.out-core.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/a.out.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/acpi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/agp.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/alternative-asm.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/alternative.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/amd_iommu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/amd_iommu_types.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/apic.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/arch_hooks.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/asm.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/atomic.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/atomic_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/atomic_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/auxvec.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/bios_ebda.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/bitops.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/boot.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/bootparam.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/bug.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/bugs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/byteorder.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cache.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cacheflush.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/calgary.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/calling.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/checksum.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/checksum_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/checksum_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cmpxchg_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/compat.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cpu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cpufeature.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/cputime.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/current.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/debugreg.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/delay.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/desc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/desc_defs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/device.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/div64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/dma-mapping.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/dma.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/dmi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ds.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/dwarf2.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/e820.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/edac.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/efi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/elf.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/emergency-restart.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/errno.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/fb.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/fcntl.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/fixmap.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/fixmap_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/fixmap_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/floppy.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/frame.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ftrace.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/futex.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/gart.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/genapic.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/genapic_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/genapic_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/geode.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/gpio.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hardirq.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hardirq_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hardirq_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/highmem.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hpet.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hugetlb.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hw_irq.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/hypertransport.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/i387.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/i8253.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/i8259.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ia32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ia32_unistd.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/idle.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/intel_arch_perfmon.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/io.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/io_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/io_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/io_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ioctl.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ioctls.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/iommu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ipcbuf.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irq.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irq_regs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irq_regs_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irq_regs_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irq_vectors.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/irqflags.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ist.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/k8.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kdebug.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kexec.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kgdb.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kmap_types.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kprobes.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kvm.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kvm_host.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kvm_para.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/kvm_x86_emulate.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ldt.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/lguest.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/lguest_hcall.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/linkage.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/local.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/math_emu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mc146818rtc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mca.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mca_dma.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mce.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mman.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmconfig.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmu_context.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmu_context_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmu_context_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmx.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmzone.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmzone_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mmzone_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/module.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mpspec.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mpspec_def.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/msgbuf.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/msidef.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/msr-index.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/msr.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mtrr.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mutex.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mutex_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/mutex_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/nmi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/nops.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/numa.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/numa_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/numa_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/numaq.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/olpc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/page.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/page_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/page_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/param.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/paravirt.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/parport.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pat.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pci-direct.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pci.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pci_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pci_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pda.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/percpu.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgalloc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable-2level-defs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable-2level.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable-3level-defs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable-3level.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pgtable_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/poll.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/posix_types.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/posix_types_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/posix_types_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/prctl.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/processor-cyrix.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/processor-flags.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/processor.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/proto.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ptrace-abi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ptrace.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pvclock-abi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/pvclock.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/reboot.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/reboot_fixups.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/required-features.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/resource.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/resume-trace.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/rio.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/rtc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/rwlock.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/rwsem.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/scatterlist.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/seccomp.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/seccomp_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/seccomp_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sections.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/segment.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sembuf.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/serial.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/setup.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/shmbuf.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/shmparam.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sigcontext.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sigcontext32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/siginfo.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/signal.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/smp.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/socket.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sockios.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sparsemem.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/spinlock.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/spinlock_types.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/srat.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/stacktrace.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/stat.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/statfs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/string.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/string_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/string_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/suspend.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/suspend_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/suspend_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/swiotlb.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/sync_bitops.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/system.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/system_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/tce.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/termbits.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/termios.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/therm_throt.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/thread_info.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/time.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/timer.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/timex.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/tlb.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/tlbflush.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/topology.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/trampoline.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/traps.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/tsc.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/types.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uaccess.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uaccess_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uaccess_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/ucontext.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/unaligned.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/unistd.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/unistd_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/unistd_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/unwind.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/user.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/user32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/user_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/user_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uv/bios.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_bau.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_hub.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/uv/uv_mmrs.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vdso.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vga.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vgtod.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vic.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/visws/cobalt.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/visws/lithium.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/visws/piix4.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/visws/sgivw.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vm86.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vmi.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vmi_time.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/voyager.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/vsyscall.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/events.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/grant_table.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/hypercall.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/hypervisor.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/interface.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/interface_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/interface_64.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xen/page.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xor.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xor_32.h (100%)
 rename {include/asm-x86 => arch/x86/include/asm}/xor_64.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-bigsmp/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-bigsmp/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-bigsmp/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/apm.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/do_timer.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/entry_arch.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_mpparse.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_mpspec.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_timer.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_traps.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/mach_wakecpu.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/pci-functions.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/setup_arch.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-default/smpboot_hooks.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-es7000/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-es7000/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-es7000/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-es7000/mach_mpparse.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-es7000/mach_wakecpu.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/gpio.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/irq_vectors_limits.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/mach_mpparse.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-generic/mach_mpspec.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-numaq/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-numaq/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-numaq/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-numaq/mach_mpparse.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-numaq/mach_wakecpu.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-rdc321x/gpio.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-rdc321x/rdc321x_defs.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-summit/irq_vectors_limits.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-summit/mach_apic.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-summit/mach_apicdef.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-summit/mach_ipi.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-summit/mach_mpparse.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-voyager/do_timer.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-voyager/entry_arch.h (100%)
 rename {include/asm-x86 => arch/x86/include}/mach-voyager/setup_arch.h (100%)
#1 lore raw
Quoted 4 lines · Sam Ravnborg

Hi x86 guys.

It turned out to be easy to enable um to use arch/x86/include so here is a git pull.

hm, we have a _ton_ of changes to include files queued up already, so this is rather inconvenient.

I missed the discussion on this, what's the point of renaming all these files?

Ingo

#2 lore raw
Quoted 7 lines · Ingo Molnar
Quoted 3 lines · Sam Ravnborg

Hi x86 guys.

It turned out to be easy to enable um to use arch/x86/include so here is a git pull.

hm, we have a _ton_ of changes to include files queued up already, so this is rather inconvenient.

Git *should* be able to track those changes across a rename and even with a rename on one branch and changes on another; in my experience it works well for filename renames, but git doesn't understand directory renames at all, so new files do have to be moved to their new locations manually.

Quoted 1 line

I missed the discussion on this, what's the point of renaming all these files?

I know there has been talk about this on and off for a long time (to get all the arch code into arch/). I don't know if there are any mechanical reasons for it, on top of that.

-hpa

#3 lore raw
Quoted 8 lines · H. Peter Anvin
Quoted 7 lines · Ingo Molnar
Quoted 4 lines · Sam Ravnborg

Hi x86 guys.

It turned out to be easy to enable um to use arch/x86/include so here is a git pull.

Quoted 8 lines
Quoted 2 lines

hm, we have a _ton_ of changes to include files queued up already, so this is rather inconvenient.

Git *should* be able to track those changes across a rename and even with a rename on one branch and changes on another; in my experience it works well for filename renames, but git doesn't understand directory renames at all, so new files do have to be moved to their new locations manually.

yes, it copes in some cases - but i've had rather bad experiences with it.

the reason i raised this is because i tried to pull Sam's renames, and they created 48 conflicts.

Quoted 6 lines
Quoted 2 lines

I missed the discussion on this, what's the point of renaming all these files?

I know there has been talk about this on and off for a long time (to get all the arch code into arch/). I don't know if there are any mechanical reasons for it, on top of that.

hm, seems rather pointless to me, i thought there might be some better reasons for it. Historically we've put all include files into include/asm-* - why upset the decade-long status quo now without strong technical reasons?

Ingo

#4 lore raw
In reply to H. Peter Anvin
Quoted 5 lines · H. Peter Anvin

Git *should* be able to track those changes across a rename and even with a rename on one branch and changes on another; in my experience it works well for filename renames, but git doesn't understand directory renames at all, so new files do have to be moved to their new locations manually.

Yes. Note that this is true only for merging (and some operations that can use the merge infrastructure, like cherry-picking). It's obviously not true for pure patches that are just pending in mailboxes etc.

The big x86 architecture rename (i386->x86) had some problems just due to the huge number of files involved, but the include directory should not just be easier, on the git side we also fixed some of the scalability issues we had with lots of renames.

[ However, fairly old versions of git may still have trouble due to
limiting rename detection to a smallish number of files (ie 100 or something).

Note, though, that the only person who needs a reasonably modern version of git is the person actually doing any merges that take renames into account. So "normal users" can use old versions without even realising.

And we're really talking about git versions about a year old - the whole arch/x86 rename thing was June last year. So by "modern" I definitely don't mean "last week", but "updated in any kind of reasonable manner", which I assume everybody involved in any x86 merging would have ]

Quoted 6 lines
Quoted 2 lines

I missed the discussion on this, what's the point of renaming all these files?

I know there has been talk about this on and off for a long time (to get all the arch code into arch/). I don't know if there are any mechanical reasons for it, on top of that.

My big reason is that it makes it much easier for me to see when merges only touch a specific architecture (git will always sort things by pathname, so if the first pathname is arch/xyz/something and the last one is arch/xyz/somethingelse, then I don't even need to look any closer). It also makes it much nicer for my statistics generator.

IOW, it helps the "overview" people, probably not so much anybody else.

It also ends up allowing some extra flexibility, ie we can put architecture header files in other places than <asm/xyz.h> (eg the whole <mach/xyz.h> thing), so there _are_ technical reasons for it, but at least to me those are just frosting on the cake.

Linus

#5 lore raw
In reply to Ingo Molnar
Quoted 10 lines · Ingo Molnar
Quoted 4 lines · Sam Ravnborg

Hi x86 guys.

It turned out to be easy to enable um to use arch/x86/include so here is a git pull.

hm, we have a _ton_ of changes to include files queued up already, so this is rather inconvenient.

git should cope with this if changes come in via git. I do not know about "git am" applied patches.

Quoted 3 lines

I missed the discussion on this, what's the point of renaming all these files?

It has been discussed many times to keep arch and arch include files under arch/.
Lately Linus outlined this:

    http://kerneltrap.org/mailarchive/linux-kernel/2008/5/21/1903924

I took the ball and did the kbuild side of this so we could do this gradually.
sparc are already converted. sh has it ready to be pulled and others are playing with it.

How we do it in the best way for such a fragile codebase as x86 is I am not sure. I would assume to do it late in the merge window where the minimum set of patches are queued up would be best (and this is now).

And Linus already said he would like to take it sooner. Quote:

====================================================================

Quoted 3 lines · Sam Ravnborg

But will you accept this stuff now or will we have to wait until next merge window?

if the patches are really small adn the resulting build is well tested (ignoring the actual _move_ operation), I'm ok with taking them.

In fact, in many ways I'd _prefer_ to do it now, rather than have it pending and then do it durign the next merge window when there are a lot of non-movement changes too.
====================================================================

Sam

#6 lore raw
Quoted 5 lines · Sam Ravnborg
Quoted 2 lines

hm, we have a _ton_ of changes to include files queued up already, so this is rather inconvenient.

git should cope with this if changes come in via git. I do not know about "git am" applied patches.

the pending commits are ordinary commits and there's little difference between a leaf commit that came via git and one that came via emails.

(the difference between Git and email is for more complex ops like renames, merges - i.e. more abstract and multi-commit operations.)

But such more complex scenarios are not what i'm talking about. We've got this many leaf commits in include/asm-x86/ at the moment:

   308 files changed, 3025 insertions(+), 2025 deletions(-)

... and pulling your rename generates almost 50 conflicts. (Also, i've got to hunt down all scripts that somehow rely on the location on include/asm-x86.)

Quoted 9 lines
Quoted 2 lines

I missed the discussion on this, what's the point of renaming all these files?

It has been discussed many times to keep arch and arch include files under arch/.
Lately Linus outlined this:

    http://kerneltrap.org/mailarchive/linux-kernel/2008/5/21/1903924
Quoted 8 lines

I took the ball and did the kbuild side of this so we could do this gradually.

sparc are already converted. sh has it ready to be pulled and others are playing with it.

How we do it in the best way for such a fragile codebase as x86 is I am not sure. [...]

huh, fragile codebase? Is that a flamebait? :-) What do you mean exactly?

The timing problems come from the fact that 90% of Linux development and 95% of Linux testing happens on x86. So we've already got a ton of stuff queued up for the next merge window. (and some cleanups for this cycle as well)

But fortunately you've scripted all this, so i guess we can do it at any stage. Could you send the script we should run?

Ingo

#7 lore raw
Quoted 3 lines · Ingo Molnar

But fortunately you've scripted all this, so i guess we can do it at any stage. Could you send the script we should run?

That's really the sanest way to deal with all this. If this is already automated, then we can script-generate a roving (constantly rebased) pseudo-branch, and apply it formally before pushing it up to Linus.

Restructuring changes are hideously messy, because they're orthogonal to everything else that's going on. The x86 merge itself and all that went along with it is a great example.

-hpa

#8 lore raw
In reply to Ingo Molnar
Quoted 6 lines
Quoted 3 lines

How we do it in the best way for such a fragile codebase as x86 is I am not sure. [...]

huh, fragile codebase? Is that a flamebait? :-) What do you mean exactly?

I only wanted to say that x86 see more changes than any other arch in the kernel like you also nicely says below.

Quoted 8 lines

The timing problems come from the fact that 90% of Linux development and 95% of Linux testing happens on x86. So we've already got a ton of stuff queued up for the next merge window. (and some cleanups for this cycle as well)

But fortunately you've scripted all this, so i guess we can do it at any stage. Could you send the script we should run?

It is a combination of a scrip and a patch.
The script:
#####
set -e
for D in include/asm-x86/mach-*; do

	echo $D
	DD=$(echo $D | cut -d '-' -f 3)
        mkdir -p arch/x86/include/mach-$DD/arch
        git mv include/asm-x86/mach-$DD/* arch/x86/include/mach-$DD
        rmdir include/asm-x86/mach-$DD

done

mkdir -p arch/x86/include/asm
git mv include/asm-x86/* arch/x86/include/asm
#####

And the patch (same as I included in the original posting:

arch/um/Makefile +14 -2
index ca40397..4a19886 100644
@@ -156,9 +156,21 @@ include/asm-um/arch:
 	@echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
 	$(Q)mkdir -p $(objtree)/include/asm-um
-	$(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
+	$(Q)if [ -d $(srctree)/arch/$(HEADER_ARCH)/include/asm ]; then  \
+		ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm      \
+		        include/asm-um/arch;                            \
+	else                                                            \
+		ln -fsn $(srctree)/include/asm-$(HEADER_ARCH)           \
+		        include/asm-um/arch;                            \
+	fi
 else
-	$(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
+	$(Q)if [ -d arch/$(HEADER_ARCH)/include/asm ]; then             \
+		ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm      \
+                        include/asm-um/arch;                            \
+	else                                                            \
+		cd $(srctree)/include/asm-um &&                         \
+		ln -fsn ../asm-$(HEADER_ARCH) arch;                     \
+	fi
 endif
 
 $(objtree)/$(ARCH_DIR)/include:
arch/x86/Makefile +3 -3
index f5631da..c7493e7 100644
@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 mcore-y  := arch/x86/mach-default/
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)	:= -Iinclude/asm-x86/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)	:= -Iarch/x86/include/mach-voyager
 mcore-$(CONFIG_X86_VOYAGER)	:= arch/x86/mach-voyager/
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/mach-generic
 fcore-$(CONFIG_X86_GENERICARCH)	+= arch/x86/mach-generic/
 mcore-$(CONFIG_X86_GENERICARCH)	:= arch/x86/mach-default/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-x86/mach-default
+mflags-y += -Iarch/x86/include/mach-default
 
 # 64 bit does not support subarch support - clear sub arch variables
 fcore-$(CONFIG_X86_64)  :=
scripts/checksyscalls.sh +1 -1
index 366f8c7..41564b1 100755
@@ -119,5 +119,5 @@ sed -n -e '/^\#define/ { s/[^_]*__NR_\([^[:space:]]*\).*/\
 \#endif/p }' $1
 }
 
-(ignore_list && syscall_list ${srctree}/include/asm-x86/unistd_32.h) | \
+(ignore_list && syscall_list ${srctree}/arch/x86/include/asm/unistd_32.h) | \
 $* -E -x c - > /dev/null

I by the way tried a simple git grep asm-x86:
[Manually edited to remove where asm-x86 occured in comments]

Documentation/DocBook/deviceiobook.tmpl:!Iinclude/asm-x86/io_32.h Documentation/DocBook/kernel-api.tmpl:!Iinclude/asm-x86/atomic_32.h Documentation/DocBook/kernel-api.tmpl:!Iinclude/asm-x86/unaligned.h Documentation/DocBook/kernel-api.tmpl:!Iinclude/asm-x86/bitops.h Documentation/DocBook/kernel-api.tmpl:!Iinclude/asm-x86/uaccess_32.h Documentation/DocBook/kernel-api.tmpl:!Iinclude/asm-x86/mca_dma.h
Documentation/DocBook/kernel-hacking.tmpl: <filename>include/asm-x86/delay_32.h:</filename>
Documentation/DocBook/kernel-hacking.tmpl: <filename>include/asm-x86/uaccess_32.h:</filename>
Documentation/DocBook/mcabook.tmpl:!Iinclude/asm-x86/mca_dma.h
Documentation/kernel-parameters.txt: include/asm-x86/cpufeature.h for the valid
Documentation/lguest/lguest.c:#include "asm-x86/bootparam.h" Documentation/x86/i386/zero-page.txt: include/asm-x86/bootparam.h

arch/ia64/ia32/audit.c:#include <asm-x86/unistd_32.h>

arch/um/sys-x86_64/syscall_table.c:#include <asm-x86/unistd_64.h> arch/um/sys-x86_64/syscall_table.c:#include <asm-x86/unistd_64.h>

So um needs a few more changes to build.
And ia64 needs a fix too.
Documentation is trivial and can be done in a seperate commit.

Sam

#9 lore raw

So is there a better or worse time to move the include files?

At the end of a merge window would seem to be the least disruptive time. So we can either hit this now, or wait until the next merge.

-Tony

[Just did the ia64 move locally with no apparent problems, should I commit and send a "please pull"?]

#10 lore raw
Quoted 10 lines · Tony Luck

So is there a better or worse time to move the include files?

At the end of a merge window would seem to be the least disruptive time. So we can either hit this now, or wait until the next merge.

-Tony

[Just did the ia64 move locally with no apparent problems, should I commit and send a "please pull"?]

That is clearly the least disruptive time; that's also when we did the x86 rename.

-hpa