From d967cbdfc85386efd72e463f63cdbc501591dac2 Mon Sep 17 00:00:00 2001
From: Chris Zankel <chris@zankel.net>
Date: Thu, 6 Nov 2008 06:40:46 -0800
Subject: [PATCH] --- yaml --- r: 126925 b: refs/heads/master c:
 367b8112fe2ea5c39a7bb4d263dcdd9b612fae18 h: refs/heads/master i:   126923:
 6da1b468ac0d2360f3ff381186b785742f75dcc3 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/xtensa/Makefile                    | 28 ++++++-------------
 trunk/arch/xtensa/boot/boot-elf/boot.lds.S    |  2 +-
 .../arch/xtensa/boot/boot-redboot/bootstrap.S |  2 +-
 .../xtensa/include/asm}/Kbuild                |  0
 .../xtensa/include/asm}/asmmacro.h            |  2 +-
 .../xtensa/include/asm}/atomic.h              |  0
 .../xtensa/include/asm}/auxvec.h              |  0
 .../xtensa/include/asm}/bitops.h              |  0
 .../xtensa/include/asm}/bootparam.h           |  0
 .../xtensa/include/asm}/bug.h                 |  0
 .../xtensa/include/asm}/bugs.h                |  0
 .../xtensa/include/asm}/byteorder.h           |  0
 .../xtensa/include/asm}/cache.h               |  2 +-
 .../xtensa/include/asm}/cacheasm.h            |  0
 .../xtensa/include/asm}/cacheflush.h          |  0
 .../xtensa/include/asm}/checksum.h            |  2 +-
 .../xtensa/include/asm}/coprocessor.h         |  4 +--
 .../xtensa/include/asm}/cpumask.h             |  0
 .../xtensa/include/asm}/cputime.h             |  0
 .../xtensa/include/asm}/current.h             |  0
 .../xtensa/include/asm}/delay.h               |  0
 .../xtensa/include/asm}/device.h              |  0
 .../xtensa/include/asm}/div64.h               |  0
 .../xtensa/include/asm}/dma-mapping.h         |  0
 .../xtensa/include/asm}/dma.h                 |  0
 .../xtensa/include/asm}/elf.h                 |  0
 .../xtensa/include/asm}/emergency-restart.h   |  0
 .../xtensa/include/asm}/errno.h               |  0
 .../xtensa/include/asm}/fb.h                  |  0
 .../xtensa/include/asm}/fcntl.h               |  0
 .../xtensa/include/asm}/futex.h               |  0
 .../xtensa/include/asm}/hardirq.h             |  0
 .../xtensa/include/asm}/highmem.h             |  0
 .../xtensa/include/asm}/hw_irq.h              |  0
 .../xtensa/include/asm}/io.h                  |  0
 .../xtensa/include/asm}/ioctl.h               |  0
 .../xtensa/include/asm}/ioctls.h              |  0
 .../xtensa/include/asm}/ipcbuf.h              |  0
 .../xtensa/include/asm}/irq.h                 |  4 +--
 .../xtensa/include/asm}/irq_regs.h            |  0
 .../xtensa/include/asm}/kdebug.h              |  0
 .../xtensa/include/asm}/kmap_types.h          |  0
 .../xtensa/include/asm}/linkage.h             |  0
 .../xtensa/include/asm}/local.h               |  0
 .../xtensa/include/asm}/mman.h                |  0
 .../xtensa/include/asm}/mmu.h                 |  0
 .../xtensa/include/asm}/mmu_context.h         |  0
 .../xtensa/include/asm}/module.h              |  0
 .../xtensa/include/asm}/msgbuf.h              |  0
 .../xtensa/include/asm}/mutex.h               |  0
 .../xtensa/include/asm}/page.h                |  0
 .../xtensa/include/asm}/param.h               |  0
 .../xtensa/include/asm}/pci-bridge.h          |  0
 .../xtensa/include/asm}/pci.h                 |  0
 .../xtensa/include/asm}/percpu.h              |  0
 .../xtensa/include/asm}/pgalloc.h             |  0
 .../xtensa/include/asm}/pgtable.h             |  0
 .../xtensa/include/asm}/platform.h            |  2 --
 .../xtensa/include/asm}/poll.h                |  0
 .../xtensa/include/asm}/posix_types.h         |  0
 .../xtensa/include/asm}/processor.h           |  2 +-
 .../xtensa/include/asm}/ptrace.h              |  2 +-
 .../xtensa/include/asm}/regs.h                |  0
 .../xtensa/include/asm}/resource.h            |  0
 .../xtensa/include/asm}/rmap.h                |  0
 .../xtensa/include/asm}/rwsem.h               |  0
 .../xtensa/include/asm}/scatterlist.h         |  0
 .../xtensa/include/asm}/sections.h            |  0
 .../xtensa/include/asm}/segment.h             |  0
 .../xtensa/include/asm}/sembuf.h              |  0
 .../xtensa/include/asm}/serial.h              |  2 +-
 .../xtensa/include/asm}/setup.h               |  0
 .../xtensa/include/asm}/shmbuf.h              |  0
 .../xtensa/include/asm}/shmparam.h            |  0
 .../xtensa/include/asm}/sigcontext.h          |  0
 .../xtensa/include/asm}/siginfo.h             |  0
 .../xtensa/include/asm}/signal.h              |  0
 .../xtensa/include/asm}/smp.h                 |  0
 .../xtensa/include/asm}/socket.h              |  0
 .../xtensa/include/asm}/sockios.h             |  0
 .../xtensa/include/asm}/spinlock.h            |  0
 .../xtensa/include/asm}/stat.h                |  0
 .../xtensa/include/asm}/statfs.h              |  0
 .../xtensa/include/asm}/string.h              |  0
 .../xtensa/include/asm}/syscall.h             |  0
 .../xtensa/include/asm}/system.h              |  0
 .../xtensa/include/asm}/termbits.h            |  0
 .../xtensa/include/asm}/termios.h             |  0
 .../xtensa/include/asm}/thread_info.h         |  0
 .../xtensa/include/asm}/timex.h               |  0
 .../xtensa/include/asm}/tlb.h                 |  0
 .../xtensa/include/asm}/tlbflush.h            |  0
 .../xtensa/include/asm}/topology.h            |  0
 .../xtensa/include/asm}/types.h               |  0
 .../xtensa/include/asm}/uaccess.h             |  0
 .../xtensa/include/asm}/ucontext.h            |  0
 .../xtensa/include/asm}/unaligned.h           |  0
 .../xtensa/include/asm}/unistd.h              |  0
 .../xtensa/include/asm}/user.h                |  0
 .../xtensa/include/asm}/vga.h                 |  0
 .../xtensa/include/asm}/xor.h                 |  0
 trunk/arch/xtensa/kernel/entry.S              |  2 +-
 trunk/arch/xtensa/kernel/vmlinux.lds.S        |  2 +-
 trunk/arch/xtensa/lib/checksum.S              |  2 +-
 trunk/arch/xtensa/lib/memcopy.S               |  2 +-
 trunk/arch/xtensa/lib/memset.S                |  2 +-
 trunk/arch/xtensa/lib/strncpy_user.S          |  2 +-
 trunk/arch/xtensa/lib/strnlen_user.S          |  2 +-
 trunk/arch/xtensa/lib/usercopy.S              |  2 +-
 trunk/arch/xtensa/platforms/iss/console.c     |  2 +-
 .../iss/include/platform}/hardware.h          |  0
 .../platforms/iss/include/platform}/simcall.h |  0
 trunk/arch/xtensa/platforms/iss/io.c          |  2 +-
 trunk/arch/xtensa/platforms/iss/network.c     |  2 +-
 .../variants/dc232b/include/variant}/core.h   |  0
 .../dc232b/include/variant}/tie-asm.h         |  0
 .../variants/dc232b/include/variant}/tie.h    |  0
 .../variants/fsf/include/variant}/core.h      |  0
 .../variants/fsf/include/variant}/tie-asm.h   |  0
 .../variants/fsf/include/variant}/tie.h       |  0
 121 files changed, 33 insertions(+), 45 deletions(-)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/Kbuild (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/asmmacro.h (98%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/atomic.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/auxvec.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/bitops.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/bootparam.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/bug.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/bugs.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/byteorder.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/cache.h (96%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/cacheasm.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/cacheflush.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/checksum.h (99%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/coprocessor.h (98%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/cpumask.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/cputime.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/current.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/delay.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/device.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/div64.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/dma-mapping.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/dma.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/elf.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/emergency-restart.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/errno.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/fb.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/fcntl.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/futex.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/hardirq.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/highmem.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/hw_irq.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/io.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/ioctl.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/ioctls.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/ipcbuf.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/irq.h (89%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/irq_regs.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/kdebug.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/kmap_types.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/linkage.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/local.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/mman.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/mmu.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/mmu_context.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/module.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/msgbuf.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/mutex.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/page.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/param.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/pci-bridge.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/pci.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/percpu.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/pgalloc.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/pgtable.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/platform.h (98%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/poll.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/posix_types.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/processor.h (99%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/ptrace.h (99%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/regs.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/resource.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/rmap.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/rwsem.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/scatterlist.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/sections.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/segment.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/sembuf.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/serial.h (92%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/setup.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/shmbuf.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/shmparam.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/sigcontext.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/siginfo.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/signal.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/smp.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/socket.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/sockios.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/spinlock.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/stat.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/statfs.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/string.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/syscall.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/system.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/termbits.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/termios.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/thread_info.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/timex.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/tlb.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/tlbflush.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/topology.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/types.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/uaccess.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/ucontext.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/unaligned.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/unistd.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/user.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/vga.h (100%)
 rename trunk/{include/asm-xtensa => arch/xtensa/include/asm}/xor.h (100%)
 rename trunk/{include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/hardware.h (100%)
 rename trunk/{include/asm-xtensa/platform-iss => arch/xtensa/platforms/iss/include/platform}/simcall.h (100%)
 rename trunk/{include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/core.h (100%)
 rename trunk/{include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie-asm.h (100%)
 rename trunk/{include/asm-xtensa/variant-dc232b => arch/xtensa/variants/dc232b/include/variant}/tie.h (100%)
 rename trunk/{include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/core.h (100%)
 rename trunk/{include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie-asm.h (100%)
 rename trunk/{include/asm-xtensa/variant-fsf => arch/xtensa/variants/fsf/include/variant}/tie.h (100%)

diff --git a/[refs] b/[refs]
index 0fa6a444acd3..cb607a765293 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 206ead28377fee86b129637edada8c77816cc0d6
+refs/heads/master: 367b8112fe2ea5c39a7bb4d263dcdd9b612fae18
diff --git a/trunk/arch/xtensa/Makefile b/trunk/arch/xtensa/Makefile
index 015b6b2a26b9..1da55fe4beff 100644
--- a/trunk/arch/xtensa/Makefile
+++ b/trunk/arch/xtensa/Makefile
@@ -33,6 +33,15 @@ KBUILD_CFLAGS += -ffreestanding
 
 KBUILD_CFLAGS += -pipe -mlongcalls
 
+vardirs := $(patsubst %,arch/xtensa/variants/%/,$(variant-y))
+plfdirs := $(patsubst %,arch/xtensa/platforms/%/,$(platform-y))
+
+ifeq ($(KBUILD_SRC),)
+KBUILD_CPPFLAGS += $(patsubst %,-I%include,$(vardirs) $(plfdirs))
+else
+KBUILD_CPPFLAGS += $(patsubst %,-I$(srctree)/%include,$(vardirs) $(plfdirs))
+endif
+
 KBUILD_DEFCONFIG := iss_defconfig
 
 # ramdisk/initrd support
@@ -66,21 +75,6 @@ libs-y		+= arch/xtensa/lib/ $(LIBGCC)
 
 boot		:= arch/xtensa/boot
 
-archinc		:= include/asm-xtensa
-
-archprepare: $(archinc)/.platform
-
-# Update processor variant and platform symlinks if something which affects
-# them changed.
-
-$(archinc)/.platform: $(wildcard include/config/arch/*.h) include/config/auto.conf
-	@echo '  SYMLINK $(archinc)/variant -> $(archinc)/variant-$(VARIANT)'
-	$(Q)mkdir -p $(archinc)
-	$(Q)ln -fsn $(srctree)/$(archinc)/variant-$(VARIANT) $(archinc)/variant
-	@echo '  SYMLINK $(archinc)/platform -> $(archinc)/platform-$(PLATFORM)'
-	$(Q)ln -fsn $(srctree)/$(archinc)/platform-$(PLATFORM) $(archinc)/platform
-	@touch $@
-
 
 all: zImage
 
@@ -89,10 +83,6 @@ bzImage : zImage
 zImage zImage.initrd: vmlinux
 	$(Q)$(MAKE) $(build)=$(boot) $@
 
-CLEAN_FILES	+= arch/xtensa/vmlinux.lds                      \
-		   $(archinc)/platform $(archinc)/variant	\
-		   $(archinc)/.platform
-
 define archhelp
   @echo '* zImage      - Compressed kernel image (arch/xtensa/boot/images/zImage.*)'
 endef
diff --git a/trunk/arch/xtensa/boot/boot-elf/boot.lds.S b/trunk/arch/xtensa/boot/boot-elf/boot.lds.S
index 849dfcafd518..4e53b74dc44b 100644
--- a/trunk/arch/xtensa/boot/boot-elf/boot.lds.S
+++ b/trunk/arch/xtensa/boot/boot-elf/boot.lds.S
@@ -1,4 +1,4 @@
-#include <asm/variant/core.h>
+#include <variant/core.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_ResetVector)
 
diff --git a/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S b/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S
index 84848123e2a8..5582e8cfac8f 100644
--- a/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S
+++ b/trunk/arch/xtensa/boot/boot-redboot/bootstrap.S
@@ -1,4 +1,4 @@
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <asm/regs.h>
 #include <asm/asmmacro.h>
 #include <asm/cacheasm.h>
diff --git a/trunk/include/asm-xtensa/Kbuild b/trunk/arch/xtensa/include/asm/Kbuild
similarity index 100%
rename from trunk/include/asm-xtensa/Kbuild
rename to trunk/arch/xtensa/include/asm/Kbuild
diff --git a/trunk/include/asm-xtensa/asmmacro.h b/trunk/arch/xtensa/include/asm/asmmacro.h
similarity index 98%
rename from trunk/include/asm-xtensa/asmmacro.h
rename to trunk/arch/xtensa/include/asm/asmmacro.h
index 76915cabad17..755320f6e0bc 100644
--- a/trunk/include/asm-xtensa/asmmacro.h
+++ b/trunk/arch/xtensa/include/asm/asmmacro.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_ASMMACRO_H
 #define _XTENSA_ASMMACRO_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * Some little helpers for loops. Use zero-overhead-loops
diff --git a/trunk/include/asm-xtensa/atomic.h b/trunk/arch/xtensa/include/asm/atomic.h
similarity index 100%
rename from trunk/include/asm-xtensa/atomic.h
rename to trunk/arch/xtensa/include/asm/atomic.h
diff --git a/trunk/include/asm-xtensa/auxvec.h b/trunk/arch/xtensa/include/asm/auxvec.h
similarity index 100%
rename from trunk/include/asm-xtensa/auxvec.h
rename to trunk/arch/xtensa/include/asm/auxvec.h
diff --git a/trunk/include/asm-xtensa/bitops.h b/trunk/arch/xtensa/include/asm/bitops.h
similarity index 100%
rename from trunk/include/asm-xtensa/bitops.h
rename to trunk/arch/xtensa/include/asm/bitops.h
diff --git a/trunk/include/asm-xtensa/bootparam.h b/trunk/arch/xtensa/include/asm/bootparam.h
similarity index 100%
rename from trunk/include/asm-xtensa/bootparam.h
rename to trunk/arch/xtensa/include/asm/bootparam.h
diff --git a/trunk/include/asm-xtensa/bug.h b/trunk/arch/xtensa/include/asm/bug.h
similarity index 100%
rename from trunk/include/asm-xtensa/bug.h
rename to trunk/arch/xtensa/include/asm/bug.h
diff --git a/trunk/include/asm-xtensa/bugs.h b/trunk/arch/xtensa/include/asm/bugs.h
similarity index 100%
rename from trunk/include/asm-xtensa/bugs.h
rename to trunk/arch/xtensa/include/asm/bugs.h
diff --git a/trunk/include/asm-xtensa/byteorder.h b/trunk/arch/xtensa/include/asm/byteorder.h
similarity index 100%
rename from trunk/include/asm-xtensa/byteorder.h
rename to trunk/arch/xtensa/include/asm/byteorder.h
diff --git a/trunk/include/asm-xtensa/cache.h b/trunk/arch/xtensa/include/asm/cache.h
similarity index 96%
rename from trunk/include/asm-xtensa/cache.h
rename to trunk/arch/xtensa/include/asm/cache.h
index 3bba2a540cf0..f04c9891142f 100644
--- a/trunk/include/asm-xtensa/cache.h
+++ b/trunk/arch/xtensa/include/asm/cache.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_CACHE_H
 #define _XTENSA_CACHE_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 #define L1_CACHE_SHIFT	XCHAL_DCACHE_LINEWIDTH
 #define L1_CACHE_BYTES	XCHAL_DCACHE_LINESIZE
diff --git a/trunk/include/asm-xtensa/cacheasm.h b/trunk/arch/xtensa/include/asm/cacheasm.h
similarity index 100%
rename from trunk/include/asm-xtensa/cacheasm.h
rename to trunk/arch/xtensa/include/asm/cacheasm.h
diff --git a/trunk/include/asm-xtensa/cacheflush.h b/trunk/arch/xtensa/include/asm/cacheflush.h
similarity index 100%
rename from trunk/include/asm-xtensa/cacheflush.h
rename to trunk/arch/xtensa/include/asm/cacheflush.h
diff --git a/trunk/include/asm-xtensa/checksum.h b/trunk/arch/xtensa/include/asm/checksum.h
similarity index 99%
rename from trunk/include/asm-xtensa/checksum.h
rename to trunk/arch/xtensa/include/asm/checksum.h
index 23534c60b3a4..f84d3f00774a 100644
--- a/trunk/include/asm-xtensa/checksum.h
+++ b/trunk/arch/xtensa/include/asm/checksum.h
@@ -12,7 +12,7 @@
 #define _XTENSA_CHECKSUM_H
 
 #include <linux/in6.h>
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * computes the checksum of a memory block at buff, length len,
diff --git a/trunk/include/asm-xtensa/coprocessor.h b/trunk/arch/xtensa/include/asm/coprocessor.h
similarity index 98%
rename from trunk/include/asm-xtensa/coprocessor.h
rename to trunk/arch/xtensa/include/asm/coprocessor.h
index 1cbcf9001a41..65a285d8d3fb 100644
--- a/trunk/include/asm-xtensa/coprocessor.h
+++ b/trunk/arch/xtensa/include/asm/coprocessor.h
@@ -13,11 +13,11 @@
 #define _XTENSA_COPROCESSOR_H
 
 #include <linux/stringify.h>
-#include <asm/variant/tie.h>
+#include <variant/tie.h>
 #include <asm/types.h>
 
 #ifdef __ASSEMBLY__
-# include <asm/variant/tie-asm.h>
+# include <variant/tie-asm.h>
 
 .macro	xchal_sa_start  a b
 	.set .Lxchal_pofs_, 0
diff --git a/trunk/include/asm-xtensa/cpumask.h b/trunk/arch/xtensa/include/asm/cpumask.h
similarity index 100%
rename from trunk/include/asm-xtensa/cpumask.h
rename to trunk/arch/xtensa/include/asm/cpumask.h
diff --git a/trunk/include/asm-xtensa/cputime.h b/trunk/arch/xtensa/include/asm/cputime.h
similarity index 100%
rename from trunk/include/asm-xtensa/cputime.h
rename to trunk/arch/xtensa/include/asm/cputime.h
diff --git a/trunk/include/asm-xtensa/current.h b/trunk/arch/xtensa/include/asm/current.h
similarity index 100%
rename from trunk/include/asm-xtensa/current.h
rename to trunk/arch/xtensa/include/asm/current.h
diff --git a/trunk/include/asm-xtensa/delay.h b/trunk/arch/xtensa/include/asm/delay.h
similarity index 100%
rename from trunk/include/asm-xtensa/delay.h
rename to trunk/arch/xtensa/include/asm/delay.h
diff --git a/trunk/include/asm-xtensa/device.h b/trunk/arch/xtensa/include/asm/device.h
similarity index 100%
rename from trunk/include/asm-xtensa/device.h
rename to trunk/arch/xtensa/include/asm/device.h
diff --git a/trunk/include/asm-xtensa/div64.h b/trunk/arch/xtensa/include/asm/div64.h
similarity index 100%
rename from trunk/include/asm-xtensa/div64.h
rename to trunk/arch/xtensa/include/asm/div64.h
diff --git a/trunk/include/asm-xtensa/dma-mapping.h b/trunk/arch/xtensa/include/asm/dma-mapping.h
similarity index 100%
rename from trunk/include/asm-xtensa/dma-mapping.h
rename to trunk/arch/xtensa/include/asm/dma-mapping.h
diff --git a/trunk/include/asm-xtensa/dma.h b/trunk/arch/xtensa/include/asm/dma.h
similarity index 100%
rename from trunk/include/asm-xtensa/dma.h
rename to trunk/arch/xtensa/include/asm/dma.h
diff --git a/trunk/include/asm-xtensa/elf.h b/trunk/arch/xtensa/include/asm/elf.h
similarity index 100%
rename from trunk/include/asm-xtensa/elf.h
rename to trunk/arch/xtensa/include/asm/elf.h
diff --git a/trunk/include/asm-xtensa/emergency-restart.h b/trunk/arch/xtensa/include/asm/emergency-restart.h
similarity index 100%
rename from trunk/include/asm-xtensa/emergency-restart.h
rename to trunk/arch/xtensa/include/asm/emergency-restart.h
diff --git a/trunk/include/asm-xtensa/errno.h b/trunk/arch/xtensa/include/asm/errno.h
similarity index 100%
rename from trunk/include/asm-xtensa/errno.h
rename to trunk/arch/xtensa/include/asm/errno.h
diff --git a/trunk/include/asm-xtensa/fb.h b/trunk/arch/xtensa/include/asm/fb.h
similarity index 100%
rename from trunk/include/asm-xtensa/fb.h
rename to trunk/arch/xtensa/include/asm/fb.h
diff --git a/trunk/include/asm-xtensa/fcntl.h b/trunk/arch/xtensa/include/asm/fcntl.h
similarity index 100%
rename from trunk/include/asm-xtensa/fcntl.h
rename to trunk/arch/xtensa/include/asm/fcntl.h
diff --git a/trunk/include/asm-xtensa/futex.h b/trunk/arch/xtensa/include/asm/futex.h
similarity index 100%
rename from trunk/include/asm-xtensa/futex.h
rename to trunk/arch/xtensa/include/asm/futex.h
diff --git a/trunk/include/asm-xtensa/hardirq.h b/trunk/arch/xtensa/include/asm/hardirq.h
similarity index 100%
rename from trunk/include/asm-xtensa/hardirq.h
rename to trunk/arch/xtensa/include/asm/hardirq.h
diff --git a/trunk/include/asm-xtensa/highmem.h b/trunk/arch/xtensa/include/asm/highmem.h
similarity index 100%
rename from trunk/include/asm-xtensa/highmem.h
rename to trunk/arch/xtensa/include/asm/highmem.h
diff --git a/trunk/include/asm-xtensa/hw_irq.h b/trunk/arch/xtensa/include/asm/hw_irq.h
similarity index 100%
rename from trunk/include/asm-xtensa/hw_irq.h
rename to trunk/arch/xtensa/include/asm/hw_irq.h
diff --git a/trunk/include/asm-xtensa/io.h b/trunk/arch/xtensa/include/asm/io.h
similarity index 100%
rename from trunk/include/asm-xtensa/io.h
rename to trunk/arch/xtensa/include/asm/io.h
diff --git a/trunk/include/asm-xtensa/ioctl.h b/trunk/arch/xtensa/include/asm/ioctl.h
similarity index 100%
rename from trunk/include/asm-xtensa/ioctl.h
rename to trunk/arch/xtensa/include/asm/ioctl.h
diff --git a/trunk/include/asm-xtensa/ioctls.h b/trunk/arch/xtensa/include/asm/ioctls.h
similarity index 100%
rename from trunk/include/asm-xtensa/ioctls.h
rename to trunk/arch/xtensa/include/asm/ioctls.h
diff --git a/trunk/include/asm-xtensa/ipcbuf.h b/trunk/arch/xtensa/include/asm/ipcbuf.h
similarity index 100%
rename from trunk/include/asm-xtensa/ipcbuf.h
rename to trunk/arch/xtensa/include/asm/ipcbuf.h
diff --git a/trunk/include/asm-xtensa/irq.h b/trunk/arch/xtensa/include/asm/irq.h
similarity index 89%
rename from trunk/include/asm-xtensa/irq.h
rename to trunk/arch/xtensa/include/asm/irq.h
index fc73b7f11aff..1620d1e0e695 100644
--- a/trunk/include/asm-xtensa/irq.h
+++ b/trunk/arch/xtensa/include/asm/irq.h
@@ -11,8 +11,8 @@
 #ifndef _XTENSA_IRQ_H
 #define _XTENSA_IRQ_H
 
-#include <asm/platform/hardware.h>
-#include <asm/variant/core.h>
+#include <platform/hardware.h>
+#include <variant/core.h>
 
 #ifndef PLATFORM_NR_IRQS
 # define PLATFORM_NR_IRQS 0
diff --git a/trunk/include/asm-xtensa/irq_regs.h b/trunk/arch/xtensa/include/asm/irq_regs.h
similarity index 100%
rename from trunk/include/asm-xtensa/irq_regs.h
rename to trunk/arch/xtensa/include/asm/irq_regs.h
diff --git a/trunk/include/asm-xtensa/kdebug.h b/trunk/arch/xtensa/include/asm/kdebug.h
similarity index 100%
rename from trunk/include/asm-xtensa/kdebug.h
rename to trunk/arch/xtensa/include/asm/kdebug.h
diff --git a/trunk/include/asm-xtensa/kmap_types.h b/trunk/arch/xtensa/include/asm/kmap_types.h
similarity index 100%
rename from trunk/include/asm-xtensa/kmap_types.h
rename to trunk/arch/xtensa/include/asm/kmap_types.h
diff --git a/trunk/include/asm-xtensa/linkage.h b/trunk/arch/xtensa/include/asm/linkage.h
similarity index 100%
rename from trunk/include/asm-xtensa/linkage.h
rename to trunk/arch/xtensa/include/asm/linkage.h
diff --git a/trunk/include/asm-xtensa/local.h b/trunk/arch/xtensa/include/asm/local.h
similarity index 100%
rename from trunk/include/asm-xtensa/local.h
rename to trunk/arch/xtensa/include/asm/local.h
diff --git a/trunk/include/asm-xtensa/mman.h b/trunk/arch/xtensa/include/asm/mman.h
similarity index 100%
rename from trunk/include/asm-xtensa/mman.h
rename to trunk/arch/xtensa/include/asm/mman.h
diff --git a/trunk/include/asm-xtensa/mmu.h b/trunk/arch/xtensa/include/asm/mmu.h
similarity index 100%
rename from trunk/include/asm-xtensa/mmu.h
rename to trunk/arch/xtensa/include/asm/mmu.h
diff --git a/trunk/include/asm-xtensa/mmu_context.h b/trunk/arch/xtensa/include/asm/mmu_context.h
similarity index 100%
rename from trunk/include/asm-xtensa/mmu_context.h
rename to trunk/arch/xtensa/include/asm/mmu_context.h
diff --git a/trunk/include/asm-xtensa/module.h b/trunk/arch/xtensa/include/asm/module.h
similarity index 100%
rename from trunk/include/asm-xtensa/module.h
rename to trunk/arch/xtensa/include/asm/module.h
diff --git a/trunk/include/asm-xtensa/msgbuf.h b/trunk/arch/xtensa/include/asm/msgbuf.h
similarity index 100%
rename from trunk/include/asm-xtensa/msgbuf.h
rename to trunk/arch/xtensa/include/asm/msgbuf.h
diff --git a/trunk/include/asm-xtensa/mutex.h b/trunk/arch/xtensa/include/asm/mutex.h
similarity index 100%
rename from trunk/include/asm-xtensa/mutex.h
rename to trunk/arch/xtensa/include/asm/mutex.h
diff --git a/trunk/include/asm-xtensa/page.h b/trunk/arch/xtensa/include/asm/page.h
similarity index 100%
rename from trunk/include/asm-xtensa/page.h
rename to trunk/arch/xtensa/include/asm/page.h
diff --git a/trunk/include/asm-xtensa/param.h b/trunk/arch/xtensa/include/asm/param.h
similarity index 100%
rename from trunk/include/asm-xtensa/param.h
rename to trunk/arch/xtensa/include/asm/param.h
diff --git a/trunk/include/asm-xtensa/pci-bridge.h b/trunk/arch/xtensa/include/asm/pci-bridge.h
similarity index 100%
rename from trunk/include/asm-xtensa/pci-bridge.h
rename to trunk/arch/xtensa/include/asm/pci-bridge.h
diff --git a/trunk/include/asm-xtensa/pci.h b/trunk/arch/xtensa/include/asm/pci.h
similarity index 100%
rename from trunk/include/asm-xtensa/pci.h
rename to trunk/arch/xtensa/include/asm/pci.h
diff --git a/trunk/include/asm-xtensa/percpu.h b/trunk/arch/xtensa/include/asm/percpu.h
similarity index 100%
rename from trunk/include/asm-xtensa/percpu.h
rename to trunk/arch/xtensa/include/asm/percpu.h
diff --git a/trunk/include/asm-xtensa/pgalloc.h b/trunk/arch/xtensa/include/asm/pgalloc.h
similarity index 100%
rename from trunk/include/asm-xtensa/pgalloc.h
rename to trunk/arch/xtensa/include/asm/pgalloc.h
diff --git a/trunk/include/asm-xtensa/pgtable.h b/trunk/arch/xtensa/include/asm/pgtable.h
similarity index 100%
rename from trunk/include/asm-xtensa/pgtable.h
rename to trunk/arch/xtensa/include/asm/pgtable.h
diff --git a/trunk/include/asm-xtensa/platform.h b/trunk/arch/xtensa/include/asm/platform.h
similarity index 98%
rename from trunk/include/asm-xtensa/platform.h
rename to trunk/arch/xtensa/include/asm/platform.h
index 48135a9718b0..e3d5a48ad495 100644
--- a/trunk/include/asm-xtensa/platform.h
+++ b/trunk/arch/xtensa/include/asm/platform.h
@@ -1,6 +1,4 @@
 /*
- * include/asm-xtensa/platform.h
- *
  * Platform specific functions
  *
  * This file is subject to the terms and conditions of the GNU General
diff --git a/trunk/include/asm-xtensa/poll.h b/trunk/arch/xtensa/include/asm/poll.h
similarity index 100%
rename from trunk/include/asm-xtensa/poll.h
rename to trunk/arch/xtensa/include/asm/poll.h
diff --git a/trunk/include/asm-xtensa/posix_types.h b/trunk/arch/xtensa/include/asm/posix_types.h
similarity index 100%
rename from trunk/include/asm-xtensa/posix_types.h
rename to trunk/arch/xtensa/include/asm/posix_types.h
diff --git a/trunk/include/asm-xtensa/processor.h b/trunk/arch/xtensa/include/asm/processor.h
similarity index 99%
rename from trunk/include/asm-xtensa/processor.h
rename to trunk/arch/xtensa/include/asm/processor.h
index 4918a4e96d42..07387d3b99f4 100644
--- a/trunk/include/asm-xtensa/processor.h
+++ b/trunk/arch/xtensa/include/asm/processor.h
@@ -11,7 +11,7 @@
 #ifndef _XTENSA_PROCESSOR_H
 #define _XTENSA_PROCESSOR_H
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <asm/coprocessor.h>
 
 #include <linux/compiler.h>
diff --git a/trunk/include/asm-xtensa/ptrace.h b/trunk/arch/xtensa/include/asm/ptrace.h
similarity index 99%
rename from trunk/include/asm-xtensa/ptrace.h
rename to trunk/arch/xtensa/include/asm/ptrace.h
index 089b0db44816..905e1e619654 100644
--- a/trunk/include/asm-xtensa/ptrace.h
+++ b/trunk/arch/xtensa/include/asm/ptrace.h
@@ -111,7 +111,7 @@ struct pt_regs {
 	unsigned long areg[16];		/* 128 (64) */
 };
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 # define task_pt_regs(tsk) ((struct pt_regs*) \
   (task_stack_page(tsk) + KERNEL_STACK_SIZE - (XCHAL_NUM_AREGS-16)*4) - 1)
diff --git a/trunk/include/asm-xtensa/regs.h b/trunk/arch/xtensa/include/asm/regs.h
similarity index 100%
rename from trunk/include/asm-xtensa/regs.h
rename to trunk/arch/xtensa/include/asm/regs.h
diff --git a/trunk/include/asm-xtensa/resource.h b/trunk/arch/xtensa/include/asm/resource.h
similarity index 100%
rename from trunk/include/asm-xtensa/resource.h
rename to trunk/arch/xtensa/include/asm/resource.h
diff --git a/trunk/include/asm-xtensa/rmap.h b/trunk/arch/xtensa/include/asm/rmap.h
similarity index 100%
rename from trunk/include/asm-xtensa/rmap.h
rename to trunk/arch/xtensa/include/asm/rmap.h
diff --git a/trunk/include/asm-xtensa/rwsem.h b/trunk/arch/xtensa/include/asm/rwsem.h
similarity index 100%
rename from trunk/include/asm-xtensa/rwsem.h
rename to trunk/arch/xtensa/include/asm/rwsem.h
diff --git a/trunk/include/asm-xtensa/scatterlist.h b/trunk/arch/xtensa/include/asm/scatterlist.h
similarity index 100%
rename from trunk/include/asm-xtensa/scatterlist.h
rename to trunk/arch/xtensa/include/asm/scatterlist.h
diff --git a/trunk/include/asm-xtensa/sections.h b/trunk/arch/xtensa/include/asm/sections.h
similarity index 100%
rename from trunk/include/asm-xtensa/sections.h
rename to trunk/arch/xtensa/include/asm/sections.h
diff --git a/trunk/include/asm-xtensa/segment.h b/trunk/arch/xtensa/include/asm/segment.h
similarity index 100%
rename from trunk/include/asm-xtensa/segment.h
rename to trunk/arch/xtensa/include/asm/segment.h
diff --git a/trunk/include/asm-xtensa/sembuf.h b/trunk/arch/xtensa/include/asm/sembuf.h
similarity index 100%
rename from trunk/include/asm-xtensa/sembuf.h
rename to trunk/arch/xtensa/include/asm/sembuf.h
diff --git a/trunk/include/asm-xtensa/serial.h b/trunk/arch/xtensa/include/asm/serial.h
similarity index 92%
rename from trunk/include/asm-xtensa/serial.h
rename to trunk/arch/xtensa/include/asm/serial.h
index ec04114fcf0b..a8a2493260f6 100644
--- a/trunk/include/asm-xtensa/serial.h
+++ b/trunk/arch/xtensa/include/asm/serial.h
@@ -13,6 +13,6 @@
 #ifndef _XTENSA_SERIAL_H
 #define _XTENSA_SERIAL_H
 
-#include <asm/platform/serial.h>
+#include <platform/serial.h>
 
 #endif	/* _XTENSA_SERIAL_H */
diff --git a/trunk/include/asm-xtensa/setup.h b/trunk/arch/xtensa/include/asm/setup.h
similarity index 100%
rename from trunk/include/asm-xtensa/setup.h
rename to trunk/arch/xtensa/include/asm/setup.h
diff --git a/trunk/include/asm-xtensa/shmbuf.h b/trunk/arch/xtensa/include/asm/shmbuf.h
similarity index 100%
rename from trunk/include/asm-xtensa/shmbuf.h
rename to trunk/arch/xtensa/include/asm/shmbuf.h
diff --git a/trunk/include/asm-xtensa/shmparam.h b/trunk/arch/xtensa/include/asm/shmparam.h
similarity index 100%
rename from trunk/include/asm-xtensa/shmparam.h
rename to trunk/arch/xtensa/include/asm/shmparam.h
diff --git a/trunk/include/asm-xtensa/sigcontext.h b/trunk/arch/xtensa/include/asm/sigcontext.h
similarity index 100%
rename from trunk/include/asm-xtensa/sigcontext.h
rename to trunk/arch/xtensa/include/asm/sigcontext.h
diff --git a/trunk/include/asm-xtensa/siginfo.h b/trunk/arch/xtensa/include/asm/siginfo.h
similarity index 100%
rename from trunk/include/asm-xtensa/siginfo.h
rename to trunk/arch/xtensa/include/asm/siginfo.h
diff --git a/trunk/include/asm-xtensa/signal.h b/trunk/arch/xtensa/include/asm/signal.h
similarity index 100%
rename from trunk/include/asm-xtensa/signal.h
rename to trunk/arch/xtensa/include/asm/signal.h
diff --git a/trunk/include/asm-xtensa/smp.h b/trunk/arch/xtensa/include/asm/smp.h
similarity index 100%
rename from trunk/include/asm-xtensa/smp.h
rename to trunk/arch/xtensa/include/asm/smp.h
diff --git a/trunk/include/asm-xtensa/socket.h b/trunk/arch/xtensa/include/asm/socket.h
similarity index 100%
rename from trunk/include/asm-xtensa/socket.h
rename to trunk/arch/xtensa/include/asm/socket.h
diff --git a/trunk/include/asm-xtensa/sockios.h b/trunk/arch/xtensa/include/asm/sockios.h
similarity index 100%
rename from trunk/include/asm-xtensa/sockios.h
rename to trunk/arch/xtensa/include/asm/sockios.h
diff --git a/trunk/include/asm-xtensa/spinlock.h b/trunk/arch/xtensa/include/asm/spinlock.h
similarity index 100%
rename from trunk/include/asm-xtensa/spinlock.h
rename to trunk/arch/xtensa/include/asm/spinlock.h
diff --git a/trunk/include/asm-xtensa/stat.h b/trunk/arch/xtensa/include/asm/stat.h
similarity index 100%
rename from trunk/include/asm-xtensa/stat.h
rename to trunk/arch/xtensa/include/asm/stat.h
diff --git a/trunk/include/asm-xtensa/statfs.h b/trunk/arch/xtensa/include/asm/statfs.h
similarity index 100%
rename from trunk/include/asm-xtensa/statfs.h
rename to trunk/arch/xtensa/include/asm/statfs.h
diff --git a/trunk/include/asm-xtensa/string.h b/trunk/arch/xtensa/include/asm/string.h
similarity index 100%
rename from trunk/include/asm-xtensa/string.h
rename to trunk/arch/xtensa/include/asm/string.h
diff --git a/trunk/include/asm-xtensa/syscall.h b/trunk/arch/xtensa/include/asm/syscall.h
similarity index 100%
rename from trunk/include/asm-xtensa/syscall.h
rename to trunk/arch/xtensa/include/asm/syscall.h
diff --git a/trunk/include/asm-xtensa/system.h b/trunk/arch/xtensa/include/asm/system.h
similarity index 100%
rename from trunk/include/asm-xtensa/system.h
rename to trunk/arch/xtensa/include/asm/system.h
diff --git a/trunk/include/asm-xtensa/termbits.h b/trunk/arch/xtensa/include/asm/termbits.h
similarity index 100%
rename from trunk/include/asm-xtensa/termbits.h
rename to trunk/arch/xtensa/include/asm/termbits.h
diff --git a/trunk/include/asm-xtensa/termios.h b/trunk/arch/xtensa/include/asm/termios.h
similarity index 100%
rename from trunk/include/asm-xtensa/termios.h
rename to trunk/arch/xtensa/include/asm/termios.h
diff --git a/trunk/include/asm-xtensa/thread_info.h b/trunk/arch/xtensa/include/asm/thread_info.h
similarity index 100%
rename from trunk/include/asm-xtensa/thread_info.h
rename to trunk/arch/xtensa/include/asm/thread_info.h
diff --git a/trunk/include/asm-xtensa/timex.h b/trunk/arch/xtensa/include/asm/timex.h
similarity index 100%
rename from trunk/include/asm-xtensa/timex.h
rename to trunk/arch/xtensa/include/asm/timex.h
diff --git a/trunk/include/asm-xtensa/tlb.h b/trunk/arch/xtensa/include/asm/tlb.h
similarity index 100%
rename from trunk/include/asm-xtensa/tlb.h
rename to trunk/arch/xtensa/include/asm/tlb.h
diff --git a/trunk/include/asm-xtensa/tlbflush.h b/trunk/arch/xtensa/include/asm/tlbflush.h
similarity index 100%
rename from trunk/include/asm-xtensa/tlbflush.h
rename to trunk/arch/xtensa/include/asm/tlbflush.h
diff --git a/trunk/include/asm-xtensa/topology.h b/trunk/arch/xtensa/include/asm/topology.h
similarity index 100%
rename from trunk/include/asm-xtensa/topology.h
rename to trunk/arch/xtensa/include/asm/topology.h
diff --git a/trunk/include/asm-xtensa/types.h b/trunk/arch/xtensa/include/asm/types.h
similarity index 100%
rename from trunk/include/asm-xtensa/types.h
rename to trunk/arch/xtensa/include/asm/types.h
diff --git a/trunk/include/asm-xtensa/uaccess.h b/trunk/arch/xtensa/include/asm/uaccess.h
similarity index 100%
rename from trunk/include/asm-xtensa/uaccess.h
rename to trunk/arch/xtensa/include/asm/uaccess.h
diff --git a/trunk/include/asm-xtensa/ucontext.h b/trunk/arch/xtensa/include/asm/ucontext.h
similarity index 100%
rename from trunk/include/asm-xtensa/ucontext.h
rename to trunk/arch/xtensa/include/asm/ucontext.h
diff --git a/trunk/include/asm-xtensa/unaligned.h b/trunk/arch/xtensa/include/asm/unaligned.h
similarity index 100%
rename from trunk/include/asm-xtensa/unaligned.h
rename to trunk/arch/xtensa/include/asm/unaligned.h
diff --git a/trunk/include/asm-xtensa/unistd.h b/trunk/arch/xtensa/include/asm/unistd.h
similarity index 100%
rename from trunk/include/asm-xtensa/unistd.h
rename to trunk/arch/xtensa/include/asm/unistd.h
diff --git a/trunk/include/asm-xtensa/user.h b/trunk/arch/xtensa/include/asm/user.h
similarity index 100%
rename from trunk/include/asm-xtensa/user.h
rename to trunk/arch/xtensa/include/asm/user.h
diff --git a/trunk/include/asm-xtensa/vga.h b/trunk/arch/xtensa/include/asm/vga.h
similarity index 100%
rename from trunk/include/asm-xtensa/vga.h
rename to trunk/arch/xtensa/include/asm/vga.h
diff --git a/trunk/include/asm-xtensa/xor.h b/trunk/arch/xtensa/include/asm/xor.h
similarity index 100%
rename from trunk/include/asm-xtensa/xor.h
rename to trunk/arch/xtensa/include/asm/xor.h
diff --git a/trunk/arch/xtensa/kernel/entry.S b/trunk/arch/xtensa/kernel/entry.S
index dfd35dcc1cb5..a51d36a27389 100644
--- a/trunk/arch/xtensa/kernel/entry.S
+++ b/trunk/arch/xtensa/kernel/entry.S
@@ -25,7 +25,7 @@
 #include <asm/page.h>
 #include <asm/signal.h>
 #include <asm/tlbflush.h>
-#include <asm/variant/tie-asm.h>
+#include <variant/tie-asm.h>
 
 /* Unimplemented features. */
 
diff --git a/trunk/arch/xtensa/kernel/vmlinux.lds.S b/trunk/arch/xtensa/kernel/vmlinux.lds.S
index 51f4fb6f16f9..d506774f4b05 100644
--- a/trunk/arch/xtensa/kernel/vmlinux.lds.S
+++ b/trunk/arch/xtensa/kernel/vmlinux.lds.S
@@ -16,7 +16,7 @@
 
 #include <asm-generic/vmlinux.lds.h>
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 OUTPUT_ARCH(xtensa)
 ENTRY(_start)
 
diff --git a/trunk/arch/xtensa/lib/checksum.S b/trunk/arch/xtensa/lib/checksum.S
index 9d9cd990afa6..df397f932d0e 100644
--- a/trunk/arch/xtensa/lib/checksum.S
+++ b/trunk/arch/xtensa/lib/checksum.S
@@ -16,7 +16,7 @@
 
 #include <asm/errno.h>
 #include <linux/linkage.h>
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * computes a partial checksum, e.g. for TCP/UDP fragments
diff --git a/trunk/arch/xtensa/lib/memcopy.S b/trunk/arch/xtensa/lib/memcopy.S
index ddda8f4bc862..ea59dcd03866 100644
--- a/trunk/arch/xtensa/lib/memcopy.S
+++ b/trunk/arch/xtensa/lib/memcopy.S
@@ -9,7 +9,7 @@
  * Copyright (C) 2002 - 2005 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 	.macro	src_b	r, w0, w1
 #ifdef __XTENSA_EB__
diff --git a/trunk/arch/xtensa/lib/memset.S b/trunk/arch/xtensa/lib/memset.S
index 56a17495b2db..10b8c400f175 100644
--- a/trunk/arch/xtensa/lib/memset.S
+++ b/trunk/arch/xtensa/lib/memset.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /*
  * void *memset(void *dst, int c, size_t length)
diff --git a/trunk/arch/xtensa/lib/strncpy_user.S b/trunk/arch/xtensa/lib/strncpy_user.S
index b2655d94558d..9f603cdaaa68 100644
--- a/trunk/arch/xtensa/lib/strncpy_user.S
+++ b/trunk/arch/xtensa/lib/strncpy_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 #include <linux/errno.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */
diff --git a/trunk/arch/xtensa/lib/strnlen_user.S b/trunk/arch/xtensa/lib/strnlen_user.S
index ad3f616322ca..23f2a89816a1 100644
--- a/trunk/arch/xtensa/lib/strnlen_user.S
+++ b/trunk/arch/xtensa/lib/strnlen_user.S
@@ -11,7 +11,7 @@
  *  Copyright (C) 2002 Tensilica Inc.
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 /* Load or store instructions that may cause exceptions use the EX macro. */
 
diff --git a/trunk/arch/xtensa/lib/usercopy.S b/trunk/arch/xtensa/lib/usercopy.S
index a8ab1d4fe0ae..46d60314bb16 100644
--- a/trunk/arch/xtensa/lib/usercopy.S
+++ b/trunk/arch/xtensa/lib/usercopy.S
@@ -53,7 +53,7 @@
  *	a11/ original length
  */
 
-#include <asm/variant/core.h>
+#include <variant/core.h>
 
 #ifdef __XTENSA_EB__
 #define ALIGN(R, W0, W1) src	R, W0, W1
diff --git a/trunk/arch/xtensa/platforms/iss/console.c b/trunk/arch/xtensa/platforms/iss/console.c
index 9141e3690731..c5e5cf9acbe6 100644
--- a/trunk/arch/xtensa/platforms/iss/console.c
+++ b/trunk/arch/xtensa/platforms/iss/console.c
@@ -24,7 +24,7 @@
 #include <asm/uaccess.h>
 #include <asm/irq.h>
 
-#include <asm/platform/simcall.h>
+#include <platform/platform-iss/simcall.h>
 
 #include <linux/tty.h>
 #include <linux/tty_flip.h>
diff --git a/trunk/include/asm-xtensa/platform-iss/hardware.h b/trunk/arch/xtensa/platforms/iss/include/platform/hardware.h
similarity index 100%
rename from trunk/include/asm-xtensa/platform-iss/hardware.h
rename to trunk/arch/xtensa/platforms/iss/include/platform/hardware.h
diff --git a/trunk/include/asm-xtensa/platform-iss/simcall.h b/trunk/arch/xtensa/platforms/iss/include/platform/simcall.h
similarity index 100%
rename from trunk/include/asm-xtensa/platform-iss/simcall.h
rename to trunk/arch/xtensa/platforms/iss/include/platform/simcall.h
diff --git a/trunk/arch/xtensa/platforms/iss/io.c b/trunk/arch/xtensa/platforms/iss/io.c
index 5b161a5cb65f..571d0b24f895 100644
--- a/trunk/arch/xtensa/platforms/iss/io.c
+++ b/trunk/arch/xtensa/platforms/iss/io.c
@@ -3,7 +3,7 @@
 #if 0
 
 #include <asm/io.h>
-#include <xtensa/simcall.h>
+#include <platform/platform-iss/simcall.h>
 
 extern int __simc ();
 
diff --git a/trunk/arch/xtensa/platforms/iss/network.c b/trunk/arch/xtensa/platforms/iss/network.c
index 11a20adc1409..79bab341e7b0 100644
--- a/trunk/arch/xtensa/platforms/iss/network.c
+++ b/trunk/arch/xtensa/platforms/iss/network.c
@@ -33,7 +33,7 @@
 #include <linux/rtnetlink.h>
 #include <linux/platform_device.h>
 
-#include <asm/platform/simcall.h>
+#include <platform/platform-iss/simcall.h>
 
 #define DRIVER_NAME "iss-netdev"
 #define ETH_MAX_PACKET 1500
diff --git a/trunk/include/asm-xtensa/variant-dc232b/core.h b/trunk/arch/xtensa/variants/dc232b/include/variant/core.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-dc232b/core.h
rename to trunk/arch/xtensa/variants/dc232b/include/variant/core.h
diff --git a/trunk/include/asm-xtensa/variant-dc232b/tie-asm.h b/trunk/arch/xtensa/variants/dc232b/include/variant/tie-asm.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-dc232b/tie-asm.h
rename to trunk/arch/xtensa/variants/dc232b/include/variant/tie-asm.h
diff --git a/trunk/include/asm-xtensa/variant-dc232b/tie.h b/trunk/arch/xtensa/variants/dc232b/include/variant/tie.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-dc232b/tie.h
rename to trunk/arch/xtensa/variants/dc232b/include/variant/tie.h
diff --git a/trunk/include/asm-xtensa/variant-fsf/core.h b/trunk/arch/xtensa/variants/fsf/include/variant/core.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-fsf/core.h
rename to trunk/arch/xtensa/variants/fsf/include/variant/core.h
diff --git a/trunk/include/asm-xtensa/variant-fsf/tie-asm.h b/trunk/arch/xtensa/variants/fsf/include/variant/tie-asm.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-fsf/tie-asm.h
rename to trunk/arch/xtensa/variants/fsf/include/variant/tie-asm.h
diff --git a/trunk/include/asm-xtensa/variant-fsf/tie.h b/trunk/arch/xtensa/variants/fsf/include/variant/tie.h
similarity index 100%
rename from trunk/include/asm-xtensa/variant-fsf/tie.h
rename to trunk/arch/xtensa/variants/fsf/include/variant/tie.h