12 files changed, 432 insertions, 146 deletions

diff --git a/arch/xtensa/kernel/Makefile b/arch/xtensa/kernel/Makefile
index 71f733c4f66d..f582d6a24ec2 100644
--- a/arch/xtensa/kernel/Makefile
+++ b/arch/xtensa/kernel/Makefile
@@ -7,7 +7,7 @@ extra-y := head.o vmlinux.lds
 
 obj-y := align.o entry.o irq.o coprocessor.o process.o ptrace.o semaphore.o  \
          setup.o signal.o syscall.o time.o traps.o vectors.o platform.o  \
-         pci-dma.o
+         pci-dma.o init_task.o io.o
 
 ## windowspill.o
 
diff --git a/arch/xtensa/kernel/asm-offsets.c b/arch/xtensa/kernel/asm-offsets.c
index d0323cd6a2ea..d5ffe7b6443e 100644
--- a/arch/xtensa/kernel/asm-offsets.c
+++ b/arch/xtensa/kernel/asm-offsets.c
@@ -18,12 +18,13 @@
 #include <linux/stddef.h>
 #include <linux/thread_info.h>
 #include <linux/ptrace.h>
+#include <linux/mm.h>
+
 #include <asm/ptrace.h>
 #include <asm/processor.h>
 #include <asm/uaccess.h>
 
 #define DEFINE(sym, val) asm volatile("\n->" #sym " %0 " #val : : "i" (val))
-#define BLANK() asm volatile("\n->" : : )
 
 int main(void)
 {
@@ -63,7 +64,6 @@ int main(void)
         DEFINE(PT_SIZE, sizeof(struct pt_regs));
         DEFINE(PT_AREG_END, offsetof (struct pt_regs, areg[XCHAL_NUM_AREGS]));
         DEFINE(PT_USER_SIZE, offsetof(struct pt_regs, areg[XCHAL_NUM_AREGS]));
-        BLANK();
 
         /* struct task_struct */
         DEFINE(TASK_PTRACE, offsetof (struct task_struct, ptrace));
@@ -73,27 +73,26 @@ int main(void)
         DEFINE(TASK_THREAD, offsetof (struct task_struct, thread));
         DEFINE(TASK_THREAD_INFO, offsetof (struct task_struct, stack));
         DEFINE(TASK_STRUCT_SIZE, sizeof (struct task_struct));
-        BLANK();
 
         /* struct thread_info (offset from start_struct) */
         DEFINE(THREAD_RA, offsetof (struct task_struct, thread.ra));
         DEFINE(THREAD_SP, offsetof (struct task_struct, thread.sp));
         DEFINE(THREAD_CP_SAVE, offsetof (struct task_struct, thread.cp_save));
         DEFINE(THREAD_CURRENT_DS, offsetof (struct task_struct, thread.current_ds));
-        BLANK();
 
         /* struct mm_struct */
         DEFINE(MM_USERS, offsetof(struct mm_struct, mm_users));
         DEFINE(MM_PGD, offsetof (struct mm_struct, pgd));
         DEFINE(MM_CONTEXT, offsetof (struct mm_struct, context));
-        BLANK();
-        DEFINE(PT_SINGLESTEP_BIT, PT_SINGLESTEP_BIT);
+
+        /* struct page */
+        DEFINE(PAGE_FLAGS, offsetof(struct page, flags));
 
         /* constants */
         DEFINE(_CLONE_VM, CLONE_VM);
         DEFINE(_CLONE_UNTRACED, CLONE_UNTRACED);
+        DEFINE(PG_ARCH_1, PG_arch_1);
 
         return 0;
 }
 
-
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index 8dc7a2c26ff9..91a689eca43d 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -7,7 +7,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2004-2005 by Tensilica Inc.
+ * Copyright (C) 2004-2007 by Tensilica Inc.
  *
  * Chris Zankel <chris@zankel.net>
  *
@@ -169,7 +169,7 @@ _user_exception:
          * We have to save all registers up to the first '1' from
          * the right, except the current frame (bit 0).
          * Assume a2 is:  001001000110001
-         * All regiser frames starting from the top fiel to the marked '1'
+         * All register frames starting from the top field to the marked '1'
          * must be saved.
          */
 
@@ -1572,10 +1572,12 @@ ENTRY(fast_second_level_miss)
         l32i    a0, a1, TASK_MM         # tsk->mm
         beqz    a0, 9f
 
-8:      rsr     a1, EXCVADDR            # fault address
-        _PGD_OFFSET(a0, a1, a1)
+
+        /* We deliberately destroy a3 that holds the exception table. */
+
+8:      rsr     a3, EXCVADDR            # fault address
+        _PGD_OFFSET(a0, a3, a1)
         l32i    a0, a0, 0               # read pmdval
-        //beqi  a0, _PAGE_USER, 2f
         beqz    a0, 2f
 
         /* Read ptevaddr and convert to top of page-table page.
@@ -1588,7 +1590,7 @@ ENTRY(fast_second_level_miss)
          * The messy computation for 'pteval' above really simplifies
          * into the following:
          *
-         * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_KERNEL
+         * pteval = ((pmdval - PAGE_OFFSET) & PAGE_MASK) | PAGE_DIRECTORY
          */
 
         movi    a1, -PAGE_OFFSET
@@ -1596,20 +1598,34 @@ ENTRY(fast_second_level_miss)
         extui   a1, a0, 0, PAGE_SHIFT   # ... & PAGE_MASK
         xor     a0, a0, a1
 
-
-        movi    a1, PAGE_DIRECTORY
+        movi    a1, _PAGE_DIRECTORY
         or      a0, a0, a1              # ... | PAGE_DIRECTORY
 
+        /*
+         * We utilize all three wired-ways (7-9) to hold pmd translations.
+         * Memory regions are mapped to the DTLBs according to bits 28 and 29.
+         * This allows to map the three most common regions to three different
+         * DTLBs:
+         *  0,1 -> way 7        program (0040.0000) and virtual (c000.0000)
+         *  2   -> way 8        shared libaries (2000.0000)
+         *  3   -> way 0        stack (3000.0000)
+         */
+
+        extui   a3, a3, 28, 2           # addr. bit 28 and 29   0,1,2,3
         rsr     a1, PTEVADDR
+        addx2   a3, a3, a3              # ->                    0,3,6,9
         srli    a1, a1, PAGE_SHIFT
+        extui   a3, a3, 2, 2            # ->                    0,0,1,2
         slli    a1, a1, PAGE_SHIFT      # ptevaddr & PAGE_MASK
-        addi    a1, a1, DTLB_WAY_PGD    # ... + way_number
+        addi    a3, a3, DTLB_WAY_PGD
+        add     a1, a1, a3              # ... + way_number
 
-        wdtlb   a0, a1
+3:      wdtlb   a0, a1
         dsync
 
         /* Exit critical section. */
 
+4:      movi    a3, exc_table           # restore a3
         movi    a0, 0
         s32i    a0, a3, EXC_TABLE_FIXUP
 
@@ -1636,8 +1652,76 @@ ENTRY(fast_second_level_miss)
 9:      l32i    a0, a1, TASK_ACTIVE_MM  # unlikely case mm == 0
         j       8b
 
+#if (DCACHE_WAY_SIZE > PAGE_SIZE)
+
+2:      /* Special case for cache aliasing.
+         * We (should) only get here if a clear_user_page, copy_user_page
+         * or the aliased cache flush functions got preemptively interrupted 
+         * by another task. Re-establish temporary mapping to the 
+         * TLBTEMP_BASE areas.
+         */
+
+        /* We shouldn't be in a double exception */
+
+        l32i    a0, a2, PT_DEPC
+        bgeui   a0, VALID_DOUBLE_EXCEPTION_ADDRESS, 2f
+
+        /* Make sure the exception originated in the special functions */
+
+        movi    a0, __tlbtemp_mapping_start
+        rsr     a3, EPC_1
+        bltu    a3, a0, 2f
+        movi    a0, __tlbtemp_mapping_end
+        bgeu    a3, a0, 2f
+
+        /* Check if excvaddr was in one of the TLBTEMP_BASE areas. */
+
+        movi    a3, TLBTEMP_BASE_1
+        rsr     a0, EXCVADDR
+        bltu    a0, a3, 2f
+
+        addi    a1, a0, -(2 << (DCACHE_ALIAS_ORDER + PAGE_SHIFT))
+        bgeu    a1, a3, 2f
+
+        /* Check if we have to restore an ITLB mapping. */
+
+        movi    a1, __tlbtemp_mapping_itlb
+        rsr     a3, EPC_1
+        sub     a3, a3, a1
+
+        /* Calculate VPN */
+
+        movi    a1, PAGE_MASK
+        and     a1, a1, a0
+
+        /* Jump for ITLB entry */
+
+        bgez    a3, 1f
+
+        /* We can use up to two TLBTEMP areas, one for src and one for dst. */
+
+        extui   a3, a0, PAGE_SHIFT + DCACHE_ALIAS_ORDER, 1
+        add     a1, a3, a1
+
+        /* PPN is in a6 for the first TLBTEMP area and in a7 for the second. */
+
+        mov     a0, a6
+        movnez  a0, a7, a3
+        j       3b
+
+        /* ITLB entry. We only use dst in a6. */
+
+1:      witlb   a6, a1
+        isync
+        j       4b
+
+
+#endif  // DCACHE_WAY_SIZE > PAGE_SIZE
+
+
 2:      /* Invalid PGD, default exception handling */
 
+        movi    a3, exc_table
         rsr     a1, DEPC
         xsr     a3, EXCSAVE_1
         s32i    a1, a2, PT_AREG2
@@ -1682,15 +1766,15 @@ ENTRY(fast_store_prohibited)
 8:      rsr     a1, EXCVADDR            # fault address
         _PGD_OFFSET(a0, a1, a4)
         l32i    a0, a0, 0
-        //beqi  a0, _PAGE_USER, 2f      # FIXME use _PAGE_INVALID
         beqz    a0, 2f
 
+        /* Note that we assume _PAGE_WRITABLE_BIT is only set if pte is valid.*/
+
         _PTE_OFFSET(a0, a1, a4)
         l32i    a4, a0, 0               # read pteval
-        movi    a1, _PAGE_VALID | _PAGE_RW
-        bnall   a4, a1, 2f
+        bbci.l  a4, _PAGE_WRITABLE_BIT, 2f
 
-        movi    a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_WRENABLE
+        movi    a1, _PAGE_ACCESSED | _PAGE_DIRTY | _PAGE_HW_WRITE
         or      a4, a4, a1
         rsr     a1, EXCVADDR
         s32i    a4, a0, 0
@@ -1700,10 +1784,7 @@ ENTRY(fast_store_prohibited)
         dhwb    a0, 0
 #endif
         pdtlb   a0, a1
-        beqz    a0, 1f
-        idtlb   a0              // FIXME do we need this?
         wdtlb   a4, a0
-1:
 
         /* Exit critical section. */
 
diff --git a/arch/xtensa/kernel/init_task.c b/arch/xtensa/kernel/init_task.c
new file mode 100644
index 000000000000..021b4f46ff94
--- /dev/null
+++ b/arch/xtensa/kernel/init_task.c
@@ -0,0 +1,38 @@
+/*
+ * arch/xtensa/kernel/init_task.c
+ *
+ * Xtensa Processor version.
+ *
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License.  See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Tensilica Inc.
+ *
+ * Chris Zankel <chris@zankel.net>
+ */
+
+#include <linux/mm.h>
+#include <linux/fs.h>
+#include <linux/init.h>
+#include <linux/init_task.h>
+#include <linux/module.h>
+#include <linux/mqueue.h>
+
+#include <asm/uaccess.h>
+
+static struct fs_struct init_fs = INIT_FS;
+static struct files_struct init_files = INIT_FILES;
+static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
+static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
+struct mm_struct init_mm = INIT_MM(init_mm);
+
+EXPORT_SYMBOL(init_mm);
+
+union thread_union init_thread_union
+        __attribute__((__section__(".data.init_task"))) =
+{ INIT_THREAD_INFO(init_task) };
+
+struct task_struct init_task = INIT_TASK(init_task);
+
+EXPORT_SYMBOL(init_task);
diff --git a/arch/xtensa/kernel/io.c b/arch/xtensa/kernel/io.c
new file mode 100644
index 000000000000..5b65269b1d2f
--- /dev/null
+++ b/arch/xtensa/kernel/io.c
@@ -0,0 +1,75 @@
+/*
+ * arch/xtensa/io.c
+ *
+ * IO primitives
+ *
+ * This program is free software; you can redistribute  it and/or modify it
+ * under  the terms of  the GNU General  Public License as published by the
+ * Free Software Foundation;  either version 2 of the  License, or (at your
+ * option) any later version.
+ *
+ * Copied from sparc.
+ *
+ * Chris Zankel <chris@zankel.net>
+ *
+ */
+
+#include <asm/io.h>
+#include <asm/byteorder.h>
+
+void outsb(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 1;
+                writeb(*(const char *)src, addr);
+                src += 1;
+                addr += 1;
+        }
+}
+
+void outsw(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 2;
+                writew(*(const short *)src, addr);
+                src += 2;
+                addr += 2;
+        }
+}
+
+void outsl(unsigned long addr, const void *src, unsigned long count) {
+        while (count) {
+                count -= 4;
+                writel(*(const long *)src, addr);
+                src += 4;
+                addr += 4;
+        }
+}
+
+void insb(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 1;
+                *(unsigned char *)dst = readb(addr);
+                dst += 1;
+                addr += 1;
+        }
+}
+
+void insw(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 2;
+                *(unsigned short *)dst = readw(addr);
+                dst += 2;
+                addr += 2;
+        }
+}
+
+void insl(unsigned long addr, void *dst, unsigned long count) {
+        while (count) {
+                count -= 4;
+                /*
+                 * XXX I am sure we are in for an unaligned trap here.
+                 */
+                *(unsigned long *)dst = readl(addr);
+                dst += 4;
+                addr += 4;
+        }
+}
diff --git a/arch/xtensa/kernel/module.c b/arch/xtensa/kernel/module.c
index 2ea1755a0858..ddf14dcf2ad9 100644
--- a/arch/xtensa/kernel/module.c
+++ b/arch/xtensa/kernel/module.c
@@ -7,7 +7,7 @@
  * License.  See the file "COPYING" in the main directory of this archive
  * for more details.
  *
- * Copyright (C) 2001 - 2005 Tensilica Inc.
+ * Copyright (C) 2001 - 2006 Tensilica Inc.
  *
  * Chris Zankel <chris@zankel.net>
  *
@@ -22,57 +22,216 @@
 #include <linux/kernel.h>
 #include <linux/cache.h>
 
-LIST_HEAD(module_buf_list);
+#undef DEBUG_RELOCATE
 
 void *module_alloc(unsigned long size)
 {
-  panic("module_alloc not implemented");
+        if (size == 0)
+                return NULL;
+        return vmalloc(size);
 }
 
 void module_free(struct module *mod, void *module_region)
 {
-  panic("module_free not implemented");
+        vfree(module_region);
+        /* FIXME: If module_region == mod->init_region, trim exception
+           table entries. */
 }
 
 int module_frob_arch_sections(Elf32_Ehdr *hdr,
                               Elf32_Shdr *sechdrs,
                               char *secstrings,
-                              struct module *me)
+                              struct module *mod)
 {
-  panic("module_frob_arch_sections not implemented");
+        return 0;
+}
+
+static int
+decode_calln_opcode (unsigned char *location)
+{
+#ifdef __XTENSA_EB__
+        return (location[0] & 0xf0) == 0x50;
+#endif
+#ifdef __XTENSA_EL__
+        return (location[0] & 0xf) == 0x5;
+#endif
+}
+
+static int
+decode_l32r_opcode (unsigned char *location)
+{
+#ifdef __XTENSA_EB__
+        return (location[0] & 0xf0) == 0x10;
+#endif
+#ifdef __XTENSA_EL__
+        return (location[0] & 0xf) == 0x1;
+#endif
 }
 
 int apply_relocate(Elf32_Shdr *sechdrs,
                    const char *strtab,
                    unsigned int symindex,
                    unsigned int relsec,
-                   struct module *module)
+                   struct module *mod)
 {
-  panic ("apply_relocate not implemented");
+        printk(KERN_ERR "module %s: REL RELOCATION unsupported\n",
+               mod->name);
+        return -ENOEXEC;
+
 }
 
 int apply_relocate_add(Elf32_Shdr *sechdrs,
                        const char *strtab,
                        unsigned int symindex,
                        unsigned int relsec,
-                       struct module *module)
+                       struct module *mod)
 {
-  panic("apply_relocate_add not implemented");
+        unsigned int i;
+        Elf32_Rela *rela = (void *)sechdrs[relsec].sh_addr;
+        Elf32_Sym *sym;
+        unsigned char *location;
+        uint32_t value;
+
+#ifdef DEBUG_RELOCATE
+        printk("Applying relocate section %u to %u\n", relsec,
+               sechdrs[relsec].sh_info);
+#endif
+        for (i = 0; i < sechdrs[relsec].sh_size / sizeof(*rela); i++) {
+                location = (char *)sechdrs[sechdrs[relsec].sh_info].sh_addr
+                        + rela[i].r_offset;
+                sym = (Elf32_Sym *)sechdrs[symindex].sh_addr
+                        + ELF32_R_SYM(rela[i].r_info);
+                value = sym->st_value + rela[i].r_addend;
+
+                switch (ELF32_R_TYPE(rela[i].r_info)) {
+                case R_XTENSA_NONE:
+                case R_XTENSA_DIFF8:
+                case R_XTENSA_DIFF16:
+                case R_XTENSA_DIFF32:
+                case R_XTENSA_ASM_EXPAND:
+                        break;
+
+                case R_XTENSA_32:
+                case R_XTENSA_PLT:
+                        *(uint32_t *)location += value;
+                        break;
+
+                case R_XTENSA_SLOT0_OP:
+                        if (decode_calln_opcode(location)) {
+                                value -= ((unsigned long)location & -4) + 4;
+                                if ((value & 3) != 0 ||
+                                    ((value + (1 << 19)) >> 20) != 0) {
+                                        printk("%s: relocation out of range, "
+                                               "section %d reloc %d "
+                                               "sym '%s'\n",
+                                               mod->name, relsec, i,
+                                               strtab + sym->st_name);
+                                        return -ENOEXEC;
+                                }
+                                value = (signed int)value >> 2;
+#ifdef __XTENSA_EB__
+                                location[0] = ((location[0] & ~0x3) |
+                                            ((value >> 16) & 0x3));
+                                location[1] = (value >> 8) & 0xff;
+                                location[2] = value & 0xff;
+#endif
+#ifdef __XTENSA_EL__
+                                location[0] = ((location[0] & ~0xc0) |
+                                            ((value << 6) & 0xc0));
+                                location[1] = (value >> 2) & 0xff;
+                                location[2] = (value >> 10) & 0xff;
+#endif
+                        } else if (decode_l32r_opcode(location)) {
+                                value -= (((unsigned long)location + 3) & -4);
+                                if ((value & 3) != 0 ||
+                                    (signed int)value >> 18 != -1) {
+                                        printk("%s: relocation out of range, "
+                                               "section %d reloc %d "
+                                               "sym '%s'\n",
+                                               mod->name, relsec, i,
+                                               strtab + sym->st_name);
+                                        return -ENOEXEC;
+                                }
+                                value = (signed int)value >> 2;
+
+#ifdef __XTENSA_EB__
+                                location[1] = (value >> 8) & 0xff;
+                                location[2] = value & 0xff;
+#endif
+#ifdef __XTENSA_EL__
+                                location[1] = value & 0xff;
+                                location[2] = (value >> 8) & 0xff;
+#endif
+                        }
+                        /* FIXME: Ignore any other opcodes.  The Xtensa
+                           assembler currently assumes that the linker will
+                           always do relaxation and so all PC-relative
+                           operands need relocations.  (The assembler also
+                           writes out the tentative PC-relative values,
+                           assuming no link-time relaxation, so it is usually
+                           safe to ignore the relocations.)  If the
+                           assembler's "--no-link-relax" flag can be made to
+                           work, and if all kernel modules can be assembled
+                           with that flag, then unexpected relocations could
+                           be detected here.  */
+                        break;
+
+                case R_XTENSA_SLOT1_OP:
+                case R_XTENSA_SLOT2_OP:
+                case R_XTENSA_SLOT3_OP:
+                case R_XTENSA_SLOT4_OP:
+                case R_XTENSA_SLOT5_OP:
+                case R_XTENSA_SLOT6_OP:
+                case R_XTENSA_SLOT7_OP:
+                case R_XTENSA_SLOT8_OP:
+                case R_XTENSA_SLOT9_OP:
+                case R_XTENSA_SLOT10_OP:
+                case R_XTENSA_SLOT11_OP:
+                case R_XTENSA_SLOT12_OP:
+                case R_XTENSA_SLOT13_OP:
+                case R_XTENSA_SLOT14_OP:
+                        printk("%s: unexpected FLIX relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+
+                case R_XTENSA_SLOT0_ALT:
+                case R_XTENSA_SLOT1_ALT:
+                case R_XTENSA_SLOT2_ALT:
+                case R_XTENSA_SLOT3_ALT:
+                case R_XTENSA_SLOT4_ALT:
+                case R_XTENSA_SLOT5_ALT:
+                case R_XTENSA_SLOT6_ALT:
+                case R_XTENSA_SLOT7_ALT:
+                case R_XTENSA_SLOT8_ALT:
+                case R_XTENSA_SLOT9_ALT:
+                case R_XTENSA_SLOT10_ALT:
+                case R_XTENSA_SLOT11_ALT:
+                case R_XTENSA_SLOT12_ALT:
+                case R_XTENSA_SLOT13_ALT:
+                case R_XTENSA_SLOT14_ALT:
+                        printk("%s: unexpected ALT relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+
+                default:
+                        printk("%s: unexpected relocation: %u\n",
+                               mod->name,
+                               ELF32_R_TYPE(rela[i].r_info));
+                        return -ENOEXEC;
+                }
+        }
+        return 0;
 }
 
 int module_finalize(const Elf_Ehdr *hdr,
                     const Elf_Shdr *sechdrs,
-                    struct module *me)
+                    struct module *mod)
 {
-  panic ("module_finalize not implemented");
+        return 0;
 }
 
 void module_arch_cleanup(struct module *mod)
 {
-  panic("module_arch_cleanup not implemented");
-}
-
-struct bug_entry *module_find_bug(unsigned long bugaddr)
-{
-  panic("module_find_bug not implemented");
 }
diff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c
index 77deae5290f0..b7c073484e01 100644
--- a/arch/xtensa/kernel/pci.c
+++ b/arch/xtensa/kernel/pci.c
@@ -394,72 +394,3 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
 
         return ret;
 }
-
-/*
- * This probably belongs here rather than ioport.c because
- * we do not want this crud linked into SBus kernels.
- * Also, think for a moment about likes of floppy.c that
- * include architecture specific parts. They may want to redefine ins/outs.
- *
- * We do not use horrible macros here because we want to
- * advance pointer by sizeof(size).
- */
-void outsb(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 1;
-                writeb(*(const char *)src, addr);
-                src += 1;
-                addr += 1;
-        }
-}
-
-void outsw(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 2;
-                writew(*(const short *)src, addr);
-                src += 2;
-                addr += 2;
-        }
-}
-
-void outsl(unsigned long addr, const void *src, unsigned long count) {
-        while (count) {
-                count -= 4;
-                writel(*(const long *)src, addr);
-                src += 4;
-                addr += 4;
-        }
-}
-
-void insb(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 1;
-                *(unsigned char *)dst = readb(addr);
-                dst += 1;
-                addr += 1;
-        }
-}
-
-void insw(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 2;
-                *(unsigned short *)dst = readw(addr);
-                dst += 2;
-                addr += 2;
-        }
-}
-
-void insl(unsigned long addr, void *dst, unsigned long count) {
-        while (count) {
-                count -= 4;
-                /*
-                 * XXX I am sure we are in for an unaligned trap here.
-                 */
-                *(unsigned long *)dst = readl(addr);
-                dst += 4;
-                addr += 4;
-        }
-}
-
-
-
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index dd498f1604e1..f53d7bd9dfb2 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -46,20 +46,6 @@
 
 extern void ret_from_fork(void);
 
-static struct fs_struct init_fs = INIT_FS;
-static struct files_struct init_files = INIT_FILES;
-static struct signal_struct init_signals = INIT_SIGNALS(init_signals);
-static struct sighand_struct init_sighand = INIT_SIGHAND(init_sighand);
-struct mm_struct init_mm = INIT_MM(init_mm);
-EXPORT_SYMBOL(init_mm);
-
-union thread_union init_thread_union
-        __attribute__((__section__(".data.init_task"))) =
-{ INIT_THREAD_INFO(init_task) };
-
-struct task_struct init_task = INIT_TASK(init_task);
-EXPORT_SYMBOL(init_task);
-
 struct task_struct *current_set[NR_CPUS] = {&init_task, };
 
 void (*pm_power_off)(void) = NULL;
diff --git a/arch/xtensa/kernel/semaphore.c b/arch/xtensa/kernel/semaphore.c
index d40f4b1b75ac..995c6410ae10 100644
--- a/arch/xtensa/kernel/semaphore.c
+++ b/arch/xtensa/kernel/semaphore.c
@@ -100,7 +100,7 @@ static __inline__ int waking_non_zero_trylock(struct semaphore *sem)
         return ret;
 }
 
-spinlock_t semaphore_wake_lock;
+DEFINE_SPINLOCK(semaphore_wake_lock);
 
 /*
  * Semaphores are implemented using a two-way counter:
diff --git a/arch/xtensa/kernel/syscall.c b/arch/xtensa/kernel/syscall.c
index fe3834bc1dbf..f3e16efcd47a 100644
--- a/arch/xtensa/kernel/syscall.c
+++ b/arch/xtensa/kernel/syscall.c
@@ -93,3 +93,8 @@ asmlinkage long xtensa_shmat(int shmid, char __user *shmaddr, int shmflg)
         return (long)ret;
 }
 
+asmlinkage long xtensa_fadvise64_64(int fd, int advice, unsigned long long offset, unsigned long long len)
+{
+        return sys_fadvise64_64(fd, offset, len, advice);
+}
+
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index 22949be4a5d8..60d29fe0b1bd 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -32,12 +32,20 @@ EXPORT_SYMBOL(rtc_lock);
 
 #ifdef CONFIG_XTENSA_CALIBRATE_CCOUNT
 unsigned long ccount_per_jiffy;         /* per 1/HZ */
-unsigned long ccount_nsec;              /* nsec per ccount increment */
+unsigned long nsec_per_ccount;          /* nsec per ccount increment */
 #endif
 
-unsigned int last_ccount_stamp;
 static long last_rtc_update = 0;
 
+/*
+ * Scheduler clock - returns current tim in nanosec units.
+ */
+
+unsigned long long sched_clock(void)
+{
+        return (unsigned long long)jiffies * (1000000000 / HZ);
+}
+
 static irqreturn_t timer_interrupt(int irq, void *dev_id);
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
@@ -69,7 +77,6 @@ void __init time_init(void)
 
         xtime.tv_nsec = 0;
         last_rtc_update = xtime.tv_sec = sec_n;
-        last_ccount_stamp = get_ccount();
 
         set_normalized_timespec(&wall_to_monotonic,
                 -xtime.tv_sec, -xtime.tv_nsec);
@@ -85,7 +92,7 @@ int do_settimeofday(struct timespec *tv)
 {
         time_t wtm_sec, sec = tv->tv_sec;
         long wtm_nsec, nsec = tv->tv_nsec;
-        unsigned long ccount;
+        unsigned long delta;
 
         if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
                 return -EINVAL;
@@ -97,8 +104,10 @@ int do_settimeofday(struct timespec *tv)
          * wall time.  Discover what correction gettimeofday() would have
          * made, and then undo it!
          */
-        ccount = get_ccount();
-        nsec -= (ccount - last_ccount_stamp) * CCOUNT_NSEC;
+
+        delta = CCOUNT_PER_JIFFY;
+        delta += get_ccount() - get_linux_timer();
+        nsec -= delta * NSEC_PER_CCOUNT;
 
         wtm_sec  = wall_to_monotonic.tv_sec + (xtime.tv_sec - sec);
         wtm_nsec = wall_to_monotonic.tv_nsec + (xtime.tv_nsec - nsec);
@@ -117,17 +126,21 @@ EXPORT_SYMBOL(do_settimeofday);
 void do_gettimeofday(struct timeval *tv)
 {
         unsigned long flags;
-        unsigned long sec, usec, delta, seq;
+        unsigned long volatile sec, usec, delta, seq;
 
         do {
                 seq = read_seqbegin_irqsave(&xtime_lock, flags);
 
-                delta = get_ccount() - last_ccount_stamp;
                 sec = xtime.tv_sec;
                 usec = (xtime.tv_nsec / NSEC_PER_USEC);
+
+                delta = get_linux_timer() - get_ccount();
+
         } while (read_seqretry_irqrestore(&xtime_lock, seq, flags));
 
-        usec += (delta * CCOUNT_NSEC) / NSEC_PER_USEC;
+        usec += (((unsigned long) CCOUNT_PER_JIFFY - delta)
+                 * (unsigned long) NSEC_PER_CCOUNT) / NSEC_PER_USEC;
+
         for (; usec >= 1000000; sec++, usec -= 1000000)
                 ;
 
@@ -158,9 +171,12 @@ again:
 
                 write_seqlock(&xtime_lock);
 
-                last_ccount_stamp = next;
+                do_timer(1); /* Linux handler in kernel/timer.c */
+
+                /* Note that writing CCOMPARE clears the interrupt. */
+
                 next += CCOUNT_PER_JIFFY;
-                do_timer (1); /* Linux handler in kernel/timer.c */
+                set_linux_timer(next);
 
                 if (ntp_synced() &&
                     xtime.tv_sec - last_rtc_update >= 659 &&
@@ -175,19 +191,15 @@ again:
                 write_sequnlock(&xtime_lock);
         }
 
-        /* NOTE: writing CCOMPAREn clears the interrupt.  */
+        /* Allow platform to do something useful (Wdog). */
 
-        set_linux_timer (next);
+        platform_heartbeat();
 
         /* Make sure we didn't miss any tick... */
 
         if ((signed long)(get_ccount() - next) > 0)
                 goto again;
 
-        /* Allow platform to do something useful (Wdog). */
-
-        platform_heartbeat();
-
         return IRQ_HANDLED;
 }
 
diff --git a/arch/xtensa/kernel/traps.c b/arch/xtensa/kernel/traps.c
index c5e62f9d9f50..8be99c777d9d 100644
--- a/arch/xtensa/kernel/traps.c
+++ b/arch/xtensa/kernel/traps.c
@@ -83,7 +83,7 @@ typedef struct {
         void* handler;
 } dispatch_init_table_t;
 
-dispatch_init_table_t __init dispatch_init_table[] = {
+static dispatch_init_table_t __initdata dispatch_init_table[] = {
 
 { EXCCAUSE_ILLEGAL_INSTRUCTION, 0,         do_illegal_instruction},
 { EXCCAUSE_SYSTEM_CALL,         KRNL,      fast_syscall_kernel },
@@ -305,7 +305,7 @@ do_debug(struct pt_regs *regs)
 
 #define set_handler(idx,handler) (exc_table[idx] = (unsigned long) (handler))
 
-void trap_init(void)
+void __init trap_init(void)
 {
         int i;