519 files changed, 7083 insertions, 5441 deletions

diff --git a/arch/alpha/Kconfig b/arch/alpha/Kconfig
index 189d5eababa8..786491f9ceb2 100644
--- a/arch/alpha/Kconfig
+++ b/arch/alpha/Kconfig
@@ -479,6 +479,9 @@ config EISA
         depends on ALPHA_GENERIC || ALPHA_JENSEN || ALPHA_ALCOR || ALPHA_MIKASA || ALPHA_SABLE || ALPHA_LYNX || ALPHA_NORITAKE || ALPHA_RAWHIDE
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        def_bool y
+
 config SMP
         bool "Symmetric multi-processing support"
         depends on ALPHA_SABLE || ALPHA_LYNX || ALPHA_RAWHIDE || ALPHA_DP264 || ALPHA_WILDFIRE || ALPHA_TITAN || ALPHA_GENERIC || ALPHA_SHARK || ALPHA_MARVEL
diff --git a/arch/alpha/Makefile b/arch/alpha/Makefile
index 22ebfb2be0e4..1b704ee54bf3 100644
--- a/arch/alpha/Makefile
+++ b/arch/alpha/Makefile
@@ -108,20 +108,9 @@ $(boot)/vmlinux.gz: vmlinux
 bootimage bootpfile bootpzfile: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
-
-prepare: include/asm-$(ARCH)/asm_offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
-
 define archhelp
   echo '* boot          - Compressed kernel image (arch/alpha/boot/vmlinux.gz)'
   echo '  bootimage     - SRM bootable image (arch/alpha/boot/bootimage)'
diff --git a/arch/alpha/kernel/alpha_ksyms.c b/arch/alpha/kernel/alpha_ksyms.c
index fc5ef90c4fc9..24ae9a366073 100644
--- a/arch/alpha/kernel/alpha_ksyms.c
+++ b/arch/alpha/kernel/alpha_ksyms.c
@@ -185,15 +185,6 @@ EXPORT_SYMBOL(smp_num_cpus);
 EXPORT_SYMBOL(smp_call_function);
 EXPORT_SYMBOL(smp_call_function_on_cpu);
 EXPORT_SYMBOL(_atomic_dec_and_lock);
-#ifdef CONFIG_DEBUG_SPINLOCK
-EXPORT_SYMBOL(_raw_spin_unlock);
-EXPORT_SYMBOL(debug_spin_lock);
-EXPORT_SYMBOL(debug_spin_trylock);
-#endif
-#ifdef CONFIG_DEBUG_RWLOCK
-EXPORT_SYMBOL(_raw_write_lock);
-EXPORT_SYMBOL(_raw_read_lock);
-#endif
 EXPORT_SYMBOL(cpu_present_mask);
 #endif /* CONFIG_SMP */
 
diff --git a/arch/alpha/kernel/entry.S b/arch/alpha/kernel/entry.S
index f0927ee53f29..76cc0cb5fc2e 100644
--- a/arch/alpha/kernel/entry.S
+++ b/arch/alpha/kernel/entry.S
@@ -5,7 +5,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/pal.h>
 #include <asm/errno.h>
diff --git a/arch/alpha/kernel/head.S b/arch/alpha/kernel/head.S
index 4ca2e404708a..0905721fcbca 100644
--- a/arch/alpha/kernel/head.S
+++ b/arch/alpha/kernel/head.S
@@ -9,7 +9,7 @@
 
 #include <linux/config.h>
 #include <asm/system.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 .globl swapper_pg_dir
 .globl _stext
diff --git a/arch/alpha/kernel/module.c b/arch/alpha/kernel/module.c
index fc271e316a38..aac6d4b22f7a 100644
--- a/arch/alpha/kernel/module.c
+++ b/arch/alpha/kernel/module.c
@@ -47,7 +47,7 @@ module_free(struct module *mod, void *module_region)
 
 struct got_entry {
         struct got_entry *next;
-        Elf64_Addr r_offset;
+        Elf64_Sxword r_addend;
         int got_offset;
 };
 
@@ -57,14 +57,14 @@ process_reloc_for_got(Elf64_Rela *rela,
 {
         unsigned long r_sym = ELF64_R_SYM (rela->r_info);
         unsigned long r_type = ELF64_R_TYPE (rela->r_info);
-        Elf64_Addr r_offset = rela->r_offset;
+        Elf64_Sxword r_addend = rela->r_addend;
         struct got_entry *g;
 
         if (r_type != R_ALPHA_LITERAL)
                 return;
 
         for (g = chains + r_sym; g ; g = g->next)
-                if (g->r_offset == r_offset) {
+                if (g->r_addend == r_addend) {
                         if (g->got_offset == 0) {
                                 g->got_offset = *poffset;
                                 *poffset += 8;
@@ -74,7 +74,7 @@ process_reloc_for_got(Elf64_Rela *rela,
 
         g = kmalloc (sizeof (*g), GFP_KERNEL);
         g->next = chains[r_sym].next;
-        g->r_offset = r_offset;
+        g->r_addend = r_addend;
         g->got_offset = *poffset;
         *poffset += 8;
         chains[r_sym].next = g;
diff --git a/arch/alpha/kernel/osf_sys.c b/arch/alpha/kernel/osf_sys.c
index 167fd89f8707..0636116210d2 100644
--- a/arch/alpha/kernel/osf_sys.c
+++ b/arch/alpha/kernel/osf_sys.c
@@ -974,6 +974,7 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
         size_t size;
         long timeout;
         int ret = -EINVAL;
+        struct fdtable *fdt;
 
         timeout = MAX_SCHEDULE_TIMEOUT;
         if (tvp) {
@@ -995,7 +996,8 @@ osf_select(int n, fd_set __user *inp, fd_set __user *outp, fd_set __user *exp,
                 }
         }
 
-        if (n < 0 || n > current->files->max_fdset)
+        fdt = files_fdtable(current->files);
+        if (n < 0 || n > fdt->max_fdset)
                 goto out_nofds;
 
         /*
@@ -1152,8 +1154,7 @@ osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remai
 
         ticks = timeval_to_jiffies(&tmp);
 
-        current->state = TASK_INTERRUPTIBLE;
-        ticks = schedule_timeout(ticks);
+        ticks = schedule_timeout_interruptible(ticks);
 
         if (remain) {
                 jiffies_to_timeval(ticks, &tmp);
diff --git a/arch/alpha/kernel/smp.c b/arch/alpha/kernel/smp.c
index e211aa7404e6..da0be3465791 100644
--- a/arch/alpha/kernel/smp.c
+++ b/arch/alpha/kernel/smp.c
@@ -989,175 +989,3 @@ flush_icache_user_range(struct vm_area_struct *vma, struct page *page,
 
         preempt_enable();
 }
-
-#ifdef CONFIG_DEBUG_SPINLOCK
-void
-_raw_spin_unlock(spinlock_t * lock)
-{
-        mb();
-        lock->lock = 0;
-
-        lock->on_cpu = -1;
-        lock->previous = NULL;
-        lock->task = NULL;
-        lock->base_file = "none";
-        lock->line_no = 0;
-}
-
-void
-debug_spin_lock(spinlock_t * lock, const char *base_file, int line_no)
-{
-        long tmp;
-        long stuck;
-        void *inline_pc = __builtin_return_address(0);
-        unsigned long started = jiffies;
-        int printed = 0;
-        int cpu = smp_processor_id();
-
-        stuck = 1L << 30;
- try_again:
-
-        /* Use sub-sections to put the actual loop at the end
-           of this object file's text section so as to perfect
-           branch prediction.  */
-        __asm__ __volatile__(
-        "1:     ldl_l   %0,%1\n"
-        "       subq    %2,1,%2\n"
-        "       blbs    %0,2f\n"
-        "       or      %0,1,%0\n"
-        "       stl_c   %0,%1\n"
-        "       beq     %0,3f\n"
-        "4:     mb\n"
-        ".subsection 2\n"
-        "2:     ldl     %0,%1\n"
-        "       subq    %2,1,%2\n"
-        "3:     blt     %2,4b\n"
-        "       blbs    %0,2b\n"
-        "       br      1b\n"
-        ".previous"
-        : "=r" (tmp), "=m" (lock->lock), "=r" (stuck)
-        : "m" (lock->lock), "2" (stuck) : "memory");
-
-        if (stuck < 0) {
-                printk(KERN_WARNING
-                       "%s:%d spinlock stuck in %s at %p(%d)"
-                       " owner %s at %p(%d) %s:%d\n",
-                       base_file, line_no,
-                       current->comm, inline_pc, cpu,
-                       lock->task->comm, lock->previous,
-                       lock->on_cpu, lock->base_file, lock->line_no);
-                stuck = 1L << 36;
-                printed = 1;
-                goto try_again;
-        }
-
-        /* Exiting.  Got the lock.  */
-        lock->on_cpu = cpu;
-        lock->previous = inline_pc;
-        lock->task = current;
-        lock->base_file = base_file;
-        lock->line_no = line_no;
-
-        if (printed) {
-                printk(KERN_WARNING
-                       "%s:%d spinlock grabbed in %s at %p(%d) %ld ticks\n",
-                       base_file, line_no, current->comm, inline_pc,
-                       cpu, jiffies - started);
-        }
-}
-
-int
-debug_spin_trylock(spinlock_t * lock, const char *base_file, int line_no)
-{
-        int ret;
-        if ((ret = !test_and_set_bit(0, lock))) {
-                lock->on_cpu = smp_processor_id();
-                lock->previous = __builtin_return_address(0);
-                lock->task = current;
-        } else {
-                lock->base_file = base_file;
-                lock->line_no = line_no;
-        }
-        return ret;
-}
-#endif /* CONFIG_DEBUG_SPINLOCK */
-
-#ifdef CONFIG_DEBUG_RWLOCK
-void _raw_write_lock(rwlock_t * lock)
-{
-        long regx, regy;
-        int stuck_lock, stuck_reader;
-        void *inline_pc = __builtin_return_address(0);
-
- try_again:
-
-        stuck_lock = 1<<30;
-        stuck_reader = 1<<30;
-
-        __asm__ __volatile__(
-        "1:     ldl_l   %1,%0\n"
-        "       blbs    %1,6f\n"
-        "       blt     %1,8f\n"
-        "       mov     1,%1\n"
-        "       stl_c   %1,%0\n"
-        "       beq     %1,6f\n"
-        "4:     mb\n"
-        ".subsection 2\n"
-        "6:     blt     %3,4b   # debug\n"
-        "       subl    %3,1,%3 # debug\n"
-        "       ldl     %1,%0\n"
-        "       blbs    %1,6b\n"
-        "8:     blt     %4,4b   # debug\n"
-        "       subl    %4,1,%4 # debug\n"
-        "       ldl     %1,%0\n"
-        "       blt     %1,8b\n"
-        "       br      1b\n"
-        ".previous"
-        : "=m" (*(volatile int *)lock), "=&r" (regx), "=&r" (regy),
-          "=&r" (stuck_lock), "=&r" (stuck_reader)
-        : "m" (*(volatile int *)lock), "3" (stuck_lock), "4" (stuck_reader) : "memory");
-
-        if (stuck_lock < 0) {
-                printk(KERN_WARNING "write_lock stuck at %p\n", inline_pc);
-                goto try_again;
-        }
-        if (stuck_reader < 0) {
-                printk(KERN_WARNING "write_lock stuck on readers at %p\n",
-                       inline_pc);
-                goto try_again;
-        }
-}
-
-void _raw_read_lock(rwlock_t * lock)
-{
-        long regx;
-        int stuck_lock;
-        void *inline_pc = __builtin_return_address(0);
-
- try_again:
-
-        stuck_lock = 1<<30;
-
-        __asm__ __volatile__(
-        "1:     ldl_l   %1,%0;"
-        "       blbs    %1,6f;"
-        "       subl    %1,2,%1;"
-        "       stl_c   %1,%0;"
-        "       beq     %1,6f;"
-        "4:     mb\n"
-        ".subsection 2\n"
-        "6:     ldl     %1,%0;"
-        "       blt     %2,4b   # debug\n"
-        "       subl    %2,1,%2 # debug\n"
-        "       blbs    %1,6b;"
-        "       br      1b\n"
-        ".previous"
-        : "=m" (*(volatile int *)lock), "=&r" (regx), "=&r" (stuck_lock)
-        : "m" (*(volatile int *)lock), "2" (stuck_lock) : "memory");
-
-        if (stuck_lock < 0) {
-                printk(KERN_WARNING "read_lock stuck at %p\n", inline_pc);
-                goto try_again;
-        }
-}
-#endif /* CONFIG_DEBUG_RWLOCK */
diff --git a/arch/alpha/kernel/sys_marvel.c b/arch/alpha/kernel/sys_marvel.c
index 804727853d25..e32fee505220 100644
--- a/arch/alpha/kernel/sys_marvel.c
+++ b/arch/alpha/kernel/sys_marvel.c
@@ -373,12 +373,11 @@ marvel_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
                 irq += 0x80;                    /* offset for lsi       */
 
 #if 1
-                printk("PCI:%d:%d:%d (hose %d) [%s] is using MSI\n",
+                printk("PCI:%d:%d:%d (hose %d) is using MSI\n",
                        dev->bus->number, 
                        PCI_SLOT(dev->devfn), 
                        PCI_FUNC(dev->devfn),
-                       hose->index,
-                       pci_pretty_name (dev));
+                       hose->index);
                 printk("  %d message(s) from 0x%04x\n", 
                        1 << ((msg_ctl & PCI_MSI_FLAGS_QSIZE) >> 4),
                        msg_dat);
diff --git a/arch/alpha/kernel/time.c b/arch/alpha/kernel/time.c
index 8226c5cd788c..67be50b7d80a 100644
--- a/arch/alpha/kernel/time.c
+++ b/arch/alpha/kernel/time.c
@@ -149,7 +149,7 @@ irqreturn_t timer_interrupt(int irq, void *dev, struct pt_regs * regs)
          * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0
+        if (ntp_synced()
             && xtime.tv_sec > state.last_rtc_update + 660
             && xtime.tv_nsec >= 500000 - ((unsigned) TICK_SIZE) / 2
             && xtime.tv_nsec <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -502,10 +502,7 @@ do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
diff --git a/arch/alpha/lib/dbg_stackcheck.S b/arch/alpha/lib/dbg_stackcheck.S
index cc5ce3a5fcad..3c1f3e6522e5 100644
--- a/arch/alpha/lib/dbg_stackcheck.S
+++ b/arch/alpha/lib/dbg_stackcheck.S
@@ -5,7 +5,7 @@
  * Verify that we have not overflowed the stack.  Oops if we have.
  */
 
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
         .set noat
diff --git a/arch/alpha/lib/dbg_stackkill.S b/arch/alpha/lib/dbg_stackkill.S
index e09f2ae1e09e..e9f6a9dcf2b7 100644
--- a/arch/alpha/lib/dbg_stackkill.S
+++ b/arch/alpha/lib/dbg_stackkill.S
@@ -6,7 +6,7 @@
  * uninitialized local variables in the act.
  */
 
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
         .set noat
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 68dfdba71d74..11fff042aa81 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -64,6 +64,9 @@ config GENERIC_CALIBRATE_DELAY
 config GENERIC_BUST_SPINLOCK
         bool
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+
 config GENERIC_ISA_DMA
         bool
 
@@ -150,6 +153,7 @@ config ARCH_RPC
         select ARCH_ACORN
         select FIQ
         select TIMER_ACORN
+        select ARCH_MAY_HAVE_PC_FDC
         help
           On the Acorn Risc-PC, Linux can support the internal IDE disk and
           CD-ROM interface, serial and parallel port, and the floppy drive.
@@ -322,8 +326,8 @@ config SMP
           processor machines. On a single processor machine, the kernel will
           run faster if you say N here.
 
-          See also the <file:Documentation/smp.tex>,
-          <file:Documentation/smp.txt>, <file:Documentation/i386/IO-APIC.txt>,
+          See also the <file:Documentation/smp.txt>,
+          <file:Documentation/i386/IO-APIC.txt>,
           <file:Documentation/nmi_watchdog.txt> and the SMP-HOWTO available at
           <http://www.linuxdoc.org/docs.html#howto>.
 
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug
index 45a5709eaaa4..5d3acff8c596 100644
--- a/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@ -53,7 +53,7 @@ config DEBUG_LL
         bool "Kernel low-level debugging functions"
         depends on DEBUG_KERNEL
         help
-          Say Y here to include definitions of printascii, printchar, printhex
+          Say Y here to include definitions of printascii, printch, printhex
           in the kernel.  This is helpful if you are debugging code that
           executes before the console is initialized.
 
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 67f1453ade05..e625ac66f49b 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -178,7 +178,7 @@ endif
 prepare: maketools include/asm-arm/.arch
 
 .PHONY: maketools FORCE
-maketools: include/asm-arm/constants.h include/linux/version.h FORCE
+maketools: include/linux/version.h FORCE
         $(Q)$(MAKE) $(build)=arch/arm/tools include/asm-arm/mach-types.h
 
 # Convert bzImage to zImage
@@ -190,7 +190,7 @@ zImage Image xipImage bootpImage uImage: vmlinux
 zinstall install: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-CLEAN_FILES += include/asm-arm/constants.h* include/asm-arm/mach-types.h \
+CLEAN_FILES += include/asm-arm/mach-types.h \
                include/asm-arm/arch include/asm-arm/.arch
 
 # We use MRPROPER_FILES and CLEAN_FILES now
@@ -201,11 +201,6 @@ archclean:
 bp:;    $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $(boot)/bootpImage
 i zi:;  $(Q)$(MAKE) $(build)=$(boot) MACHINE=$(MACHINE) $@
 
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/asm-arm/.arch
-
-include/asm-$(ARCH)/constants.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
 
 define archhelp
   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
diff --git a/arch/arm/boot/compressed/head-sharpsl.S b/arch/arm/boot/compressed/head-sharpsl.S
index d6bf8a2b090d..59ad69640d6b 100644
--- a/arch/arm/boot/compressed/head-sharpsl.S
+++ b/arch/arm/boot/compressed/head-sharpsl.S
@@ -7,7 +7,8 @@
  * so we have to figure out the machine for ourselves...
  *
  * Support for Poodle, Corgi (SL-C700), Shepherd (SL-C750)
- * and Husky (SL-C760).
+ * Husky (SL-C760), Tosa (SL-C6000), Spitz (SL-C3000),
+ * Akita (SL-C1000) and Borzoi (SL-C3100).
  *
  */
 
@@ -23,6 +24,22 @@
 
 __SharpSL_start:
 
+/* Check for TC6393 - if found we have a Tosa */
+        ldr     r7, .TOSAID
+        mov     r1, #0x10000000         @ Base address of TC6393 chip
+        mov     r6, #0x03
+        ldrh    r3, [r1, #8]            @ Load TC6393XB Revison: This is 0x0003
+        cmp     r6, r3
+        beq     .SHARPEND               @ Success -> tosa
+
+/* Check for pxa270 - if found, branch */
+        mrc p15, 0, r4, c0, c0          @ Get Processor ID
+        and     r4, r4, #0xffffff00
+        ldr     r3, .PXA270ID
+        cmp     r4, r3
+        beq     .PXA270
+
+/* Check for w100 - if not found we have a Poodle */
         ldr     r1, .W100ADDR           @ Base address of w100 chip + regs offset
 
         mov r6, #0x31                   @ Load Magic Init value
@@ -30,7 +47,7 @@ __SharpSL_start:
         mov r5, #0x3000
 .W100LOOP:
         subs r5, r5, #1
-    bne .W100LOOP
+        bne .W100LOOP
         mov r6, #0x30                   @ Load 2nd Magic Init value
         str     r6, [r1, #0x280]        @ to SCRATCH_UMSK
 
@@ -40,45 +57,52 @@ __SharpSL_start:
         cmp     r6, r3
         bne     .SHARPEND                       @ We have no w100 - Poodle
 
-        mrc p15, 0, r6, c0, c0  @ Get Processor ID
-        and     r6, r6, #0xffffff00
+/* Check for pxa250 - if found we have a Corgi */
         ldr     r7, .CORGIID
         ldr     r3, .PXA255ID
-        cmp     r6, r3
+        cmp     r4, r3
         blo     .SHARPEND                       @ We have a PXA250 - Corgi
 
-        mov     r1, #0x0c000000         @ Base address of NAND chip
-        ldrb    r3, [r1, #24]   @ Load FLASHCTL
-        bic     r3, r3, #0x11           @ SET NCE
-        orr     r3, r3, #0x0a           @ SET CLR + FLWP
-        strb    r3, [r1, #24]   @ Save to FLASHCTL
-        mov     r2, #0x90               @ Command "readid"
-        strb    r2, [r1, #20]   @ Save to FLASHIO
-        bic     r3, r3, #2                      @ CLR CLE
-        orr     r3, r3, #4                      @ SET ALE
-        strb    r3, [r1, #24]   @ Save to FLASHCTL
-        mov             r2, #0                  @ Address 0x00
-        strb    r2, [r1, #20]   @ Save to FLASHIO
-        bic     r3, r3, #4                      @ CLR ALE
-        strb    r3, [r1, #24]   @ Save to FLASHCTL
-.SHARP1:
-        ldrb    r3, [r1, #24]   @ Load FLASHCTL
-        tst     r3, #32                         @ Is chip ready?
-        beq     .SHARP1
-        ldrb    r2, [r1, #20]   @ NAND Manufacturer ID
-        ldrb    r3, [r1, #20]   @ NAND Chip ID
+/* Check for 64MiB flash - if found we have a Shepherd */
+        bl      get_flash_ids
         ldr     r7, .SHEPHERDID
         cmp     r3, #0x76                       @ 64MiB flash
         beq     .SHARPEND                       @ We have Shepherd
+
+/* Must be a Husky */
         ldr     r7, .HUSKYID            @ Must be Husky
         b .SHARPEND
 
+.PXA270:
+/* Check for 16MiB flash - if found we have Spitz */
+        bl      get_flash_ids
+        ldr     r7, .SPITZID
+        cmp     r3, #0x73                       @ 16MiB flash
+        beq     .SHARPEND                       @ We have Spitz
+
+/* Check for a second SCOOP chip - if found we have Borzoi */
+        ldr     r1, .SCOOP2ADDR
+        ldr     r7, .BORZOIID
+        mov     r6, #0x0140
+        strh    r6, [r1]
+        ldrh    r6, [r1]
+        cmp     r6, #0x0140
+        beq     .SHARPEND                       @ We have Borzoi
+
+/* Must be Akita */
+        ldr     r7, .AKITAID
+        b       .SHARPEND                       @ We have Borzoi
+
 .PXA255ID:
         .word   0x69052d00              @ PXA255 Processor ID
+.PXA270ID:
+        .word   0x69054100              @ PXA270 Processor ID
 .W100ID:
         .word   0x57411002              @ w100 Chip ID
 .W100ADDR:
         .word   0x08010000              @ w100 Chip ID Reg Address
+.SCOOP2ADDR:
+        .word   0x08800040
 .POODLEID:
         .word   MACH_TYPE_POODLE
 .CORGIID:
@@ -87,6 +111,41 @@ __SharpSL_start:
         .word   MACH_TYPE_SHEPHERD
 .HUSKYID:
         .word   MACH_TYPE_HUSKY
-.SHARPEND:
+.TOSAID:
+        .word   MACH_TYPE_TOSA
+.SPITZID:
+        .word   MACH_TYPE_SPITZ
+.AKITAID:
+        .word   MACH_TYPE_AKITA
+.BORZOIID:
+        .word   MACH_TYPE_BORZOI
 
+/*
+ * Return: r2 - NAND Manufacturer ID
+ *         r3 - NAND Chip ID
+ * Corrupts: r1
+ */
+get_flash_ids:
+        mov     r1, #0x0c000000         @ Base address of NAND chip
+        ldrb    r3, [r1, #24]           @ Load FLASHCTL
+        bic     r3, r3, #0x11           @ SET NCE
+        orr     r3, r3, #0x0a           @ SET CLR + FLWP
+        strb    r3, [r1, #24]           @ Save to FLASHCTL
+        mov     r2, #0x90               @ Command "readid"
+        strb    r2, [r1, #20]           @ Save to FLASHIO
+        bic     r3, r3, #2              @ CLR CLE
+        orr     r3, r3, #4              @ SET ALE
+        strb    r3, [r1, #24]           @ Save to FLASHCTL
+        mov     r2, #0                  @ Address 0x00
+        strb    r2, [r1, #20]           @ Save to FLASHIO
+        bic     r3, r3, #4              @ CLR ALE
+        strb    r3, [r1, #24]           @ Save to FLASHCTL
+.fids1:
+        ldrb    r3, [r1, #24]           @ Load FLASHCTL
+        tst     r3, #32                 @ Is chip ready?
+        beq     .fids1
+        ldrb    r2, [r1, #20]           @ NAND Manufacturer ID
+        ldrb    r3, [r1, #20]           @ NAND Chip ID
+        mov     pc, lr
 
+.SHARPEND:
diff --git a/arch/arm/common/locomo.c b/arch/arm/common/locomo.c
index 51f430cc2fbf..2786f7c34b3f 100644
--- a/arch/arm/common/locomo.c
+++ b/arch/arm/common/locomo.c
@@ -541,6 +541,103 @@ locomo_init_one_child(struct locomo *lchip, struct locomo_dev_info *info)
         return ret;
 }
 
+#ifdef CONFIG_PM
+
+struct locomo_save_data {
+        u16     LCM_GPO;
+        u16     LCM_SPICT;
+        u16     LCM_GPE;
+        u16     LCM_ASD;
+        u16     LCM_SPIMD;
+};
+
+static int locomo_suspend(struct device *dev, u32 pm_message_t, u32 level)
+{
+        struct locomo *lchip = dev_get_drvdata(dev);
+        struct locomo_save_data *save;
+        unsigned long flags;
+
+        if (level != SUSPEND_DISABLE)
+                return 0;
+
+        save = kmalloc(sizeof(struct locomo_save_data), GFP_KERNEL);
+        if (!save)
+                return -ENOMEM;
+
+        dev->power.saved_state = (void *) save;
+
+        spin_lock_irqsave(&lchip->lock, flags);
+
+        save->LCM_GPO     = locomo_readl(lchip->base + LOCOMO_GPO);     /* GPIO */
+        locomo_writel(0x00, lchip->base + LOCOMO_GPO);
+        save->LCM_SPICT   = locomo_readl(lchip->base + LOCOMO_SPICT);   /* SPI */
+        locomo_writel(0x40, lchip->base + LOCOMO_SPICT);
+        save->LCM_GPE     = locomo_readl(lchip->base + LOCOMO_GPE);     /* GPIO */
+        locomo_writel(0x00, lchip->base + LOCOMO_GPE);
+        save->LCM_ASD     = locomo_readl(lchip->base + LOCOMO_ASD);     /* ADSTART */
+        locomo_writel(0x00, lchip->base + LOCOMO_ASD);
+        save->LCM_SPIMD   = locomo_readl(lchip->base + LOCOMO_SPIMD);   /* SPI */
+        locomo_writel(0x3C14, lchip->base + LOCOMO_SPIMD);
+
+        locomo_writel(0x00, lchip->base + LOCOMO_PAIF);
+        locomo_writel(0x00, lchip->base + LOCOMO_DAC);
+        locomo_writel(0x00, lchip->base + LOCOMO_BACKLIGHT + LOCOMO_TC);
+
+        if ( (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT0) & 0x88) && (locomo_readl(lchip->base + LOCOMO_LED + LOCOMO_LPT1) & 0x88) )
+                locomo_writel(0x00, lchip->base + LOCOMO_C32K);         /* CLK32 off */
+        else
+                /* 18MHz already enabled, so no wait */
+                locomo_writel(0xc1, lchip->base + LOCOMO_C32K);         /* CLK32 on */
+
+        locomo_writel(0x00, lchip->base + LOCOMO_TADC);         /* 18MHz clock off*/
+        locomo_writel(0x00, lchip->base + LOCOMO_AUDIO + LOCOMO_ACC);                   /* 22MHz/24MHz clock off */
+        locomo_writel(0x00, lchip->base + LOCOMO_FRONTLIGHT + LOCOMO_ALS);                      /* FL */
+
+        spin_unlock_irqrestore(&lchip->lock, flags);
+
+        return 0;
+}
+
+static int locomo_resume(struct device *dev, u32 level)
+{
+        struct locomo *lchip = dev_get_drvdata(dev);
+        struct locomo_save_data *save;
+        unsigned long r;
+        unsigned long flags;
+        
+        if (level != RESUME_ENABLE)
+                return 0;
+
+        save = (struct locomo_save_data *) dev->power.saved_state;
+        if (!save)
+                return 0;
+
+        spin_lock_irqsave(&lchip->lock, flags);
+
+        locomo_writel(save->LCM_GPO, lchip->base + LOCOMO_GPO);
+        locomo_writel(save->LCM_SPICT, lchip->base + LOCOMO_SPICT);
+        locomo_writel(save->LCM_GPE, lchip->base + LOCOMO_GPE);
+        locomo_writel(save->LCM_ASD, lchip->base + LOCOMO_ASD);
+        locomo_writel(save->LCM_SPIMD, lchip->base + LOCOMO_SPIMD);
+
+        locomo_writel(0x00, lchip->base + LOCOMO_C32K);
+        locomo_writel(0x90, lchip->base + LOCOMO_TADC);
+
+        locomo_writel(0, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KSC);
+        r = locomo_readl(lchip->base + LOCOMO_KEYBOARD + LOCOMO_KIC);
+        r &= 0xFEFF;
+        locomo_writel(r, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KIC);
+        locomo_writel(0x1, lchip->base + LOCOMO_KEYBOARD + LOCOMO_KCMD);
+
+        spin_unlock_irqrestore(&lchip->lock, flags);
+
+        dev->power.saved_state = NULL;
+        kfree(save);
+
+        return 0;
+}
+#endif
+
 /**
  *      locomo_probe - probe for a single LoCoMo chip.
  *      @phys_addr: physical address of device.
@@ -707,6 +804,10 @@ static struct device_driver locomo_device_driver = {
         .bus            = &platform_bus_type,
         .probe          = locomo_probe,
         .remove         = locomo_remove,
+#ifdef CONFIG_PM
+        .suspend        = locomo_suspend,
+        .resume         = locomo_resume,
+#endif
 };
 
 /*
diff --git a/arch/arm/common/scoop.c b/arch/arm/common/scoop.c
index 688a595598c8..d3a04c2a2c85 100644
--- a/arch/arm/common/scoop.c
+++ b/arch/arm/common/scoop.c
@@ -91,7 +91,7 @@ EXPORT_SYMBOL(read_scoop_reg);
 EXPORT_SYMBOL(write_scoop_reg);
 
 #ifdef CONFIG_PM
-static int scoop_suspend(struct device *dev, uint32_t state, uint32_t level)
+static int scoop_suspend(struct device *dev, pm_message_t state, uint32_t level)
 {
         if (level == SUSPEND_POWER_DOWN) {
                 struct scoop_dev *sdev = dev_get_drvdata(dev);
diff --git a/arch/arm/configs/omap_h2_1610_defconfig b/arch/arm/configs/omap_h2_1610_defconfig
index 24955263b096..4198677cd394 100644
--- a/arch/arm/configs/omap_h2_1610_defconfig
+++ b/arch/arm/configs/omap_h2_1610_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc2
-# Fri Jul  8 04:49:34 2005
+# Linux kernel version: 2.6.13
+# Mon Sep  5 18:07:12 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -102,9 +102,11 @@ CONFIG_OMAP_MUX_WARNINGS=y
 # CONFIG_OMAP_MPU_TIMER is not set
 CONFIG_OMAP_32K_TIMER=y
 CONFIG_OMAP_32K_TIMER_HZ=128
+# CONFIG_OMAP_DM_TIMER is not set
 CONFIG_OMAP_LL_DEBUG_UART1=y
 # CONFIG_OMAP_LL_DEBUG_UART2 is not set
 # CONFIG_OMAP_LL_DEBUG_UART3 is not set
+CONFIG_OMAP_SERIAL_WAKE=y
 
 #
 # OMAP Core Type
@@ -166,7 +168,6 @@ CONFIG_ISA_DMA_API=y
 #
 # Kernel Features
 #
-# CONFIG_SMP is not set
 CONFIG_PREEMPT=y
 CONFIG_NO_IDLE_HZ=y
 # CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
@@ -230,91 +231,82 @@ CONFIG_PM=y
 # CONFIG_APM is not set
 
 #
-# Device Drivers
-#
-
-#
-# Generic Driver Options
-#
-CONFIG_STANDALONE=y
-CONFIG_PREVENT_FIRMWARE_BUILD=y
-# CONFIG_FW_LOADER is not set
-
-#
-# Memory Technology Devices (MTD)
+# Networking
 #
-CONFIG_MTD=y
-CONFIG_MTD_DEBUG=y
-CONFIG_MTD_DEBUG_VERBOSE=3
-# CONFIG_MTD_CONCAT is not set
-CONFIG_MTD_PARTITIONS=y
-# CONFIG_MTD_REDBOOT_PARTS is not set
-CONFIG_MTD_CMDLINE_PARTS=y
-# CONFIG_MTD_AFS_PARTS is not set
+CONFIG_NET=y
 
 #
-# User Modules And Translation Layers
+# Networking options
 #
-CONFIG_MTD_CHAR=y
-CONFIG_MTD_BLOCK=y
-# CONFIG_FTL is not set
-# CONFIG_NFTL is not set
-# CONFIG_INFTL is not set
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_IP_TCPDIAG=y
+# CONFIG_IP_TCPDIAG_IPV6 is not set
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
 
 #
-# RAM/ROM/Flash chip drivers
+# SCTP Configuration (EXPERIMENTAL)
 #
-CONFIG_MTD_CFI=y
-# CONFIG_MTD_JEDECPROBE is not set
-CONFIG_MTD_GEN_PROBE=y
-# CONFIG_MTD_CFI_ADV_OPTIONS is not set
-CONFIG_MTD_MAP_BANK_WIDTH_1=y
-CONFIG_MTD_MAP_BANK_WIDTH_2=y
-CONFIG_MTD_MAP_BANK_WIDTH_4=y
-# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
-# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
-CONFIG_MTD_CFI_I1=y
-CONFIG_MTD_CFI_I2=y
-# CONFIG_MTD_CFI_I4 is not set
-# CONFIG_MTD_CFI_I8 is not set
-CONFIG_MTD_CFI_INTELEXT=y
-# CONFIG_MTD_CFI_AMDSTD is not set
-# CONFIG_MTD_CFI_STAA is not set
-CONFIG_MTD_CFI_UTIL=y
-# CONFIG_MTD_RAM is not set
-# CONFIG_MTD_ROM is not set
-# CONFIG_MTD_ABSENT is not set
-# CONFIG_MTD_XIP is not set
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
 
 #
-# Mapping drivers for chip access
+# Network testing
 #
-# CONFIG_MTD_COMPLEX_MAPPINGS is not set
-# CONFIG_MTD_PHYSMAP is not set
-# CONFIG_MTD_ARM_INTEGRATOR is not set
-# CONFIG_MTD_EDB7312 is not set
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
 
 #
-# Self-contained MTD device drivers
+# Device Drivers
 #
-# CONFIG_MTD_SLRAM is not set
-# CONFIG_MTD_PHRAM is not set
-# CONFIG_MTD_MTDRAM is not set
-# CONFIG_MTD_BLKMTD is not set
-# CONFIG_MTD_BLOCK2MTD is not set
 
 #
-# Disk-On-Chip Device Drivers
+# Generic Driver Options
 #
-# CONFIG_MTD_DOC2000 is not set
-# CONFIG_MTD_DOC2001 is not set
-# CONFIG_MTD_DOC2001PLUS is not set
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
 
 #
-# NAND Flash Device Drivers
+# Memory Technology Devices (MTD)
 #
-# CONFIG_MTD_NAND is not set
+# CONFIG_MTD is not set
 
 #
 # Parallel port support
@@ -403,72 +395,8 @@ CONFIG_SCSI_PROC_FS=y
 #
 
 #
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
-#
-CONFIG_PACKET=y
-# CONFIG_PACKET_MMAP is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_FIB_HASH=y
-CONFIG_IP_PNP=y
-CONFIG_IP_PNP_DHCP=y
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_TCP_CONG_ADVANCED is not set
-CONFIG_TCP_CONG_BIC=y
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
+# Network device support
 #
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
@@ -518,6 +446,8 @@ CONFIG_SLIP_COMPRESSED=y
 # CONFIG_SLIP_MODE_SLIP6 is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -615,77 +545,15 @@ CONFIG_WATCHDOG_NOWAYOUT=y
 #
 # I2C support
 #
-CONFIG_I2C=y
-CONFIG_I2C_CHARDEV=y
-
-#
-# I2C Algorithms
-#
-# CONFIG_I2C_ALGOBIT is not set
-# CONFIG_I2C_ALGOPCF is not set
-# CONFIG_I2C_ALGOPCA is not set
-
-#
-# I2C Hardware Bus support
-#
-# CONFIG_I2C_ISA is not set
-# CONFIG_I2C_PARPORT_LIGHT is not set
-# CONFIG_I2C_STUB is not set
-# CONFIG_I2C_PCA_ISA is not set
+# CONFIG_I2C is not set
+# CONFIG_I2C_SENSOR is not set
+CONFIG_ISP1301_OMAP=y
 
 #
-# Hardware Sensors Chip support
+# Hardware Monitoring support
 #
-# CONFIG_I2C_SENSOR is not set
-# CONFIG_SENSORS_ADM1021 is not set
-# CONFIG_SENSORS_ADM1025 is not set
-# CONFIG_SENSORS_ADM1026 is not set
-# CONFIG_SENSORS_ADM1031 is not set
-# CONFIG_SENSORS_ADM9240 is not set
-# CONFIG_SENSORS_ASB100 is not set
-# CONFIG_SENSORS_ATXP1 is not set
-# CONFIG_SENSORS_DS1621 is not set
-# CONFIG_SENSORS_FSCHER is not set
-# CONFIG_SENSORS_FSCPOS is not set
-# CONFIG_SENSORS_GL518SM is not set
-# CONFIG_SENSORS_GL520SM is not set
-# CONFIG_SENSORS_IT87 is not set
-# CONFIG_SENSORS_LM63 is not set
-# CONFIG_SENSORS_LM75 is not set
-# CONFIG_SENSORS_LM77 is not set
-# CONFIG_SENSORS_LM78 is not set
-# CONFIG_SENSORS_LM80 is not set
-# CONFIG_SENSORS_LM83 is not set
-# CONFIG_SENSORS_LM85 is not set
-# CONFIG_SENSORS_LM87 is not set
-# CONFIG_SENSORS_LM90 is not set
-# CONFIG_SENSORS_LM92 is not set
-# CONFIG_SENSORS_MAX1619 is not set
-# CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
-# CONFIG_SENSORS_SMSC47M1 is not set
-# CONFIG_SENSORS_W83781D is not set
-# CONFIG_SENSORS_W83L785TS is not set
-# CONFIG_SENSORS_W83627HF is not set
-# CONFIG_SENSORS_W83627EHF is not set
-
-#
-# Other I2C Chip support
-#
-# CONFIG_SENSORS_DS1337 is not set
-# CONFIG_SENSORS_DS1374 is not set
-# CONFIG_SENSORS_EEPROM is not set
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCA9539 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-CONFIG_ISP1301_OMAP=y
-CONFIG_TPS65010=y
-# CONFIG_SENSORS_MAX6875 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
+CONFIG_HWMON=y
+# CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
 # Misc devices
@@ -756,15 +624,9 @@ CONFIG_SOUND=y
 # Open Sound System
 #
 CONFIG_SOUND_PRIME=y
-# CONFIG_SOUND_BT878 is not set
-# CONFIG_SOUND_FUSION is not set
-# CONFIG_SOUND_CS4281 is not set
-# CONFIG_SOUND_SONICVIBES is not set
-# CONFIG_SOUND_TRIDENT is not set
 # CONFIG_SOUND_MSNDCLAS is not set
 # CONFIG_SOUND_MSNDPIN is not set
 # CONFIG_SOUND_OSS is not set
-# CONFIG_SOUND_TVMIXER is not set
 # CONFIG_SOUND_AD1980 is not set
 
 #
@@ -810,6 +672,7 @@ CONFIG_EXT2_FS=y
 # CONFIG_JBD is not set
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
 
 #
 # XFS support
@@ -817,6 +680,7 @@ CONFIG_EXT2_FS=y
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=y
+CONFIG_INOTIFY=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -857,15 +721,6 @@ CONFIG_RAMFS=y
 # CONFIG_BEFS_FS is not set
 # CONFIG_BFS_FS is not set
 # CONFIG_EFS_FS is not set
-# CONFIG_JFFS_FS is not set
-CONFIG_JFFS2_FS=y
-CONFIG_JFFS2_FS_DEBUG=2
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
-# CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
-CONFIG_JFFS2_ZLIB=y
-CONFIG_JFFS2_RTIME=y
-# CONFIG_JFFS2_RUBIN is not set
 CONFIG_CRAMFS=y
 # CONFIG_VXFS_FS is not set
 # CONFIG_HPFS_FS is not set
@@ -1007,4 +862,3 @@ CONFIG_CRYPTO_DES=y
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C is not set
 CONFIG_ZLIB_INFLATE=y
-CONFIG_ZLIB_DEFLATE=y
diff --git a/arch/arm/configs/s3c2410_defconfig b/arch/arm/configs/s3c2410_defconfig
index 96a794d8de84..756348bf5170 100644
--- a/arch/arm/configs/s3c2410_defconfig
+++ b/arch/arm/configs/s3c2410_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.12-git4
-# Wed Jun 22 15:56:42 2005
+# Linux kernel version: 2.6.13-git8
+# Thu Sep  8 19:24:02 2005
 #
 CONFIG_ARM=y
 CONFIG_MMU=y
@@ -22,6 +22,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 # CONFIG_POSIX_MQUEUE is not set
@@ -31,6 +32,7 @@ CONFIG_SYSCTL=y
 # CONFIG_HOTPLUG is not set
 CONFIG_KOBJECT_UEVENT=y
 # CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 # CONFIG_KALLSYMS_ALL is not set
@@ -88,7 +90,9 @@ CONFIG_ARCH_S3C2410=y
 #
 # S3C24XX Implementations
 #
+CONFIG_MACH_ANUBIS=y
 CONFIG_ARCH_BAST=y
+CONFIG_BAST_PC104_IRQ=y
 CONFIG_ARCH_H1940=y
 CONFIG_MACH_N30=y
 CONFIG_ARCH_SMDK2410=y
@@ -112,6 +116,7 @@ CONFIG_S3C2410_DMA=y
 # CONFIG_S3C2410_DMA_DEBUG is not set
 # CONFIG_S3C2410_PM_DEBUG is not set
 # CONFIG_S3C2410_PM_CHECK is not set
+CONFIG_PM_SIMTEC=y
 CONFIG_S3C2410_LOWLEVEL_UART_PORT=0
 
 #
@@ -149,7 +154,15 @@ CONFIG_ISA_DMA_API=y
 #
 # CONFIG_SMP is not set
 # CONFIG_PREEMPT is not set
-# CONFIG_DISCONTIGMEM is not set
+# CONFIG_NO_IDLE_HZ is not set
+# CONFIG_ARCH_DISCONTIGMEM_ENABLE is not set
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_ALIGNMENT_TRAP=y
 
 #
@@ -186,6 +199,74 @@ CONFIG_PM=y
 CONFIG_APM=y
 
 #
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+# CONFIG_PACKET is not set
+CONFIG_UNIX=y
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+# CONFIG_IP_MULTICAST is not set
+# CONFIG_IP_ADVANCED_ROUTER is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+# CONFIG_NET_IPIP is not set
+# CONFIG_NET_IPGRE is not set
+# CONFIG_ARPD is not set
+# CONFIG_SYN_COOKIES is not set
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+# CONFIG_INET_TUNNEL is not set
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+# CONFIG_TCP_CONG_ADVANCED is not set
+CONFIG_TCP_CONG_BIC=y
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
 # Device Drivers
 #
 
@@ -258,6 +339,7 @@ CONFIG_MTD_ROM=y
 # CONFIG_MTD_IMPA7 is not set
 CONFIG_MTD_BAST=y
 CONFIG_MTD_BAST_MAXSIZE=4
+# CONFIG_MTD_PLATRAM is not set
 
 #
 # Self-contained MTD device drivers
@@ -312,7 +394,6 @@ CONFIG_BLK_DEV_RAM=y
 CONFIG_BLK_DEV_RAM_COUNT=16
 CONFIG_BLK_DEV_RAM_SIZE=4096
 CONFIG_BLK_DEV_INITRD=y
-CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_CDROM_PKTCDVD is not set
 
 #
@@ -354,6 +435,7 @@ CONFIG_BLK_DEV_IDE_BAST=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 # CONFIG_SCSI is not set
 
 #
@@ -376,70 +458,8 @@ CONFIG_BLK_DEV_IDE_BAST=y
 #
 
 #
-# Networking support
-#
-CONFIG_NET=y
-
-#
-# Networking options
+# Network device support
 #
-# CONFIG_PACKET is not set
-CONFIG_UNIX=y
-# CONFIG_NET_KEY is not set
-CONFIG_INET=y
-CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_FIB_TRIE is not set
-# CONFIG_IP_MULTICAST is not set
-# CONFIG_IP_ADVANCED_ROUTER is not set
-CONFIG_IP_PNP=y
-# CONFIG_IP_PNP_DHCP is not set
-CONFIG_IP_PNP_BOOTP=y
-# CONFIG_IP_PNP_RARP is not set
-# CONFIG_NET_IPIP is not set
-# CONFIG_NET_IPGRE is not set
-# CONFIG_ARPD is not set
-# CONFIG_SYN_COOKIES is not set
-# CONFIG_INET_AH is not set
-# CONFIG_INET_ESP is not set
-# CONFIG_INET_IPCOMP is not set
-# CONFIG_INET_TUNNEL is not set
-CONFIG_IP_TCPDIAG=y
-# CONFIG_IP_TCPDIAG_IPV6 is not set
-# CONFIG_IPV6 is not set
-# CONFIG_NETFILTER is not set
-
-#
-# SCTP Configuration (EXPERIMENTAL)
-#
-# CONFIG_IP_SCTP is not set
-# CONFIG_ATM is not set
-# CONFIG_BRIDGE is not set
-# CONFIG_VLAN_8021Q is not set
-# CONFIG_DECNET is not set
-# CONFIG_LLC2 is not set
-# CONFIG_IPX is not set
-# CONFIG_ATALK is not set
-# CONFIG_X25 is not set
-# CONFIG_LAPB is not set
-# CONFIG_NET_DIVERT is not set
-# CONFIG_ECONET is not set
-# CONFIG_WAN_ROUTER is not set
-
-#
-# QoS and/or fair queueing
-#
-# CONFIG_NET_SCHED is not set
-# CONFIG_NET_CLS_ROUTE is not set
-
-#
-# Network testing
-#
-# CONFIG_NET_PKTGEN is not set
-# CONFIG_NETPOLL is not set
-# CONFIG_NET_POLL_CONTROLLER is not set
-# CONFIG_HAMRADIO is not set
-# CONFIG_IRDA is not set
-# CONFIG_BT is not set
 CONFIG_NETDEVICES=y
 # CONFIG_DUMMY is not set
 # CONFIG_BONDING is not set
@@ -447,6 +467,11 @@ CONFIG_NETDEVICES=y
 # CONFIG_TUN is not set
 
 #
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
@@ -480,6 +505,8 @@ CONFIG_DM9000=m
 # CONFIG_SLIP is not set
 # CONFIG_SHAPER is not set
 # CONFIG_NETCONSOLE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
 
 #
 # ISDN subsystem
@@ -562,7 +589,6 @@ CONFIG_SERIAL_8250_EXTENDED=y
 CONFIG_SERIAL_8250_MANY_PORTS=y
 CONFIG_SERIAL_8250_SHARE_IRQ=y
 # CONFIG_SERIAL_8250_DETECT_IRQ is not set
-# CONFIG_SERIAL_8250_MULTIPORT is not set
 # CONFIG_SERIAL_8250_RSA is not set
 
 #
@@ -605,7 +631,6 @@ CONFIG_S3C2410_RTC=y
 #
 # Ftape, the floppy tape device driver
 #
-# CONFIG_DRM is not set
 # CONFIG_RAW_DRIVER is not set
 
 #
@@ -628,7 +653,7 @@ CONFIG_I2C_ALGOBIT=m
 #
 # I2C Hardware Bus support
 #
-# CONFIG_I2C_ISA is not set
+CONFIG_I2C_ISA=m
 # CONFIG_I2C_PARPORT is not set
 # CONFIG_I2C_PARPORT_LIGHT is not set
 CONFIG_I2C_S3C2410=y
@@ -636,14 +661,33 @@ CONFIG_I2C_S3C2410=y
 # CONFIG_I2C_PCA_ISA is not set
 
 #
-# Hardware Sensors Chip support
+# Miscellaneous I2C Chip support
 #
-CONFIG_I2C_SENSOR=m
+# CONFIG_SENSORS_DS1337 is not set
+# CONFIG_SENSORS_DS1374 is not set
+CONFIG_SENSORS_EEPROM=m
+# CONFIG_SENSORS_PCF8574 is not set
+# CONFIG_SENSORS_PCA9539 is not set
+# CONFIG_SENSORS_PCF8591 is not set
+# CONFIG_SENSORS_RTC8564 is not set
+# CONFIG_SENSORS_MAX6875 is not set
+# CONFIG_I2C_DEBUG_CORE is not set
+# CONFIG_I2C_DEBUG_ALGO is not set
+# CONFIG_I2C_DEBUG_BUS is not set
+# CONFIG_I2C_DEBUG_CHIP is not set
+
+#
+# Hardware Monitoring support
+#
+CONFIG_HWMON=y
+CONFIG_HWMON_VID=m
 # CONFIG_SENSORS_ADM1021 is not set
 # CONFIG_SENSORS_ADM1025 is not set
 # CONFIG_SENSORS_ADM1026 is not set
 # CONFIG_SENSORS_ADM1031 is not set
+# CONFIG_SENSORS_ADM9240 is not set
 # CONFIG_SENSORS_ASB100 is not set
+# CONFIG_SENSORS_ATXP1 is not set
 # CONFIG_SENSORS_DS1621 is not set
 # CONFIG_SENSORS_FSCHER is not set
 # CONFIG_SENSORS_FSCPOS is not set
@@ -662,27 +706,21 @@ CONFIG_SENSORS_LM85=m
 # CONFIG_SENSORS_LM92 is not set
 # CONFIG_SENSORS_MAX1619 is not set
 # CONFIG_SENSORS_PC87360 is not set
-# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_SMSC47M1 is not set
+# CONFIG_SENSORS_SMSC47B397 is not set
 # CONFIG_SENSORS_W83781D is not set
+# CONFIG_SENSORS_W83792D is not set
 # CONFIG_SENSORS_W83L785TS is not set
 # CONFIG_SENSORS_W83627HF is not set
+# CONFIG_SENSORS_W83627EHF is not set
+# CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
-# Other I2C Chip support
+# Misc devices
 #
-# CONFIG_SENSORS_DS1337 is not set
-CONFIG_SENSORS_EEPROM=m
-# CONFIG_SENSORS_PCF8574 is not set
-# CONFIG_SENSORS_PCF8591 is not set
-# CONFIG_SENSORS_RTC8564 is not set
-# CONFIG_I2C_DEBUG_CORE is not set
-# CONFIG_I2C_DEBUG_ALGO is not set
-# CONFIG_I2C_DEBUG_BUS is not set
-# CONFIG_I2C_DEBUG_CHIP is not set
 
 #
-# Misc devices
+# Multimedia Capabilities Port drivers
 #
 
 #
@@ -731,7 +769,7 @@ CONFIG_DUMMY_CONSOLE=y
 # USB support
 #
 CONFIG_USB_ARCH_HAS_HCD=y
-# CONFIG_USB_ARCH_HAS_OHCI is not set
+CONFIG_USB_ARCH_HAS_OHCI=y
 # CONFIG_USB is not set
 
 #
@@ -749,6 +787,7 @@ CONFIG_USB_ARCH_HAS_HCD=y
 #
 CONFIG_EXT2_FS=y
 # CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
 CONFIG_EXT3_FS=y
 CONFIG_EXT3_FS_XATTR=y
 # CONFIG_EXT3_FS_POSIX_ACL is not set
@@ -758,6 +797,7 @@ CONFIG_JBD=y
 CONFIG_FS_MBCACHE=y
 # CONFIG_REISERFS_FS is not set
 # CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
 
 #
 # XFS support
@@ -765,6 +805,7 @@ CONFIG_FS_MBCACHE=y
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 CONFIG_ROMFS_FS=y
+CONFIG_INOTIFY=y
 # CONFIG_QUOTA is not set
 CONFIG_DNOTIFY=y
 # CONFIG_AUTOFS_FS is not set
@@ -791,11 +832,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 #
 CONFIG_PROC_FS=y
 CONFIG_SYSFS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
 # CONFIG_TMPFS is not set
 # CONFIG_HUGETLBFS is not set
 # CONFIG_HUGETLB_PAGE is not set
 CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -812,8 +853,7 @@ CONFIG_JFFS_FS_VERBOSE=0
 # CONFIG_JFFS_PROC_FS is not set
 CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_DEBUG=0
-# CONFIG_JFFS2_FS_NAND is not set
-# CONFIG_JFFS2_FS_NOR_ECC is not set
+CONFIG_JFFS2_FS_WRITEBUFFER=y
 # CONFIG_JFFS2_COMPRESSION_OPTIONS is not set
 CONFIG_JFFS2_ZLIB=y
 CONFIG_JFFS2_RTIME=y
@@ -835,6 +875,7 @@ CONFIG_NFS_FS=y
 # CONFIG_NFSD is not set
 CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
+CONFIG_NFS_COMMON=y
 CONFIG_SUNRPC=y
 # CONFIG_RPCSEC_GSS_KRB5 is not set
 # CONFIG_RPCSEC_GSS_SPKM3 is not set
@@ -920,6 +961,7 @@ CONFIG_NLS_DEFAULT="iso8859-1"
 CONFIG_DEBUG_KERNEL=y
 # CONFIG_MAGIC_SYSRQ is not set
 CONFIG_LOG_BUF_SHIFT=16
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S
index db07ce42b3b2..949ec4427f21 100644
--- a/arch/arm/kernel/calls.S
+++ b/arch/arm/kernel/calls.S
@@ -10,7 +10,7 @@
  *  This file is included twice in entry-common.S
  */
 #ifndef NR_syscalls
-#define NR_syscalls 320
+#define NR_syscalls 328
 #else
 
 __syscall_start:
@@ -333,6 +333,9 @@ __syscall_start:
                 .long   sys_inotify_init
                 .long   sys_inotify_add_watch
                 .long   sys_inotify_rm_watch
+                .long   sys_mbind_wrapper
+/* 320 */       .long   sys_get_mempolicy
+                .long   sys_set_mempolicy
 __syscall_end:
 
                 .rept   NR_syscalls - (__syscall_end - __syscall_start) / 4
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 6281d488ac97..db302c6e5343 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -269,6 +269,10 @@ sys_arm_fadvise64_64_wrapper:
                 str     r5, [sp, #4]            @ push r5 to stack
                 b       sys_arm_fadvise64_64
 
+sys_mbind_wrapper:
+                str     r5, [sp, #4]
+                b       sys_mbind
+
 /*
  * Note: off_4k (r5) is always units of 4K.  If we can't do the requested
  * offset, we return EINVAL.
diff --git a/arch/arm/kernel/entry-header.S b/arch/arm/kernel/entry-header.S
index afef21273963..648cfff93138 100644
--- a/arch/arm/kernel/entry-header.S
+++ b/arch/arm/kernel/entry-header.S
@@ -3,7 +3,7 @@
 #include <linux/linkage.h>
 
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>
 
diff --git a/arch/arm/kernel/head.S b/arch/arm/kernel/head.S
index 1155cf07c871..539626351348 100644
--- a/arch/arm/kernel/head.S
+++ b/arch/arm/kernel/head.S
@@ -20,7 +20,7 @@
 #include <asm/mach-types.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/system.h>
 
diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
index 8f74e24536ba..24c7b0477a09 100644
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@ -17,7 +17,7 @@
 #include <linux/linkage.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
 #define MMX_WR0                 (0x00)
 #define MMX_WR1                 (0x08)
diff --git a/arch/arm/kernel/time.c b/arch/arm/kernel/time.c
index 8880482dcbff..69449a818dcc 100644
--- a/arch/arm/kernel/time.c
+++ b/arch/arm/kernel/time.c
@@ -102,7 +102,7 @@ static unsigned long next_rtc_update;
  */
 static inline void do_set_rtc(void)
 {
-        if (time_status & STA_UNSYNC || set_rtc == NULL)
+        if (!ntp_synced() || set_rtc == NULL)
                 return;
 
         if (next_rtc_update &&
@@ -292,10 +292,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 4c38abdbe497..68117968482b 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
 #define COPY_COUNT (PAGE_SZ/64 PLD( -1 ))
 
diff --git a/arch/arm/lib/csumpartialcopyuser.S b/arch/arm/lib/csumpartialcopyuser.S
index 46a2dc962e9d..333bca292de9 100644
--- a/arch/arm/lib/csumpartialcopyuser.S
+++ b/arch/arm/lib/csumpartialcopyuser.S
@@ -13,7 +13,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/errno.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
                 .text
 
diff --git a/arch/arm/lib/getuser.S b/arch/arm/lib/getuser.S
index 64aa6f4fe5e4..d204018070a4 100644
--- a/arch/arm/lib/getuser.S
+++ b/arch/arm/lib/getuser.S
@@ -26,7 +26,7 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000.
  * Note also that it is intended that __get_user_bad is not global.
  */
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/errno.h>
 
diff --git a/arch/arm/lib/putuser.S b/arch/arm/lib/putuser.S
index b09398d95aac..4593e9c07f05 100644
--- a/arch/arm/lib/putuser.S
+++ b/arch/arm/lib/putuser.S
@@ -26,7 +26,7 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000
  * Note also that it is intended that __put_user_bad is not global.
  */
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/errno.h>
 
diff --git a/arch/arm/mach-clps7500/core.c b/arch/arm/mach-clps7500/core.c
index 112f1d68fb2b..e216ab8b9e8f 100644
--- a/arch/arm/mach-clps7500/core.c
+++ b/arch/arm/mach-clps7500/core.c
@@ -354,7 +354,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-ebsa110/core.c b/arch/arm/mach-ebsa110/core.c
index 23c4da10101b..5aeadfd72143 100644
--- a/arch/arm/mach-ebsa110/core.c
+++ b/arch/arm/mach-ebsa110/core.c
@@ -219,7 +219,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-epxa10db/arch.c b/arch/arm/mach-epxa10db/arch.c
index 7daa021676d0..44c56571d183 100644
--- a/arch/arm/mach-epxa10db/arch.c
+++ b/arch/arm/mach-epxa10db/arch.c
@@ -52,7 +52,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-footbridge/Kconfig b/arch/arm/mach-footbridge/Kconfig
index 324d9edeec38..bdd257921cfb 100644
--- a/arch/arm/mach-footbridge/Kconfig
+++ b/arch/arm/mach-footbridge/Kconfig
@@ -87,6 +87,7 @@ config FOOTBRIDGE_ADDIN
 
 # EBSA285 board in either host or addin mode
 config ARCH_EBSA285
+        select ARCH_MAY_HAVE_PC_FDC
         bool
 
 endif
diff --git a/arch/arm/mach-footbridge/isa.c b/arch/arm/mach-footbridge/isa.c
index aa3a1fef563e..28846c7edaaf 100644
--- a/arch/arm/mach-footbridge/isa.c
+++ b/arch/arm/mach-footbridge/isa.c
@@ -34,7 +34,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-h720x/cpu-h7202.c b/arch/arm/mach-h720x/cpu-h7202.c
index 4b3199319e68..a4a7c0125d03 100644
--- a/arch/arm/mach-h720x/cpu-h7202.c
+++ b/arch/arm/mach-h720x/cpu-h7202.c
@@ -90,7 +90,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-iop3xx/iop321-time.c b/arch/arm/mach-iop3xx/iop321-time.c
index d53af1669502..0039793b694a 100644
--- a/arch/arm/mach-iop3xx/iop321-time.c
+++ b/arch/arm/mach-iop3xx/iop321-time.c
@@ -60,7 +60,7 @@ static unsigned long iop321_gettimeoffset(void)
         /*
          * Now convert them to usec.
          */
-        usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;
+        usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000));
 
         return usec;
 }
diff --git a/arch/arm/mach-iop3xx/iop331-time.c b/arch/arm/mach-iop3xx/iop331-time.c
index 1a6d9d661e4b..8eddfac7e2b0 100644
--- a/arch/arm/mach-iop3xx/iop331-time.c
+++ b/arch/arm/mach-iop3xx/iop331-time.c
@@ -58,7 +58,7 @@ static unsigned long iop331_gettimeoffset(void)
         /*
          * Now convert them to usec.
          */
-        usec = (unsigned long)(elapsed * (tick_nsec / 1000)) / LATCH;
+        usec = (unsigned long)(elapsed / (CLOCK_TICK_RATE/1000000));
 
         return usec;
 }
diff --git a/arch/arm/mach-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 781d10ae00b7..74bd2fd602d4 100644
--- a/arch/arm/mach-ixp2000/core.c
+++ b/arch/arm/mach-ixp2000/core.c
@@ -174,7 +174,7 @@ static struct resource ixp2000_uart_resource = {
 
 static struct platform_device ixp2000_serial_device = {
         .name           = "serial8250",
-        .id             = 0,
+        .id             = PLAT8250_DEV_PLATFORM,
         .dev            = {
                 .platform_data          = ixp2000_serial_port,
         },
@@ -382,7 +382,7 @@ static void ixp2000_GPIO_irq_unmask(unsigned int irq)
 static struct irqchip ixp2000_GPIO_irq_chip = {
         .ack            = ixp2000_GPIO_irq_mask_ack,
         .mask           = ixp2000_GPIO_irq_mask,
-        .unmask         = ixp2000_GPIO_irq_unmask
+        .unmask         = ixp2000_GPIO_irq_unmask,
         .set_type       = ixp2000_GPIO_irq_type,
 };
 
diff --git a/arch/arm/mach-ixp4xx/common.c b/arch/arm/mach-ixp4xx/common.c
index 0422e906cc9a..52ad11328e96 100644
--- a/arch/arm/mach-ixp4xx/common.c
+++ b/arch/arm/mach-ixp4xx/common.c
@@ -179,17 +179,17 @@ static void ixp4xx_irq_level_unmask(unsigned int irq)
 }
 
 static struct irqchip ixp4xx_irq_level_chip = {
-        .ack    = ixp4xx_irq_mask,
-        .mask   = ixp4xx_irq_mask,
-        .unmask = ixp4xx_irq_level_unmask,
-        .type   = ixp4xx_set_irq_type
+        .ack            = ixp4xx_irq_mask,
+        .mask           = ixp4xx_irq_mask,
+        .unmask         = ixp4xx_irq_level_unmask,
+        .set_type       = ixp4xx_set_irq_type,
 };
 
 static struct irqchip ixp4xx_irq_edge_chip = {
-        .ack    = ixp4xx_irq_ack,
-        .mask   = ixp4xx_irq_mask,
-        .unmask = ixp4xx_irq_unmask,
-        .type   = ixp4xx_set_irq_type
+        .ack            = ixp4xx_irq_ack,
+        .mask           = ixp4xx_irq_mask,
+        .unmask         = ixp4xx_irq_unmask,
+        .set_type       = ixp4xx_set_irq_type,
 };
 
 static void ixp4xx_config_irq(unsigned irq, enum ixp4xx_irq_type type)
diff --git a/arch/arm/mach-ixp4xx/coyote-setup.c b/arch/arm/mach-ixp4xx/coyote-setup.c
index 8b2f25322452..050c92768913 100644
--- a/arch/arm/mach-ixp4xx/coyote-setup.c
+++ b/arch/arm/mach-ixp4xx/coyote-setup.c
@@ -66,7 +66,7 @@ static struct plat_serial8250_port coyote_uart_data[] = {
 
 static struct platform_device coyote_uart = {
         .name           = "serial8250",
-        .id             = 0,
+        .id             = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = coyote_uart_data,
         },
diff --git a/arch/arm/mach-ixp4xx/gtwx5715-setup.c b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
index 3fd92c5cbaa8..29a6d02fa851 100644
--- a/arch/arm/mach-ixp4xx/gtwx5715-setup.c
+++ b/arch/arm/mach-ixp4xx/gtwx5715-setup.c
@@ -93,7 +93,7 @@ static struct plat_serial8250_port gtwx5715_uart_platform_data[] = {
 
 static struct platform_device gtwx5715_uart_device = {
         .name           = "serial8250",
-        .id             = 0,
+        .id             = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = gtwx5715_uart_platform_data,
         },
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 6c14ff3c23a0..ae1fa099d5fa 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -96,7 +96,7 @@ static struct plat_serial8250_port ixdp425_uart_data[] = {
 
 static struct platform_device ixdp425_uart = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev.platform_data      = ixdp425_uart_data,
         .num_resources          = 2,
         .resource               = ixdp425_uart_resources
diff --git a/arch/arm/mach-omap1/Kconfig b/arch/arm/mach-omap1/Kconfig
index 7408ac94f771..27fc2e8e5fca 100644
--- a/arch/arm/mach-omap1/Kconfig
+++ b/arch/arm/mach-omap1/Kconfig
@@ -47,6 +47,14 @@ config MACH_OMAP_OSK
           TI OMAP 5912 OSK (OMAP Starter Kit) board support. Say Y here
           if you have such a board.
 
+config OMAP_OSK_MISTRAL
+        bool "Mistral QVGA board Support"
+        depends on MACH_OMAP_OSK
+        help
+          The OSK supports an optional add-on board with a Quarter-VGA
+          touchscreen, PDA-ish buttons, a resume button, bicolor LED,
+          and camera connector.  Say Y here if you have this board.
+
 config MACH_OMAP_PERSEUS2
         bool "TI Perseus2"
         depends on ARCH_OMAP1 && ARCH_OMAP730
diff --git a/arch/arm/mach-omap1/Makefile b/arch/arm/mach-omap1/Makefile
index d386fd913f0c..181a93deaaee 100644
--- a/arch/arm/mach-omap1/Makefile
+++ b/arch/arm/mach-omap1/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := io.o id.o irq.o time.o serial.o
+obj-y := io.o id.o irq.o time.o serial.o devices.o
 led-y := leds.o
 
 # Specific board support
@@ -23,6 +23,7 @@ endif
 
 # LEDs support
 led-$(CONFIG_MACH_OMAP_H2)              += leds-h2p2-debug.o
+led-$(CONFIG_MACH_OMAP_H3)              += leds-h2p2-debug.o
 led-$(CONFIG_MACH_OMAP_INNOVATOR)       += leds-innovator.o
 led-$(CONFIG_MACH_OMAP_PERSEUS2)        += leds-h2p2-debug.o
 led-$(CONFIG_MACH_OMAP_OSK)             += leds-osk.o
diff --git a/arch/arm/mach-omap1/board-generic.c b/arch/arm/mach-omap1/board-generic.c
index 122796ebe8f5..c209c7172a9a 100644
--- a/arch/arm/mach-omap1/board-generic.c
+++ b/arch/arm/mach-omap1/board-generic.c
@@ -48,19 +48,43 @@ static struct omap_usb_config generic1510_usb_config __initdata = {
 
 #if defined(CONFIG_ARCH_OMAP16XX)
 static struct omap_usb_config generic1610_usb_config __initdata = {
+#ifdef CONFIG_USB_OTG
+        .otg            = 1,
+#endif
         .register_host  = 1,
         .register_dev   = 1,
         .hmc_mode       = 16,
         .pins[0]        = 6,
 };
+
+static struct omap_mmc_config generic_mmc_config __initdata = {
+        .mmc [0] = {
+                .enabled        = 0,
+                .wire4          = 0,
+                .wp_pin         = -1,
+                .power_pin      = -1,
+                .switch_pin     = -1,
+        },
+        .mmc [1] = {
+                .enabled        = 0,
+                .wire4          = 0,
+                .wp_pin         = -1,
+                .power_pin      = -1,
+                .switch_pin     = -1,
+        },
+};
+
 #endif
 
 static struct omap_board_config_kernel generic_config[] = {
         { OMAP_TAG_USB,           NULL },
+        { OMAP_TAG_MMC,           &generic_mmc_config },
 };
 
 static void __init omap_generic_init(void)
 {
+        const struct omap_uart_config *uart_conf;
+
         /*
          * Make sure the serial ports are muxed on at this point.
          * You have to mux them off in device drivers later on
@@ -76,6 +100,18 @@ static void __init omap_generic_init(void)
                 generic_config[0].data = &generic1610_usb_config;
         }
 #endif
+
+        uart_conf = omap_get_config(OMAP_TAG_UART, struct omap_uart_config);
+        if (uart_conf != NULL) {
+                unsigned int enabled_ports, i;
+
+                enabled_ports = uart_conf->enabled_uarts;
+                for (i = 0; i < 3; i++) {
+                        if (!(enabled_ports & (1 << i)))
+                                generic_serial_ports[i] = 0;
+                }
+        }
+
         omap_board_config = generic_config;
         omap_board_config_size = ARRAY_SIZE(generic_config);
         omap_serial_init(generic_serial_ports);
@@ -83,7 +119,7 @@ static void __init omap_generic_init(void)
 
 static void __init omap_generic_map_io(void)
 {
-        omap_map_common_io()
+        omap_map_common_io();
 }
 
 MACHINE_START(OMAP_GENERIC, "Generic OMAP1510/1610/1710")
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index f4983ee95ab4..d46a70063b0c 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -33,6 +33,7 @@
 #include <asm/mach/map.h>
 
 #include <asm/arch/gpio.h>
+#include <asm/arch/mux.h>
 #include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
 #include <asm/arch/common.h>
@@ -80,8 +81,7 @@ static struct flash_platform_data h2_flash_data = {
 };
 
 static struct resource h2_flash_resource = {
-        .start          = OMAP_CS2B_PHYS,
-        .end            = OMAP_CS2B_PHYS + OMAP_CS2B_SIZE - 1,
+        /* This is on CS3, wherever it's mapped */
         .flags          = IORESOURCE_MEM,
 };
 
@@ -126,10 +126,9 @@ static void __init h2_init_smc91x(void)
                 printk("Error requesting gpio 0 for smc91x irq\n");
                 return;
         }
-        omap_set_gpio_edge_ctrl(0, OMAP_GPIO_FALLING_EDGE);
 }
 
-void h2_init_irq(void)
+static void __init h2_init_irq(void)
 {
         omap_init_irq();
         omap_gpio_init();
@@ -152,9 +151,13 @@ static struct omap_usb_config h2_usb_config __initdata = {
 };
 
 static struct omap_mmc_config h2_mmc_config __initdata = {
-        .mmc_blocks             = 1,
-        .mmc1_power_pin         = -1,   /* tps65010 gpio3 */
-        .mmc1_switch_pin        = OMAP_MPUIO(1),
+        .mmc [0] = {
+                .enabled        = 1,
+                .wire4          = 1,
+                .wp_pin         = OMAP_MPUIO(3),
+                .power_pin      = -1,   /* tps65010 gpio3 */
+                .switch_pin     = OMAP_MPUIO(1),
+        },
 };
 
 static struct omap_board_config_kernel h2_config[] = {
@@ -164,6 +167,16 @@ static struct omap_board_config_kernel h2_config[] = {
 
 static void __init h2_init(void)
 {
+        /* NOTE: revC boards support NAND-boot, which can put NOR on CS2B
+         * and NAND (either 16bit or 8bit) on CS3.
+         */
+        h2_flash_resource.end = h2_flash_resource.start = omap_cs3_phys();
+        h2_flash_resource.end += SZ_32M - 1;
+
+        /* MMC:  card detect and WP */
+        // omap_cfg_reg(U19_ARMIO1);            /* CD */
+        omap_cfg_reg(BALLOUT_V8_ARMIO3);        /* WP */
+
         platform_add_devices(h2_devices, ARRAY_SIZE(h2_devices));
         omap_board_config = h2_config;
         omap_board_config_size = ARRAY_SIZE(h2_config);
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 7cd419d61b40..2798613696fa 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -82,8 +82,7 @@ static struct flash_platform_data h3_flash_data = {
 };
 
 static struct resource h3_flash_resource = {
-        .start          = OMAP_CS2B_PHYS,
-        .end            = OMAP_CS2B_PHYS + OMAP_CS2B_SIZE - 1,
+        /* This is on CS3, wherever it's mapped */
         .flags          = IORESOURCE_MEM,
 };
 
@@ -161,13 +160,26 @@ static struct omap_usb_config h3_usb_config __initdata = {
         .pins[1]        = 3,
 };
 
+static struct omap_mmc_config h3_mmc_config __initdata = {
+        .mmc[0] = {
+                .enabled        = 1,
+                .power_pin      = -1,   /* tps65010 GPIO4 */
+                .switch_pin     = OMAP_MPUIO(1),
+        },
+};
+
 static struct omap_board_config_kernel h3_config[] = {
         { OMAP_TAG_USB,  &h3_usb_config },
+        { OMAP_TAG_MMC,  &h3_mmc_config },
 };
 
 static void __init h3_init(void)
 {
+        h3_flash_resource.end = h3_flash_resource.start = omap_cs3_phys();
+        h3_flash_resource.end += OMAP_CS3_SIZE - 1;
         (void) platform_add_devices(devices, ARRAY_SIZE(devices));
+        omap_board_config = h3_config;
+        omap_board_config_size = ARRAY_SIZE(h3_config);
 }
 
 static void __init h3_init_smc91x(void)
@@ -177,7 +189,6 @@ static void __init h3_init_smc91x(void)
                 printk("Error requesting gpio 40 for smc91x irq\n");
                 return;
         }
-        omap_set_gpio_edge_ctrl(40, OMAP_GPIO_FALLING_EDGE);
 }
 
 void h3_init_irq(void)
diff --git a/arch/arm/mach-omap1/board-innovator.c b/arch/arm/mach-omap1/board-innovator.c
index 91de60a91ef8..df0312b596e4 100644
--- a/arch/arm/mach-omap1/board-innovator.c
+++ b/arch/arm/mach-omap1/board-innovator.c
@@ -29,6 +29,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/tc.h>
@@ -173,7 +174,6 @@ static void __init innovator_init_smc91x(void)
                         printk("Error requesting gpio 0 for smc91x irq\n");
                         return;
                 }
-                omap_set_gpio_edge_ctrl(0, OMAP_GPIO_RISING_EDGE);
         }
 }
 
@@ -220,8 +220,19 @@ static struct omap_usb_config h2_usb_config __initdata = {
 };
 #endif
 
+static struct omap_mmc_config innovator_mmc_config __initdata = {
+        .mmc [0] = {
+                .enabled        = 1,
+                .wire4          = 1,
+                .wp_pin         = OMAP_MPUIO(3),
+                .power_pin      = -1,   /* FPGA F3 UIO42 */
+                .switch_pin     = -1,   /* FPGA F4 UIO43 */
+        },
+};
+
 static struct omap_board_config_kernel innovator_config[] = {
         { OMAP_TAG_USB,         NULL },
+        { OMAP_TAG_MMC,         &innovator_mmc_config },
 };
 
 static void __init innovator_init(void)
diff --git a/arch/arm/mach-omap1/board-netstar.c b/arch/arm/mach-omap1/board-netstar.c
index 6750b2014092..d904e643f5ec 100644
--- a/arch/arm/mach-omap1/board-netstar.c
+++ b/arch/arm/mach-omap1/board-netstar.c
@@ -75,16 +75,15 @@ static void __init netstar_init(void)
         mdelay(50);     /* 50ms until PHY ready */
         /* smc91x interrupt pin */
         omap_request_gpio(8);
-        omap_set_gpio_edge_ctrl(8, OMAP_GPIO_RISING_EDGE);
 
         omap_request_gpio(12);
         omap_request_gpio(13);
         omap_request_gpio(14);
         omap_request_gpio(15);
-        omap_set_gpio_edge_ctrl(12, OMAP_GPIO_FALLING_EDGE);
-        omap_set_gpio_edge_ctrl(13, OMAP_GPIO_FALLING_EDGE);
-        omap_set_gpio_edge_ctrl(14, OMAP_GPIO_FALLING_EDGE);
-        omap_set_gpio_edge_ctrl(15, OMAP_GPIO_FALLING_EDGE);
+        set_irq_type(OMAP_GPIO_IRQ(12), IRQT_FALLING);
+        set_irq_type(OMAP_GPIO_IRQ(13), IRQT_FALLING);
+        set_irq_type(OMAP_GPIO_IRQ(14), IRQT_FALLING);
+        set_irq_type(OMAP_GPIO_IRQ(15), IRQT_FALLING);
 
         platform_add_devices(netstar_devices, ARRAY_SIZE(netstar_devices));
 
diff --git a/arch/arm/mach-omap1/board-osk.c b/arch/arm/mach-omap1/board-osk.c
index 6844e536c698..21103df50415 100644
--- a/arch/arm/mach-omap1/board-osk.c
+++ b/arch/arm/mach-omap1/board-osk.c
@@ -29,11 +29,16 @@
 #include <linux/kernel.h>
 #include <linux/init.h>
 #include <linux/device.h>
+#include <linux/interrupt.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/partitions.h>
 
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
+#include <asm/mach/flash.h>
 
 #include <asm/arch/gpio.h>
 #include <asm/arch/usb.h>
@@ -41,12 +46,56 @@
 #include <asm/arch/tc.h>
 #include <asm/arch/common.h>
 
-static struct map_desc osk5912_io_desc[] __initdata = {
-{ OMAP_OSK_NOR_FLASH_BASE, OMAP_OSK_NOR_FLASH_START, OMAP_OSK_NOR_FLASH_SIZE,
-        MT_DEVICE },
+static int __initdata osk_serial_ports[OMAP_MAX_NR_PORTS] = {1, 0, 0};
+
+static struct mtd_partition osk_partitions[] = {
+        /* bootloader (U-Boot, etc) in first sector */
+        {
+              .name             = "bootloader",
+              .offset           = 0,
+              .size             = SZ_128K,
+              .mask_flags       = MTD_WRITEABLE, /* force read-only */
+        },
+        /* bootloader params in the next sector */
+        {
+              .name             = "params",
+              .offset           = MTDPART_OFS_APPEND,
+              .size             = SZ_128K,
+              .mask_flags       = 0,
+        }, {
+              .name             = "kernel",
+              .offset           = MTDPART_OFS_APPEND,
+              .size             = SZ_2M,
+              .mask_flags       = 0
+        }, {
+              .name             = "filesystem",
+              .offset           = MTDPART_OFS_APPEND,
+              .size             = MTDPART_SIZ_FULL,
+              .mask_flags       = 0
+        }
 };
 
-static int __initdata osk_serial_ports[OMAP_MAX_NR_PORTS] = {1, 0, 0};
+static struct flash_platform_data osk_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+        .parts          = osk_partitions,
+        .nr_parts       = ARRAY_SIZE(osk_partitions),
+};
+
+static struct resource osk_flash_resource = {
+        /* this is on CS3, wherever it's mapped */
+        .flags          = IORESOURCE_MEM,
+};
+
+static struct platform_device osk5912_flash_device = {
+        .name           = "omapflash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &osk_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &osk_flash_resource,
+};
 
 static struct resource osk5912_smc91x_resources[] = {
         [0] = {
@@ -86,9 +135,16 @@ static struct platform_device osk5912_cf_device = {
         .resource       = osk5912_cf_resources,
 };
 
+static struct platform_device osk5912_mcbsp1_device = {
+        .name           = "omap_mcbsp",
+        .id             = 1,
+};
+
 static struct platform_device *osk5912_devices[] __initdata = {
+        &osk5912_flash_device,
         &osk5912_smc91x_device,
         &osk5912_cf_device,
+        &osk5912_mcbsp1_device,
 };
 
 static void __init osk_init_smc91x(void)
@@ -97,7 +153,6 @@ static void __init osk_init_smc91x(void)
                 printk("Error requesting gpio 0 for smc91x irq\n");
                 return;
         }
-        omap_set_gpio_edge_ctrl(0, OMAP_GPIO_RISING_EDGE);
 
         /* Check EMIFS wait states to fix errors with SMC_GET_PKT_HDR */
         EMIFS_CCS(1) |= 0x2;
@@ -110,11 +165,11 @@ static void __init osk_init_cf(void)
                 printk("Error requesting gpio 62 for CF irq\n");
                 return;
         }
-        /* it's really active-low */
-        omap_set_gpio_edge_ctrl(62, OMAP_GPIO_FALLING_EDGE);
+        /* the CF I/O IRQ is really active-low */
+        set_irq_type(OMAP_GPIO_IRQ(62), IRQT_FALLING);
 }
 
-void osk_init_irq(void)
+static void __init osk_init_irq(void)
 {
         omap_init_irq();
         omap_gpio_init();
@@ -142,18 +197,69 @@ static struct omap_board_config_kernel osk_config[] = {
         { OMAP_TAG_USB,           &osk_usb_config },
 };
 
+#ifdef  CONFIG_OMAP_OSK_MISTRAL
+
+#ifdef  CONFIG_PM
+static irqreturn_t
+osk_mistral_wake_interrupt(int irq, void *ignored, struct pt_regs *regs)
+{
+        return IRQ_HANDLED;
+}
+#endif
+
+static void __init osk_mistral_init(void)
+{
+        /* FIXME here's where to feed in framebuffer, touchpad, and
+         * keyboard setup ...  not in the drivers for those devices!
+         *
+         * NOTE:  we could actually tell if there's a Mistral board
+         * attached, e.g. by trying to read something from the ads7846.
+         * But this is too early for that...
+         */
+
+        /* the sideways button (SW1) is for use as a "wakeup" button */
+        omap_cfg_reg(N15_1610_MPUIO2);
+        if (omap_request_gpio(OMAP_MPUIO(2)) == 0) {
+                int ret = 0;
+                omap_set_gpio_direction(OMAP_MPUIO(2), 1);
+                set_irq_type(OMAP_GPIO_IRQ(OMAP_MPUIO(2)), IRQT_RISING);
+#ifdef  CONFIG_PM
+                /* share the IRQ in case someone wants to use the
+                 * button for more than wakeup from system sleep.
+                 */
+                ret = request_irq(OMAP_GPIO_IRQ(OMAP_MPUIO(2)),
+                                &osk_mistral_wake_interrupt,
+                                SA_SHIRQ, "mistral_wakeup",
+                                &osk_mistral_wake_interrupt);
+                if (ret != 0) {
+                        omap_free_gpio(OMAP_MPUIO(2));
+                        printk(KERN_ERR "OSK+Mistral: no wakeup irq, %d?\n",
+                                ret);
+                } else
+                        enable_irq_wake(OMAP_GPIO_IRQ(OMAP_MPUIO(2)));
+#endif
+        } else
+                printk(KERN_ERR "OSK+Mistral: wakeup button is awol\n");
+}
+#else
+static void __init osk_mistral_init(void) { }
+#endif
+
 static void __init osk_init(void)
 {
+        osk_flash_resource.end = osk_flash_resource.start = omap_cs3_phys();
+        osk_flash_resource.end += SZ_32M - 1;
         platform_add_devices(osk5912_devices, ARRAY_SIZE(osk5912_devices));
         omap_board_config = osk_config;
         omap_board_config_size = ARRAY_SIZE(osk_config);
         USB_TRANSCEIVER_CTRL_REG |= (3 << 1);
+
+        osk_mistral_init();
 }
 
 static void __init osk_map_io(void)
 {
         omap_map_common_io();
-        iotable_init(osk5912_io_desc, ARRAY_SIZE(osk5912_io_desc));
         omap_serial_init(osk_serial_ports);
 }
 
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 213317392d9b..107c68c8ab54 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -24,6 +24,7 @@
 #include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/tc.h>
 #include <asm/arch/gpio.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/fpga.h>
@@ -83,8 +84,8 @@ static struct flash_platform_data p2_flash_data = {
 };
 
 static struct resource p2_flash_resource = {
-        .start          = OMAP_FLASH_0_START,
-        .end            = OMAP_FLASH_0_START + OMAP_FLASH_0_SIZE - 1,
+        .start          = OMAP_CS0_PHYS,
+        .end            = OMAP_CS0_PHYS + SZ_32M - 1,
         .flags          = IORESOURCE_MEM,
 };
 
diff --git a/arch/arm/mach-omap1/board-voiceblue.c b/arch/arm/mach-omap1/board-voiceblue.c
index e42281988990..bf30b1acda0b 100644
--- a/arch/arm/mach-omap1/board-voiceblue.c
+++ b/arch/arm/mach-omap1/board-voiceblue.c
@@ -25,13 +25,14 @@
 #include <asm/hardware.h>
 #include <asm/mach-types.h>
 #include <asm/mach/arch.h>
+#include <asm/mach/flash.h>
 #include <asm/mach/map.h>
 
+#include <asm/arch/common.h>
 #include <asm/arch/gpio.h>
-#include <asm/arch/tc.h>
 #include <asm/arch/mux.h>
+#include <asm/arch/tc.h>
 #include <asm/arch/usb.h>
-#include <asm/arch/common.h>
 
 extern void omap_init_time(void);
 extern int omap_gpio_init(void);
@@ -74,7 +75,7 @@ static struct plat_serial8250_port voiceblue_ports[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 1,
+        .id                     = PLAT8250_DEV_PLATFORM1,
         .dev                    = {
                 .platform_data  = voiceblue_ports,
         },
@@ -86,6 +87,27 @@ static int __init ext_uart_init(void)
 }
 arch_initcall(ext_uart_init);
 
+static struct flash_platform_data voiceblue_flash_data = {
+        .map_name       = "cfi_probe",
+        .width          = 2,
+};
+
+static struct resource voiceblue_flash_resource = {
+        .start  = OMAP_CS0_PHYS,
+        .end    = OMAP_CS0_PHYS + SZ_32M - 1,
+        .flags  = IORESOURCE_MEM,
+};
+
+static struct platform_device voiceblue_flash_device = {
+        .name           = "omapflash",
+        .id             = 0,
+        .dev            = {
+                .platform_data  = &voiceblue_flash_data,
+        },
+        .num_resources  = 1,
+        .resource       = &voiceblue_flash_resource,
+};
+
 static struct resource voiceblue_smc91x_resources[] = {
         [0] = {
                 .start  = OMAP_CS2_PHYS + 0x300,
@@ -107,6 +129,7 @@ static struct platform_device voiceblue_smc91x_device = {
 };
 
 static struct platform_device *voiceblue_devices[] __initdata = {
+        &voiceblue_flash_device,
         &voiceblue_smc91x_device,
 };
 
@@ -119,8 +142,17 @@ static struct omap_usb_config voiceblue_usb_config __initdata = {
         .pins[2]        = 6,
 };
 
+static struct omap_mmc_config voiceblue_mmc_config __initdata = {
+        .mmc[0] = {
+                .enabled        = 1,
+                .power_pin      = 2,
+                .switch_pin     = -1,
+        },
+};
+
 static struct omap_board_config_kernel voiceblue_config[] = {
         { OMAP_TAG_USB, &voiceblue_usb_config },
+        { OMAP_TAG_MMC, &voiceblue_mmc_config },
 };
 
 static void __init voiceblue_init_irq(void)
@@ -131,9 +163,6 @@ static void __init voiceblue_init_irq(void)
 
 static void __init voiceblue_init(void)
 {
-        /* There is a good chance board is going up, so enable Power LED
-         * (it is connected through invertor) */
-        omap_writeb(0x00, OMAP_LPG1_LCR);
         /* Watchdog */
         omap_request_gpio(0);
         /* smc91x reset */
@@ -145,7 +174,6 @@ static void __init voiceblue_init(void)
         mdelay(50);     /* 50ms until PHY ready */
         /* smc91x interrupt pin */
         omap_request_gpio(8);
-        omap_set_gpio_edge_ctrl(8, OMAP_GPIO_RISING_EDGE);
         /* 16C554 reset*/
         omap_request_gpio(6);
         omap_set_gpio_direction(6, 0);
@@ -155,14 +183,19 @@ static void __init voiceblue_init(void)
         omap_request_gpio(13);
         omap_request_gpio(14);
         omap_request_gpio(15);
-        omap_set_gpio_edge_ctrl(12, OMAP_GPIO_RISING_EDGE);
-        omap_set_gpio_edge_ctrl(13, OMAP_GPIO_RISING_EDGE);
-        omap_set_gpio_edge_ctrl(14, OMAP_GPIO_RISING_EDGE);
-        omap_set_gpio_edge_ctrl(15, OMAP_GPIO_RISING_EDGE);
+        set_irq_type(OMAP_GPIO_IRQ(12), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(14), IRQT_RISING);
+        set_irq_type(OMAP_GPIO_IRQ(15), IRQT_RISING);
 
         platform_add_devices(voiceblue_devices, ARRAY_SIZE(voiceblue_devices));
         omap_board_config = voiceblue_config;
         omap_board_config_size = ARRAY_SIZE(voiceblue_config);
+
+        /* There is a good chance board is going up, so enable power LED
+         * (it is connected through invertor) */
+        omap_writeb(0x00, OMAP_LPG1_LCR);
+        omap_writeb(0x00, OMAP_LPG1_PMR);       /* Disable clock */
 }
 
 static int __initdata omap_serial_ports[OMAP_MAX_NR_PORTS] = {1, 1, 1};
@@ -184,9 +217,9 @@ static int panic_event(struct notifier_block *this, unsigned long event,
         if (test_and_set_bit(MACHINE_PANICED, &machine_state))
                 return NOTIFY_DONE;
 
-        /* Flash Power LED
-         * (TODO: Enable clock right way (enabled in bootloader already)) */
+        /* Flash power LED */
         omap_writeb(0x78, OMAP_LPG1_LCR);
+        omap_writeb(0x01, OMAP_LPG1_PMR);       /* Enable clock */
 
         return NOTIFY_DONE;
 }
@@ -195,15 +228,14 @@ static struct notifier_block panic_block = {
         .notifier_call  = panic_event,
 };
 
-static int __init setup_notifier(void)
+static int __init voiceblue_setup(void)
 {
         /* Setup panic notifier */
         notifier_chain_register(&panic_notifier_list, &panic_block);
 
         return 0;
 }
-
-postcore_initcall(setup_notifier);
+postcore_initcall(voiceblue_setup);
 
 static int wdt_gpio_state;
 
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
new file mode 100644
index 000000000000..e8b3981444cd
--- /dev/null
+++ b/arch/arm/mach-omap1/devices.c
@@ -0,0 +1,351 @@
+/*
+ * linux/arch/arm/mach-omap1/devices.c
+ *
+ * OMAP1 platform device setup/initialization
+ *
+ * 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.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+#include <linux/device.h>
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/mach-types.h>
+#include <asm/mach/map.h>
+
+#include <asm/arch/tc.h>
+#include <asm/arch/board.h>
+#include <asm/arch/mux.h>
+#include <asm/arch/gpio.h>
+
+
+static void omap_nop_release(struct device *dev)
+{
+        /* Nothing */
+}
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(CONFIG_I2C_OMAP) || defined(CONFIG_I2C_OMAP_MODULE)
+
+#define OMAP_I2C_BASE           0xfffb3800
+
+static struct resource i2c_resources[] = {
+        {
+                .start          = OMAP_I2C_BASE,
+                .end            = OMAP_I2C_BASE + 0x3f,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_I2C,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+/* DMA not used; works around erratum writing to non-empty i2c fifo */
+
+static struct platform_device omap_i2c_device = {
+        .name           = "i2c_omap",
+        .id             = -1,
+        .dev = {
+                .release        = omap_nop_release,
+        },
+        .num_resources  = ARRAY_SIZE(i2c_resources),
+        .resource       = i2c_resources,
+};
+
+static void omap_init_i2c(void)
+{
+        /* FIXME define and use a boot tag, in case of boards that
+         * either don't wire up I2C, or chips that mux it differently...
+         * it can include clocking and address info, maybe more.
+         */
+        omap_cfg_reg(I2C_SCL);
+        omap_cfg_reg(I2C_SDA);
+
+        (void) platform_device_register(&omap_i2c_device);
+}
+#else
+static inline void omap_init_i2c(void) {}
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(CONFIG_OMAP1610_IR) || defined(CONFIG_OMAP161O_IR_MODULE)
+
+static u64 irda_dmamask = 0xffffffff;
+
+static struct platform_device omap1610ir_device = {
+        .name = "omap1610-ir",
+        .id = -1,
+        .dev = {
+                .release        = omap_nop_release,
+                .dma_mask       = &irda_dmamask,
+        },
+};
+
+static void omap_init_irda(void)
+{
+        /* FIXME define and use a boot tag, members something like:
+         *  u8          uart;           // uart1, or uart3
+         * ... but driver only handles uart3 for now
+         *  s16         fir_sel;        // gpio for SIR vs FIR
+         * ... may prefer a callback for SIR/MIR/FIR mode select;
+         * while h2 uses a GPIO, H3 uses a gpio expander
+         */
+        if (machine_is_omap_h2()
+                        || machine_is_omap_h3())
+                (void) platform_device_register(&omap1610ir_device);
+}
+#else
+static inline void omap_init_irda(void) {}
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(CONFIG_MMC_OMAP) || defined(CONFIG_MMC_OMAP_MODULE)
+
+#define OMAP_MMC1_BASE          0xfffb7800
+#define OMAP_MMC2_BASE          0xfffb7c00      /* omap16xx only */
+
+static struct omap_mmc_conf mmc1_conf;
+
+static u64 mmc1_dmamask = 0xffffffff;
+
+static struct resource mmc1_resources[] = {
+        {
+                .start          = IO_ADDRESS(OMAP_MMC1_BASE),
+                .end            = IO_ADDRESS(OMAP_MMC1_BASE) + 0x7f,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_MMC,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device mmc_omap_device1 = {
+        .name           = "mmci-omap",
+        .id             = 1,
+        .dev = {
+                .release        = omap_nop_release,
+                .dma_mask       = &mmc1_dmamask,
+                .platform_data  = &mmc1_conf,
+        },
+        .num_resources  = ARRAY_SIZE(mmc1_resources),
+        .resource       = mmc1_resources,
+};
+
+#ifdef  CONFIG_ARCH_OMAP16XX
+
+static struct omap_mmc_conf mmc2_conf;
+
+static u64 mmc2_dmamask = 0xffffffff;
+
+static struct resource mmc2_resources[] = {
+        {
+                .start          = IO_ADDRESS(OMAP_MMC2_BASE),
+                .end            = IO_ADDRESS(OMAP_MMC2_BASE) + 0x7f,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_1610_MMC2,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device mmc_omap_device2 = {
+        .name           = "mmci-omap",
+        .id             = 2,
+        .dev = {
+                .release        = omap_nop_release,
+                .dma_mask       = &mmc2_dmamask,
+                .platform_data  = &mmc2_conf,
+        },
+        .num_resources  = ARRAY_SIZE(mmc2_resources),
+        .resource       = mmc2_resources,
+};
+#endif
+
+static void __init omap_init_mmc(void)
+{
+        const struct omap_mmc_config    *mmc_conf;
+        const struct omap_mmc_conf      *mmc;
+
+        /* NOTE:  assumes MMC was never (wrongly) enabled */
+        mmc_conf = omap_get_config(OMAP_TAG_MMC, struct omap_mmc_config);
+        if (!mmc_conf)
+                return;
+
+        /* block 1 is always available and has just one pinout option */
+        mmc = &mmc_conf->mmc[0];
+        if (mmc->enabled) {
+                omap_cfg_reg(MMC_CMD);
+                omap_cfg_reg(MMC_CLK);
+                omap_cfg_reg(MMC_DAT0);
+                if (cpu_is_omap1710()) {
+                      omap_cfg_reg(M15_1710_MMC_CLKI);
+                      omap_cfg_reg(P19_1710_MMC_CMDDIR);
+                      omap_cfg_reg(P20_1710_MMC_DATDIR0);
+                }
+                if (mmc->wire4) {
+                        omap_cfg_reg(MMC_DAT1);
+                        /* NOTE:  DAT2 can be on W10 (here) or M15 */
+                        if (!mmc->nomux)
+                                omap_cfg_reg(MMC_DAT2);
+                        omap_cfg_reg(MMC_DAT3);
+                }
+                mmc1_conf = *mmc;
+                (void) platform_device_register(&mmc_omap_device1);
+        }
+
+#ifdef  CONFIG_ARCH_OMAP16XX
+        /* block 2 is on newer chips, and has many pinout options */
+        mmc = &mmc_conf->mmc[1];
+        if (mmc->enabled) {
+                if (!mmc->nomux) {
+                        omap_cfg_reg(Y8_1610_MMC2_CMD);
+                        omap_cfg_reg(Y10_1610_MMC2_CLK);
+                        omap_cfg_reg(R18_1610_MMC2_CLKIN);
+                        omap_cfg_reg(W8_1610_MMC2_DAT0);
+                        if (mmc->wire4) {
+                                omap_cfg_reg(V8_1610_MMC2_DAT1);
+                                omap_cfg_reg(W15_1610_MMC2_DAT2);
+                                omap_cfg_reg(R10_1610_MMC2_DAT3);
+                        }
+
+                        /* These are needed for the level shifter */
+                        omap_cfg_reg(V9_1610_MMC2_CMDDIR);
+                        omap_cfg_reg(V5_1610_MMC2_DATDIR0);
+                        omap_cfg_reg(W19_1610_MMC2_DATDIR1);
+                }
+
+                /* Feedback clock must be set on OMAP-1710 MMC2 */
+                if (cpu_is_omap1710())
+                        omap_writel(omap_readl(MOD_CONF_CTRL_1) | (1 << 24),
+                                     MOD_CONF_CTRL_1);
+                mmc2_conf = *mmc;
+                (void) platform_device_register(&mmc_omap_device2);
+        }
+#endif
+        return;
+}
+#else
+static inline void omap_init_mmc(void) {}
+#endif
+
+#if     defined(CONFIG_OMAP_RTC) || defined(CONFIG_OMAP_RTC)
+
+#define OMAP_RTC_BASE           0xfffb4800
+
+static struct resource rtc_resources[] = {
+        {
+                .start          = OMAP_RTC_BASE,
+                .end            = OMAP_RTC_BASE + 0x5f,
+                .flags          = IORESOURCE_MEM,
+        },
+        {
+                .start          = INT_RTC_TIMER,
+                .flags          = IORESOURCE_IRQ,
+        },
+        {
+                .start          = INT_RTC_ALARM,
+                .flags          = IORESOURCE_IRQ,
+        },
+};
+
+static struct platform_device omap_rtc_device = {
+        .name           = "omap_rtc",
+        .id             = -1,
+        .dev = {
+                .release        = omap_nop_release,
+        },
+        .num_resources  = ARRAY_SIZE(rtc_resources),
+        .resource       = rtc_resources,
+};
+
+static void omap_init_rtc(void)
+{
+        (void) platform_device_register(&omap_rtc_device);
+}
+#else
+static inline void omap_init_rtc(void) {}
+#endif
+
+/*-------------------------------------------------------------------------*/
+
+#if     defined(CONFIG_OMAP16XX_WATCHDOG) || defined(CONFIG_OMAP16XX_WATCHDOG_MODULE)
+
+#define OMAP_WDT_BASE           0xfffeb000
+
+static struct resource wdt_resources[] = {
+        {
+                .start          = OMAP_WDT_BASE,
+                .end            = OMAP_WDT_BASE + 0x4f,
+                .flags          = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device omap_wdt_device = {
+        .name      = "omap1610_wdt",
+        .id          = -1,
+        .dev = {
+                .release        = omap_nop_release,
+        },
+        .num_resources  = ARRAY_SIZE(wdt_resources),
+        .resource       = wdt_resources,
+};
+
+static void omap_init_wdt(void)
+{
+        (void) platform_device_register(&omap_wdt_device);
+}
+#else
+static inline void omap_init_wdt(void) {}
+#endif
+
+
+/*-------------------------------------------------------------------------*/
+
+/*
+ * This gets called after board-specific INIT_MACHINE, and initializes most
+ * on-chip peripherals accessible on this board (except for few like USB):
+ *
+ *  (a) Does any "standard config" pin muxing needed.  Board-specific
+ *      code will have muxed GPIO pins and done "nonstandard" setup;
+ *      that code could live in the boot loader.
+ *  (b) Populating board-specific platform_data with the data drivers
+ *      rely on to handle wiring variations.
+ *  (c) Creating platform devices as meaningful on this board and
+ *      with this kernel configuration.
+ *
+ * Claiming GPIOs, and setting their direction and initial values, is the
+ * responsibility of the device drivers.  So is responding to probe().
+ *
+ * Board-specific knowlege like creating devices or pin setup is to be
+ * kept out of drivers as much as possible.  In particular, pin setup
+ * may be handled by the boot loader, and drivers should expect it will
+ * normally have been done by the time they're probed.
+ */
+static int __init omap_init_devices(void)
+{
+        /* please keep these calls, and their implementations above,
+         * in alphabetical order so they're easier to sort through.
+         */
+        omap_init_i2c();
+        omap_init_irda();
+        omap_init_mmc();
+        omap_init_rtc();
+        omap_init_wdt();
+
+        return 0;
+}
+arch_initcall(omap_init_devices);
+
diff --git a/arch/arm/mach-omap1/fpga.c b/arch/arm/mach-omap1/fpga.c
index c12a78335625..aca2a120813a 100644
--- a/arch/arm/mach-omap1/fpga.c
+++ b/arch/arm/mach-omap1/fpga.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/fpga.c
+ * linux/arch/arm/mach-omap1/fpga.c
  *
  * Interrupt handler for OMAP-1510 Innovator FPGA
  *
@@ -181,7 +181,7 @@ void omap1510_fpga_init_irq(void)
          */
         omap_request_gpio(13);
         omap_set_gpio_direction(13, 1);
-        omap_set_gpio_edge_ctrl(13, OMAP_GPIO_RISING_EDGE);
+        set_irq_type(OMAP_GPIO_IRQ(13), IRQT_RISING);
         set_irq_chained_handler(OMAP1510_INT_FPGA, innovator_fpga_IRQ_demux);
 }
 
diff --git a/arch/arm/mach-omap1/io.c b/arch/arm/mach-omap1/io.c
index 207df0fe934d..eb8261d7dead 100644
--- a/arch/arm/mach-omap1/io.c
+++ b/arch/arm/mach-omap1/io.c
@@ -19,6 +19,7 @@
 
 extern int clk_init(void);
 extern void omap_check_revision(void);
+extern void omap_sram_init(void);
 
 /*
  * The machine specific code may provide the extra mapping besides the
@@ -32,7 +33,6 @@ static struct map_desc omap_io_desc[] __initdata = {
 static struct map_desc omap730_io_desc[] __initdata = {
  { OMAP730_DSP_BASE,    OMAP730_DSP_START,    OMAP730_DSP_SIZE,    MT_DEVICE },
  { OMAP730_DSPREG_BASE, OMAP730_DSPREG_START, OMAP730_DSPREG_SIZE, MT_DEVICE },
- { OMAP730_SRAM_BASE,   OMAP730_SRAM_START,   OMAP730_SRAM_SIZE,   MT_DEVICE }
 };
 #endif
 
@@ -40,27 +40,13 @@ static struct map_desc omap730_io_desc[] __initdata = {
 static struct map_desc omap1510_io_desc[] __initdata = {
  { OMAP1510_DSP_BASE,    OMAP1510_DSP_START,    OMAP1510_DSP_SIZE,    MT_DEVICE },
  { OMAP1510_DSPREG_BASE, OMAP1510_DSPREG_START, OMAP1510_DSPREG_SIZE, MT_DEVICE },
- { OMAP1510_SRAM_BASE,   OMAP1510_SRAM_START,   OMAP1510_SRAM_SIZE,   MT_DEVICE }
 };
 #endif
 
 #if defined(CONFIG_ARCH_OMAP16XX)
-static struct map_desc omap1610_io_desc[] __initdata = {
+static struct map_desc omap16xx_io_desc[] __initdata = {
  { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
  { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
- { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP1610_SRAM_SIZE,   MT_DEVICE }
-};
-
-static struct map_desc omap5912_io_desc[] __initdata = {
- { OMAP16XX_DSP_BASE,    OMAP16XX_DSP_START,    OMAP16XX_DSP_SIZE,    MT_DEVICE },
- { OMAP16XX_DSPREG_BASE, OMAP16XX_DSPREG_START, OMAP16XX_DSPREG_SIZE, MT_DEVICE },
-/*
- * The OMAP5912 has 250kByte internal SRAM. Because the mapping is baseed on page
- * size (4kByte), it seems that the last 2kByte (=0x800) of the 250kByte are not mapped.
- * Add additional 2kByte (0x800) so that the last page is mapped and the last 2kByte
- * can be used.
- */
- { OMAP16XX_SRAM_BASE,   OMAP16XX_SRAM_START,   OMAP5912_SRAM_SIZE + 0x800,   MT_DEVICE }
 };
 #endif
 
@@ -86,14 +72,13 @@ static void __init _omap_map_io(void)
         }
 #endif
 #if defined(CONFIG_ARCH_OMAP16XX)
-        if (cpu_is_omap1610() || cpu_is_omap1710()) {
-                iotable_init(omap1610_io_desc, ARRAY_SIZE(omap1610_io_desc));
-        }
-        if (cpu_is_omap5912()) {
-                iotable_init(omap5912_io_desc, ARRAY_SIZE(omap5912_io_desc));
+        if (cpu_is_omap16xx()) {
+                iotable_init(omap16xx_io_desc, ARRAY_SIZE(omap16xx_io_desc));
         }
 #endif
 
+        omap_sram_init();
+
         /* REVISIT: Refer to OMAP5910 Errata, Advisory SYS_1: "Timeout Abort
          * on a Posted Write in the TIPB Bridge".
          */
@@ -108,8 +93,9 @@ static void __init _omap_map_io(void)
 /*
  * This should only get called from board specific init
  */
-void omap_map_common_io(void)
+void __init omap_map_common_io(void)
 {
         if (!initialized)
                 _omap_map_io();
 }
+
diff --git a/arch/arm/mach-omap1/irq.c b/arch/arm/mach-omap1/irq.c
index a11b6d807352..192ce6055faa 100644
--- a/arch/arm/mach-omap1/irq.c
+++ b/arch/arm/mach-omap1/irq.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/irq.c
+ * linux/arch/arm/mach-omap1/irq.c
  *
  * Interrupt handler for all OMAP boards
  *
@@ -165,10 +165,10 @@ static struct omap_irq_bank omap1610_irq_banks[] = {
 #endif
 
 static struct irqchip omap_irq_chip = {
-        .ack    = omap_mask_ack_irq,
-        .mask   = omap_mask_irq,
-        .unmask = omap_unmask_irq,
-        .wake   = omap_wake_irq,
+        .ack            = omap_mask_ack_irq,
+        .mask           = omap_mask_irq,
+        .unmask         = omap_unmask_irq,
+        .set_wake       = omap_wake_irq,
 };
 
 void __init omap_init_irq(void)
diff --git a/arch/arm/mach-omap1/leds-h2p2-debug.c b/arch/arm/mach-omap1/leds-h2p2-debug.c
index ec0d8285f243..be283cda63dd 100644
--- a/arch/arm/mach-omap1/leds-h2p2-debug.c
+++ b/arch/arm/mach-omap1/leds-h2p2-debug.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/leds-h2p2-debug.c
+ * linux/arch/arm/mach-omap1/leds-h2p2-debug.c
  *
  * Copyright 2003 by Texas Instruments Incorporated
  *
@@ -13,6 +13,7 @@
 #include <linux/init.h>
 #include <linux/kernel_stat.h>
 #include <linux/sched.h>
+#include <linux/version.h>
 
 #include <asm/io.h>
 #include <asm/hardware.h>
diff --git a/arch/arm/mach-omap1/leds-innovator.c b/arch/arm/mach-omap1/leds-innovator.c
index 8043b7d0f66e..c8ffd1ddcded 100644
--- a/arch/arm/mach-omap1/leds-innovator.c
+++ b/arch/arm/mach-omap1/leds-innovator.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/leds-innovator.c
+ * linux/arch/arm/mach-omap1/leds-innovator.c
  */
 #include <linux/config.h>
 #include <linux/init.h>
diff --git a/arch/arm/mach-omap1/leds-osk.c b/arch/arm/mach-omap1/leds-osk.c
index 4a0e8b9d4fc3..2c8bda847c18 100644
--- a/arch/arm/mach-omap1/leds-osk.c
+++ b/arch/arm/mach-omap1/leds-osk.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/leds-osk.c
+ * linux/arch/arm/mach-omap1/leds-osk.c
  *
  * LED driver for OSK, and optionally Mistral QVGA, boards
  */
@@ -64,7 +64,7 @@ static void tps_work(void *unused)
 
 static DECLARE_WORK(work, tps_work, NULL);
 
-#ifdef  CONFIG_FB_OMAP
+#ifdef  CONFIG_OMAP_OSK_MISTRAL
 
 /* For now, all system indicators require the Mistral board, since that
  * LED can be manipulated without a task context.  This LED is either red,
@@ -127,7 +127,7 @@ void osk_leds_event(led_event_t evt)
                 hw_led_state = 0;
                 break;
 
-#ifdef  CONFIG_FB_OMAP
+#ifdef  CONFIG_OMAP_OSK_MISTRAL
 
         case led_timer:
                 hw_led_state ^= TIMER_LED;
@@ -144,7 +144,7 @@ void osk_leds_event(led_event_t evt)
                 mistral_setled();
                 break;
 
-#endif  /* CONFIG_FB_OMAP */
+#endif  /* CONFIG_OMAP_OSK_MISTRAL */
 
         /* "green" == tps LED1 (leftmost, normally power-good)
          * works only with DC adapter, not on battery power!
diff --git a/arch/arm/mach-omap1/leds.c b/arch/arm/mach-omap1/leds.c
index 8ab21fe98e1b..5c6b1bb6e722 100644
--- a/arch/arm/mach-omap1/leds.c
+++ b/arch/arm/mach-omap1/leds.c
@@ -1,5 +1,5 @@
 /*
- * linux/arch/arm/mach-omap/leds.c
+ * linux/arch/arm/mach-omap1/leds.c
  *
  * OMAP LEDs dispatcher
  */
@@ -20,7 +20,9 @@ omap_leds_init(void)
         if (machine_is_omap_innovator())
                 leds_event = innovator_leds_event;
 
-        else if (machine_is_omap_h2() || machine_is_omap_perseus2())
+        else if (machine_is_omap_h2()
+                        || machine_is_omap_h3()
+                        || machine_is_omap_perseus2())
                 leds_event = h2p2_dbg_leds_event;
 
         else if (machine_is_omap_osk())
@@ -30,8 +32,12 @@ omap_leds_init(void)
                 return -1;
 
         if (machine_is_omap_h2()
+                        || machine_is_omap_h3()
                         || machine_is_omap_perseus2()
-                        || machine_is_omap_osk()) {
+#ifdef  CONFIG_OMAP_OSK_MISTRAL
+                        || machine_is_omap_osk()
+#endif
+                        ) {
 
                 /* LED1/LED2 pins can be used as GPIO (as done here), or by
                  * the LPG (works even in deep sleep!), to drive a bicolor
diff --git a/arch/arm/mach-omap1/serial.c b/arch/arm/mach-omap1/serial.c
index 214e5d17c8b5..40c4f7c40e73 100644
--- a/arch/arm/mach-omap1/serial.c
+++ b/arch/arm/mach-omap1/serial.c
@@ -24,7 +24,11 @@
 
 #include <asm/arch/board.h>
 #include <asm/arch/mux.h>
+#include <asm/arch/gpio.h>
 #include <asm/arch/fpga.h>
+#ifdef CONFIG_PM
+#include <asm/arch/pm.h>
+#endif
 
 static struct clk * uart1_ck = NULL;
 static struct clk * uart2_ck = NULL;
@@ -94,7 +98,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
@@ -193,6 +197,86 @@ void __init omap_serial_init(int ports[OMAP_MAX_NR_PORTS])
         }
 }
 
+#ifdef CONFIG_OMAP_SERIAL_WAKE
+
+static irqreturn_t omap_serial_wake_interrupt(int irq, void *dev_id,
+                                              struct pt_regs *regs)
+{
+        /* Need to do something with serial port right after wake-up? */
+        return IRQ_HANDLED;
+}
+
+/*
+ * Reroutes serial RX lines to GPIO lines for the duration of
+ * sleep to allow waking up the device from serial port even
+ * in deep sleep.
+ */
+void omap_serial_wake_trigger(int enable)
+{
+        if (!cpu_is_omap16xx())
+                return;
+
+        if (uart1_ck != NULL) {
+                if (enable)
+                        omap_cfg_reg(V14_16XX_GPIO37);
+                else
+                        omap_cfg_reg(V14_16XX_UART1_RX);
+        }
+        if (uart2_ck != NULL) {
+                if (enable)
+                        omap_cfg_reg(R9_16XX_GPIO18);
+                else
+                        omap_cfg_reg(R9_16XX_UART2_RX);
+        }
+        if (uart3_ck != NULL) {
+                if (enable)
+                        omap_cfg_reg(L14_16XX_GPIO49);
+                else
+                        omap_cfg_reg(L14_16XX_UART3_RX);
+        }
+}
+
+static void __init omap_serial_set_port_wakeup(int gpio_nr)
+{
+        int ret;
+
+        ret = omap_request_gpio(gpio_nr);
+        if (ret < 0) {
+                printk(KERN_ERR "Could not request UART wake GPIO: %i\n",
+                       gpio_nr);
+                return;
+        }
+        omap_set_gpio_direction(gpio_nr, 1);
+        set_irq_type(OMAP_GPIO_IRQ(gpio_nr), IRQT_RISING);
+        ret = request_irq(OMAP_GPIO_IRQ(gpio_nr), &omap_serial_wake_interrupt,
+                          0, "serial wakeup", NULL);
+        if (ret) {
+                omap_free_gpio(gpio_nr);
+                printk(KERN_ERR "No interrupt for UART wake GPIO: %i\n",
+                       gpio_nr);
+                return;
+        }
+        enable_irq_wake(OMAP_GPIO_IRQ(gpio_nr));
+}
+
+static int __init omap_serial_wakeup_init(void)
+{
+        if (!cpu_is_omap16xx())
+                return 0;
+
+        if (uart1_ck != NULL)
+                omap_serial_set_port_wakeup(37);
+        if (uart2_ck != NULL)
+                omap_serial_set_port_wakeup(18);
+        if (uart3_ck != NULL)
+                omap_serial_set_port_wakeup(49);
+
+        return 0;
+}
+late_initcall(omap_serial_wakeup_init);
+
+#endif  /* CONFIG_OMAP_SERIAL_WAKE */
+
 static int __init omap_init(void)
 {
         return platform_device_register(&serial_device);
diff --git a/arch/arm/mach-omap1/time.c b/arch/arm/mach-omap1/time.c
index d540539c9bbb..191a9b1ee9b7 100644
--- a/arch/arm/mach-omap1/time.c
+++ b/arch/arm/mach-omap1/time.c
@@ -247,13 +247,6 @@ unsigned long long sched_clock(void)
 #define OMAP_32K_TIMER_TCR              0x04
 
 #define OMAP_32K_TICKS_PER_HZ           (32768 / HZ)
-#if (32768 % HZ) != 0
-/* We cannot ignore modulo.
- * Potential error can be as high as several percent.
- */
-#define OMAP_32K_TICK_MODULO            (32768 % HZ)
-static unsigned modulo_count = 0; /* Counts 1/HZ units */
-#endif
 
 /*
  * TRM says 1 / HZ = ( TVR + 1) / 32768, so TRV = (32768 / HZ) - 1
@@ -296,13 +289,22 @@ static inline void omap_32k_timer_stop(void)
 }
 
 /*
- * Rounds down to nearest usec
+ * Rounds down to nearest usec. Note that this will overflow for larger values.
  */
 static inline unsigned long omap_32k_ticks_to_usecs(unsigned long ticks_32k)
 {
         return (ticks_32k * 5*5*5*5*5*5) >> 9;
 }
 
+/*
+ * Rounds down to nearest nsec.
+ */
+static inline unsigned long long
+omap_32k_ticks_to_nsecs(unsigned long ticks_32k)
+{
+        return (unsigned long long) ticks_32k * 1000 * 5*5*5*5*5*5 >> 9;
+}
+
 static unsigned long omap_32k_last_tick = 0;
 
 /*
@@ -315,6 +317,15 @@ static unsigned long omap_32k_timer_gettimeoffset(void)
 }
 
 /*
+ * Returns current time from boot in nsecs. It's OK for this to wrap
+ * around for now, as it's just a relative time stamp.
+ */
+unsigned long long sched_clock(void)
+{
+        return omap_32k_ticks_to_nsecs(omap_32k_sync_timer_read());
+}
+
+/*
  * Timer interrupt for 32KHz timer. When dynamic tick is enabled, this
  * function is also called from other interrupts to remove latency
  * issues with dynamic tick. In the dynamic tick case, we need to lock
@@ -330,19 +341,6 @@ static irqreturn_t omap_32k_timer_interrupt(int irq, void *dev_id,
         now = omap_32k_sync_timer_read();
 
         while (now - omap_32k_last_tick >= OMAP_32K_TICKS_PER_HZ) {
-#ifdef OMAP_32K_TICK_MODULO
-                /* Modulo addition may put omap_32k_last_tick ahead of now
-                 * and cause unwanted repetition of the while loop.
-                 */
-                if (unlikely(now - omap_32k_last_tick == ~0))
-                        break;
-
-                modulo_count += OMAP_32K_TICK_MODULO;
-                if (modulo_count > HZ) {
-                        ++omap_32k_last_tick;
-                        modulo_count -= HZ;
-                }
-#endif
                 omap_32k_last_tick += OMAP_32K_TICKS_PER_HZ;
                 timer_tick(regs);
         }
diff --git a/arch/arm/mach-pxa/Makefile b/arch/arm/mach-pxa/Makefile
index efc2f657184e..33dae99ec2d8 100644
--- a/arch/arm/mach-pxa/Makefile
+++ b/arch/arm/mach-pxa/Makefile
@@ -11,7 +11,7 @@ obj-$(CONFIG_PXA27x) += pxa27x.o
 obj-$(CONFIG_ARCH_LUBBOCK) += lubbock.o
 obj-$(CONFIG_MACH_MAINSTONE) += mainstone.o
 obj-$(CONFIG_ARCH_PXA_IDP) += idp.o
-obj-$(CONFIG_PXA_SHARP_C7xx)    += corgi.o corgi_ssp.o ssp.o
+obj-$(CONFIG_PXA_SHARP_C7xx)    += corgi.o corgi_ssp.o corgi_lcd.o ssp.o
 obj-$(CONFIG_MACH_POODLE)       += poodle.o
 
 # Support for blinky lights
diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 06ea730e8675..07b5dd453565 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -39,7 +39,6 @@
 
 #include <asm/mach/sharpsl_param.h>
 #include <asm/hardware/scoop.h>
-#include <video/w100fb.h>
 
 #include "generic.h"
 
@@ -87,7 +86,7 @@ struct platform_device corgiscoop_device = {
  * also use scoop functions and this makes the power up/down order
  * work correctly.
  */
-static struct platform_device corgissp_device = {
+struct platform_device corgissp_device = {
         .name           = "corgi-ssp",
         .dev            = {
                 .parent = &corgiscoop_device.dev,
@@ -97,41 +96,33 @@ static struct platform_device corgissp_device = {
 
 
 /*
- * Corgi w100 Frame Buffer Device
+ * Corgi Backlight Device
  */
-static struct w100fb_mach_info corgi_fb_info = {
-        .w100fb_ssp_send        = corgi_ssp_lcdtg_send,
-        .comadj                         = -1,
-        .phadadj                        = -1,
-};
-
-static struct resource corgi_fb_resources[] = {
-        [0] = {
-                .start          = 0x08000000,
-                .end            = 0x08ffffff,
-                .flags          = IORESOURCE_MEM,
+static struct platform_device corgibl_device = {
+        .name           = "corgi-bl",
+        .dev            = {
+                .parent = &corgifb_device.dev,
         },
+        .id             = -1,
 };
 
-static struct platform_device corgifb_device = {
-        .name           = "w100fb",
+
+/*
+ * Corgi Keyboard Device
+ */
+static struct platform_device corgikbd_device = {
+        .name           = "corgi-keyboard",
         .id             = -1,
-        .dev            = {
-                .platform_data  = &corgi_fb_info,
-                .parent = &corgissp_device.dev,
-        },
-        .num_resources  = ARRAY_SIZE(corgi_fb_resources),
-        .resource       = corgi_fb_resources,
 };
 
 
 /*
- * Corgi Backlight Device
+ * Corgi Touch Screen Device
  */
-static struct platform_device corgibl_device = {
-        .name           = "corgi-bl",
+static struct platform_device corgits_device = {
+        .name           = "corgi-ts",
         .dev            = {
-                .parent = &corgifb_device.dev,
+                .parent = &corgissp_device.dev,
         },
         .id             = -1,
 };
@@ -140,27 +131,12 @@ static struct platform_device corgibl_device = {
 /*
  * MMC/SD Device
  *
- * The card detect interrupt isn't debounced so we delay it by HZ/4
+ * The card detect interrupt isn't debounced so we delay it by 250ms
  * to give the card a chance to fully insert/eject.
  */
-static struct mmc_detect {
-        struct timer_list detect_timer;
-        void *devid;
-} mmc_detect;
-
-static void mmc_detect_callback(unsigned long data)
-{
-        mmc_detect_change(mmc_detect.devid);
-}
+static struct pxamci_platform_data corgi_mci_platform_data;
 
-static irqreturn_t corgi_mmc_detect_int(int irq, void *devid, struct pt_regs *regs)
-{
-        mmc_detect.devid=devid;
-        mod_timer(&mmc_detect.detect_timer, jiffies + HZ/4);
-        return IRQ_HANDLED;
-}
-
-static int corgi_mci_init(struct device *dev, irqreturn_t (*unused_detect_int)(int, void *, struct pt_regs *), void *data)
+static int corgi_mci_init(struct device *dev, irqreturn_t (*corgi_detect_int)(int, void *, struct pt_regs *), void *data)
 {
         int err;
 
@@ -170,11 +146,9 @@ static int corgi_mci_init(struct device *dev, irqreturn_t (*unused_detect_int)(i
         pxa_gpio_mode(CORGI_GPIO_nSD_DETECT | GPIO_IN);
         pxa_gpio_mode(CORGI_GPIO_SD_PWR | GPIO_OUT);
 
-        init_timer(&mmc_detect.detect_timer);
-        mmc_detect.detect_timer.function = mmc_detect_callback;
-        mmc_detect.detect_timer.data = (unsigned long) &mmc_detect;
+        corgi_mci_platform_data.detect_delay = msecs_to_jiffies(250);
 
-        err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_mmc_detect_int, SA_INTERRUPT,
+        err = request_irq(CORGI_IRQ_GPIO_nSD_DETECT, corgi_detect_int, SA_INTERRUPT,
                              "MMC card detect", data);
         if (err) {
                 printk(KERN_ERR "corgi_mci_init: MMC/SD: can't request MMC card detect IRQ\n");
@@ -199,20 +173,26 @@ static void corgi_mci_setpower(struct device *dev, unsigned int vdd)
         }
 }
 
+static int corgi_mci_get_ro(struct device *dev)
+{
+        return GPLR(CORGI_GPIO_nSD_WP) & GPIO_bit(CORGI_GPIO_nSD_WP);
+}
+
 static void corgi_mci_exit(struct device *dev, void *data)
 {
         free_irq(CORGI_IRQ_GPIO_nSD_DETECT, data);
-        del_timer(&mmc_detect.detect_timer);
 }
 
 static struct pxamci_platform_data corgi_mci_platform_data = {
         .ocr_mask       = MMC_VDD_32_33|MMC_VDD_33_34,
         .init           = corgi_mci_init,
+        .get_ro         = corgi_mci_get_ro,
         .setpower       = corgi_mci_setpower,
         .exit           = corgi_mci_exit,
 };
 
 
+
 /*
  * USB Device Controller
  */
@@ -238,14 +218,13 @@ static struct platform_device *devices[] __initdata = {
         &corgiscoop_device,
         &corgissp_device,
         &corgifb_device,
+        &corgikbd_device,
         &corgibl_device,
+        &corgits_device,
 };
 
 static void __init corgi_init(void)
 {
-        corgi_fb_info.comadj=sharpsl_param.comadj;
-        corgi_fb_info.phadadj=sharpsl_param.phadadj;
-
         pxa_gpio_mode(CORGI_GPIO_USB_PULLUP | GPIO_OUT);
         pxa_set_udc_info(&udc_info);
         pxa_set_mci_info(&corgi_mci_platform_data);
diff --git a/arch/arm/mach-pxa/corgi_lcd.c b/arch/arm/mach-pxa/corgi_lcd.c
new file mode 100644
index 000000000000..deac29c00290
--- /dev/null
+++ b/arch/arm/mach-pxa/corgi_lcd.c
@@ -0,0 +1,396 @@
+/*
+ * linux/drivers/video/w100fb.c
+ *
+ * Corgi LCD Specific Code for ATI Imageon w100 (Wallaby)
+ *
+ * Copyright (C) 2005 Richard Purdie
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ */
+
+#include <linux/delay.h>
+#include <linux/kernel.h>
+#include <linux/device.h>
+#include <asm/arch/corgi.h>
+#include <asm/mach/sharpsl_param.h>
+#include <video/w100fb.h>
+
+/* Register Addresses */
+#define RESCTL_ADRS     0x00
+#define PHACTRL_ADRS    0x01
+#define DUTYCTRL_ADRS   0x02
+#define POWERREG0_ADRS  0x03
+#define POWERREG1_ADRS  0x04
+#define GPOR3_ADRS      0x05
+#define PICTRL_ADRS     0x06
+#define POLCTRL_ADRS    0x07
+
+/* Resgister Bit Definitions */
+#define RESCTL_QVGA     0x01
+#define RESCTL_VGA      0x00
+
+#define POWER1_VW_ON    0x01  /* VW Supply FET ON */
+#define POWER1_GVSS_ON  0x02  /* GVSS(-8V) Power Supply ON */
+#define POWER1_VDD_ON   0x04  /* VDD(8V),SVSS(-4V) Power Supply ON */
+
+#define POWER1_VW_OFF   0x00  /* VW Supply FET OFF */
+#define POWER1_GVSS_OFF 0x00  /* GVSS(-8V) Power Supply OFF */
+#define POWER1_VDD_OFF  0x00  /* VDD(8V),SVSS(-4V) Power Supply OFF */
+
+#define POWER0_COM_DCLK 0x01  /* COM Voltage DC Bias DAC Serial Data Clock */
+#define POWER0_COM_DOUT 0x02  /* COM Voltage DC Bias DAC Serial Data Out */
+#define POWER0_DAC_ON   0x04  /* DAC Power Supply ON */
+#define POWER0_COM_ON   0x08  /* COM Powewr Supply ON */
+#define POWER0_VCC5_ON  0x10  /* VCC5 Power Supply ON */
+
+#define POWER0_DAC_OFF  0x00  /* DAC Power Supply OFF */
+#define POWER0_COM_OFF  0x00  /* COM Powewr Supply OFF */
+#define POWER0_VCC5_OFF 0x00  /* VCC5 Power Supply OFF */
+
+#define PICTRL_INIT_STATE      0x01
+#define PICTRL_INIOFF          0x02
+#define PICTRL_POWER_DOWN      0x04
+#define PICTRL_COM_SIGNAL_OFF  0x08
+#define PICTRL_DAC_SIGNAL_OFF  0x10
+
+#define POLCTRL_SYNC_POL_FALL  0x01
+#define POLCTRL_EN_POL_FALL    0x02
+#define POLCTRL_DATA_POL_FALL  0x04
+#define POLCTRL_SYNC_ACT_H     0x08
+#define POLCTRL_EN_ACT_L       0x10
+
+#define POLCTRL_SYNC_POL_RISE  0x00
+#define POLCTRL_EN_POL_RISE    0x00
+#define POLCTRL_DATA_POL_RISE  0x00
+#define POLCTRL_SYNC_ACT_L     0x00
+#define POLCTRL_EN_ACT_H       0x00
+
+#define PHACTRL_PHASE_MANUAL   0x01
+#define DEFAULT_PHAD_QVGA     (9)
+#define DEFAULT_COMADJ        (125)
+
+/*
+ * This is only a psuedo I2C interface. We can't use the standard kernel
+ * routines as the interface is write only. We just assume the data is acked...
+ */
+static void lcdtg_ssp_i2c_send(u8 data)
+{
+        corgi_ssp_lcdtg_send(POWERREG0_ADRS, data);
+        udelay(10);
+}
+
+static void lcdtg_i2c_send_bit(u8 data)
+{
+        lcdtg_ssp_i2c_send(data);
+        lcdtg_ssp_i2c_send(data | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(data);
+}
+
+static void lcdtg_i2c_send_start(u8 base)
+{
+        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
+        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(base);
+}
+
+static void lcdtg_i2c_send_stop(u8 base)
+{
+        lcdtg_ssp_i2c_send(base);
+        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK);
+        lcdtg_ssp_i2c_send(base | POWER0_COM_DCLK | POWER0_COM_DOUT);
+}
+
+static void lcdtg_i2c_send_byte(u8 base, u8 data)
+{
+        int i;
+        for (i = 0; i < 8; i++) {
+                if (data & 0x80)
+                        lcdtg_i2c_send_bit(base | POWER0_COM_DOUT);
+                else
+                        lcdtg_i2c_send_bit(base);
+                data <<= 1;
+        }
+}
+
+static void lcdtg_i2c_wait_ack(u8 base)
+{
+        lcdtg_i2c_send_bit(base);
+}
+
+static void lcdtg_set_common_voltage(u8 base_data, u8 data)
+{
+        /* Set Common Voltage to M62332FP via I2C */
+        lcdtg_i2c_send_start(base_data);
+        lcdtg_i2c_send_byte(base_data, 0x9c);
+        lcdtg_i2c_wait_ack(base_data);
+        lcdtg_i2c_send_byte(base_data, 0x00);
+        lcdtg_i2c_wait_ack(base_data);
+        lcdtg_i2c_send_byte(base_data, data);
+        lcdtg_i2c_wait_ack(base_data);
+        lcdtg_i2c_send_stop(base_data);
+}
+
+/* Set Phase Adjuct */
+static void lcdtg_set_phadadj(struct w100fb_par *par)
+{
+        int adj;
+        switch(par->xres) {
+                case 480:
+                case 640:
+                        /* Setting for VGA */
+                        adj = sharpsl_param.phadadj;
+                        if (adj < 0) {
+                                adj = PHACTRL_PHASE_MANUAL;
+                        } else {
+                                adj = ((adj & 0x0f) << 1) | PHACTRL_PHASE_MANUAL;
+                        }
+                        break;
+                case 240:
+                case 320:
+                default:
+                        /* Setting for QVGA */
+                        adj = (DEFAULT_PHAD_QVGA << 1) | PHACTRL_PHASE_MANUAL;
+                        break;
+        }
+
+        corgi_ssp_lcdtg_send(PHACTRL_ADRS, adj);
+}
+
+static int lcd_inited;
+
+static void lcdtg_hw_init(struct w100fb_par *par)
+{
+        if (!lcd_inited) {
+                int comadj;
+
+                /* Initialize Internal Logic & Port */
+                corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_POWER_DOWN | PICTRL_INIOFF | PICTRL_INIT_STATE
+                                | PICTRL_COM_SIGNAL_OFF | PICTRL_DAC_SIGNAL_OFF);
+
+                corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_OFF
+                                | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+                corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
+
+                /* VDD(+8V), SVSS(-4V) ON */
+                corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
+                mdelay(3);
+
+                /* DAC ON */
+                corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON
+                                | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+                /* INIB = H, INI = L  */
+                /* PICTL[0] = H , PICTL[1] = PICTL[2] = PICTL[4] = L */
+                corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE | PICTRL_COM_SIGNAL_OFF);
+
+                /* Set Common Voltage */
+                comadj = sharpsl_param.comadj;
+                if (comadj < 0)
+                        comadj = DEFAULT_COMADJ;
+                lcdtg_set_common_voltage((POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF), comadj);
+
+                /* VCC5 ON, DAC ON */
+                corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON |
+                                POWER0_COM_OFF | POWER0_VCC5_ON);
+
+                /* GVSS(-8V) ON, VDD ON */
+                corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
+                mdelay(2);
+
+                /* COM SIGNAL ON (PICTL[3] = L) */
+                corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIT_STATE);
+
+                /* COM ON, DAC ON, VCC5_ON */
+                corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_COM_DCLK | POWER0_COM_DOUT | POWER0_DAC_ON
+                                | POWER0_COM_ON | POWER0_VCC5_ON);
+
+                /* VW ON, GVSS ON, VDD ON */
+                corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_ON | POWER1_GVSS_ON | POWER1_VDD_ON);
+
+                /* Signals output enable */
+                corgi_ssp_lcdtg_send(PICTRL_ADRS, 0);
+
+                /* Set Phase Adjuct */
+                lcdtg_set_phadadj(par);
+
+                /* Initialize for Input Signals from ATI */
+                corgi_ssp_lcdtg_send(POLCTRL_ADRS, POLCTRL_SYNC_POL_RISE | POLCTRL_EN_POL_RISE
+                                | POLCTRL_DATA_POL_RISE | POLCTRL_SYNC_ACT_L | POLCTRL_EN_ACT_H);
+                udelay(1000);
+
+                lcd_inited=1;
+        } else {
+                lcdtg_set_phadadj(par);
+        }
+
+        switch(par->xres) {
+                case 480:
+                case 640:
+                        /* Set Lcd Resolution (VGA) */
+                        corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_VGA);
+                        break;
+                case 240:
+                case 320:
+                default:
+                        /* Set Lcd Resolution (QVGA) */
+                        corgi_ssp_lcdtg_send(RESCTL_ADRS, RESCTL_QVGA);
+                        break;
+        }
+}
+
+static void lcdtg_suspend(struct w100fb_par *par)
+{
+        /* 60Hz x 2 frame = 16.7msec x 2 = 33.4 msec */
+        mdelay(34);
+
+        /* (1)VW OFF */
+        corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_ON | POWER1_VDD_ON);
+
+        /* (2)COM OFF */
+        corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_COM_SIGNAL_OFF);
+        corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON);
+
+        /* (3)Set Common Voltage Bias 0V */
+        lcdtg_set_common_voltage(POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_ON, 0);
+
+        /* (4)GVSS OFF */
+        corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_ON);
+
+        /* (5)VCC5 OFF */
+        corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_ON | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        /* (6)Set PDWN, INIOFF, DACOFF */
+        corgi_ssp_lcdtg_send(PICTRL_ADRS, PICTRL_INIOFF | PICTRL_DAC_SIGNAL_OFF |
+                        PICTRL_POWER_DOWN | PICTRL_COM_SIGNAL_OFF);
+
+        /* (7)DAC OFF */
+        corgi_ssp_lcdtg_send(POWERREG0_ADRS, POWER0_DAC_OFF | POWER0_COM_OFF | POWER0_VCC5_OFF);
+
+        /* (8)VDD OFF */
+        corgi_ssp_lcdtg_send(POWERREG1_ADRS, POWER1_VW_OFF | POWER1_GVSS_OFF | POWER1_VDD_OFF);
+
+        lcd_inited = 0;
+}
+
+static struct w100_tg_info corgi_lcdtg_info = {
+        .change=lcdtg_hw_init,
+        .suspend=lcdtg_suspend,
+        .resume=lcdtg_hw_init,
+};
+
+/*
+ * Corgi w100 Frame Buffer Device
+ */
+
+static struct w100_mem_info corgi_fb_mem = {
+        .ext_cntl          = 0x00040003,
+        .sdram_mode_reg    = 0x00650021,
+        .ext_timing_cntl   = 0x10002a4a,
+        .io_cntl           = 0x7ff87012,
+        .size              = 0x1fffff,
+};
+
+static struct w100_gen_regs corgi_fb_regs = {
+        .lcd_format    = 0x00000003,
+        .lcdd_cntl1    = 0x01CC0000,
+        .lcdd_cntl2    = 0x0003FFFF,
+        .genlcd_cntl1  = 0x00FFFF0D,
+        .genlcd_cntl2  = 0x003F3003,
+        .genlcd_cntl3  = 0x000102aa,
+};
+
+static struct w100_gpio_regs corgi_fb_gpio = {
+        .init_data1   = 0x000000bf,
+        .init_data2   = 0x00000000,
+        .gpio_dir1    = 0x00000000,
+        .gpio_oe1     = 0x03c0feff,
+        .gpio_dir2    = 0x00000000,
+        .gpio_oe2     = 0x00000000,
+};
+
+static struct w100_mode corgi_fb_modes[] = {
+{
+        .xres            = 480,
+        .yres            = 640,
+        .left_margin     = 0x56,
+        .right_margin    = 0x55,
+        .upper_margin    = 0x03,
+        .lower_margin    = 0x00,
+        .crtc_ss         = 0x82360056,
+        .crtc_ls         = 0xA0280000,
+        .crtc_gs         = 0x80280028,
+        .crtc_vpos_gs    = 0x02830002,
+        .crtc_rev        = 0x00400008,
+        .crtc_dclk       = 0xA0000000,
+        .crtc_gclk       = 0x8015010F,
+        .crtc_goe        = 0x80100110,
+        .crtc_ps1_active = 0x41060010,
+        .pll_freq        = 75,
+        .fast_pll_freq   = 100,
+        .sysclk_src      = CLK_SRC_PLL,
+        .sysclk_divider  = 0,
+        .pixclk_src      = CLK_SRC_PLL,
+        .pixclk_divider  = 2,
+        .pixclk_divider_rotated = 6,
+},{
+        .xres            = 240,
+        .yres            = 320,
+        .left_margin     = 0x27,
+        .right_margin    = 0x2e,
+        .upper_margin    = 0x01,
+        .lower_margin    = 0x00,
+        .crtc_ss         = 0x81170027,
+        .crtc_ls         = 0xA0140000,
+        .crtc_gs         = 0xC0140014,
+        .crtc_vpos_gs    = 0x00010141,
+        .crtc_rev        = 0x00400008,
+        .crtc_dclk       = 0xA0000000,
+        .crtc_gclk       = 0x8015010F,
+        .crtc_goe        = 0x80100110,
+        .crtc_ps1_active = 0x41060010,
+        .pll_freq        = 0,
+        .fast_pll_freq   = 0,
+        .sysclk_src      = CLK_SRC_XTAL,
+        .sysclk_divider  = 0,
+        .pixclk_src      = CLK_SRC_XTAL,
+        .pixclk_divider  = 1,
+        .pixclk_divider_rotated = 1,
+},
+
+};
+
+static struct w100fb_mach_info corgi_fb_info = {
+        .tg         = &corgi_lcdtg_info,
+        .init_mode  = INIT_MODE_ROTATED,
+        .mem        = &corgi_fb_mem,
+        .regs       = &corgi_fb_regs,
+        .modelist   = &corgi_fb_modes[0],
+        .num_modes  = 2,
+        .gpio       = &corgi_fb_gpio,
+        .xtal_freq  = 12500000,
+        .xtal_dbl   = 0,
+};
+
+static struct resource corgi_fb_resources[] = {
+        [0] = {
+                .start   = 0x08000000,
+                .end     = 0x08ffffff,
+                .flags   = IORESOURCE_MEM,
+        },
+};
+
+struct platform_device corgifb_device = {
+        .name           = "w100fb",
+        .id             = -1,
+        .num_resources  = ARRAY_SIZE(corgi_fb_resources),
+        .resource       = corgi_fb_resources,
+        .dev            = {
+                .platform_data = &corgi_fb_info,
+                .parent = &corgissp_device.dev,
+        },
+
+};
diff --git a/arch/arm/mach-pxa/corgi_ssp.c b/arch/arm/mach-pxa/corgi_ssp.c
index 8ccffba0018f..366a9bde3d8b 100644
--- a/arch/arm/mach-pxa/corgi_ssp.c
+++ b/arch/arm/mach-pxa/corgi_ssp.c
@@ -22,7 +22,7 @@
 #include <asm/arch/corgi.h>
 #include <asm/arch/pxa-regs.h>
 
-static spinlock_t corgi_ssp_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(corgi_ssp_lock);
 static struct ssp_dev corgi_ssp_dev;
 static struct ssp_state corgi_ssp_state;
 
diff --git a/arch/arm/mach-rpc/riscpc.c b/arch/arm/mach-rpc/riscpc.c
index a10268618f74..e3587efec4bf 100644
--- a/arch/arm/mach-rpc/riscpc.c
+++ b/arch/arm/mach-rpc/riscpc.c
@@ -140,7 +140,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-s3c2410/Kconfig b/arch/arm/mach-s3c2410/Kconfig
index d4d03d0daaec..06807c6ee68a 100644
--- a/arch/arm/mach-s3c2410/Kconfig
+++ b/arch/arm/mach-s3c2410/Kconfig
@@ -2,6 +2,13 @@ if ARCH_S3C2410
 
 menu "S3C24XX Implementations"
 
+config MACH_ANUBIS
+        bool "Simtec Electronics ANUBIS"
+        select CPU_S3C2440
+        help
+          Say Y gere if you are using the Simtec Electronics ANUBIS
+          development system
+
 config ARCH_BAST
         bool "Simtec Electronics BAST (EB2410ITX)"
         select CPU_S3C2410
@@ -11,6 +18,14 @@ config ARCH_BAST
 
           Product page: <http://www.simtec.co.uk/products/EB2410ITX/>.
 
+config BAST_PC104_IRQ
+        bool "BAST PC104 IRQ support"
+        depends on ARCH_BAST
+        default y
+        help
+          Say Y here to enable the PC104 IRQ routing on the
+          Simtec BAST (EB2410ITX)
+
 config ARCH_H1940
         bool "IPAQ H1940"
         select CPU_S3C2410
diff --git a/arch/arm/mach-s3c2410/Makefile b/arch/arm/mach-s3c2410/Makefile
index 55ed7c7e57da..b4f1e051c768 100644
--- a/arch/arm/mach-s3c2410/Makefile
+++ b/arch/arm/mach-s3c2410/Makefile
@@ -26,8 +26,13 @@ obj-$(CONFIG_CPU_S3C2440)  += s3c2440.o s3c2440-dsc.o
 obj-$(CONFIG_CPU_S3C2440)  += s3c2440-irq.o
 obj-$(CONFIG_CPU_S3C2440)  += s3c2440-clock.o
 
+# bast extras
+
+obj-$(CONFIG_BAST_PC104_IRQ)    += bast-irq.o
+
 # machine specific support
 
+obj-$(CONFIG_MACH_ANUBIS)       += mach-anubis.o
 obj-$(CONFIG_ARCH_BAST)         += mach-bast.o usb-simtec.o
 obj-$(CONFIG_ARCH_H1940)        += mach-h1940.o
 obj-$(CONFIG_MACH_N30)          += mach-n30.o
diff --git a/arch/arm/mach-s3c2410/bast-irq.c b/arch/arm/mach-s3c2410/bast-irq.c
index 49914709fa09..fbbeb0553006 100644
--- a/arch/arm/mach-s3c2410/bast-irq.c
+++ b/arch/arm/mach-s3c2410/bast-irq.c
@@ -1,6 +1,6 @@
 /* linux/arch/arm/mach-s3c2410/bast-irq.c
  *
- * Copyright (c) 2004 Simtec Electronics
+ * Copyright (c) 2003,2005 Simtec Electronics
  *   Ben Dooks <ben@simtec.co.uk>
  *
  * http://www.simtec.co.uk/products/EB2410ITX/
@@ -21,7 +21,8 @@
  *
  * Modifications:
  *     08-Jan-2003 BJD  Moved from central IRQ code
- */
+ *     21-Aug-2005 BJD  Fixed missing code and compile errors
+*/
 
 
 #include <linux/init.h>
@@ -30,12 +31,19 @@
 #include <linux/ptrace.h>
 #include <linux/sysdev.h>
 
+#include <asm/mach-types.h>
+
 #include <asm/hardware.h>
 #include <asm/irq.h>
 #include <asm/io.h>
 
 #include <asm/mach/irq.h>
-#include <asm/hardware/s3c2410/irq.h>
+
+#include <asm/arch/regs-irq.h>
+#include <asm/arch/bast-map.h>
+#include <asm/arch/bast-irq.h>
+
+#include "irq.h"
 
 #if 0
 #include <asm/debug-ll.h>
@@ -79,15 +87,15 @@ bast_pc104_mask(unsigned int irqno)
         temp = __raw_readb(BAST_VA_PC104_IRQMASK);
         temp &= ~bast_pc104_irqmasks[irqno];
         __raw_writeb(temp, BAST_VA_PC104_IRQMASK);
-
-        if (temp == 0)
-                bast_extint_mask(IRQ_ISA);
 }
 
 static void
-bast_pc104_ack(unsigned int irqno)
+bast_pc104_maskack(unsigned int irqno)
 {
-        bast_extint_ack(IRQ_ISA);
+        struct irqdesc *desc = irq_desc + IRQ_ISA;
+
+        bast_pc104_mask(irqno);
+        desc->chip->ack(IRQ_ISA);
 }
 
 static void
@@ -98,14 +106,12 @@ bast_pc104_unmask(unsigned int irqno)
         temp = __raw_readb(BAST_VA_PC104_IRQMASK);
         temp |= bast_pc104_irqmasks[irqno];
         __raw_writeb(temp, BAST_VA_PC104_IRQMASK);
-
-        bast_extint_unmask(IRQ_ISA);
 }
 
-static struct bast_pc104_chip = {
+static struct irqchip  bast_pc104_chip = {
         .mask        = bast_pc104_mask,
         .unmask      = bast_pc104_unmask,
-        .ack         = bast_pc104_ack
+        .ack         = bast_pc104_maskack
 };
 
 static void
@@ -119,14 +125,49 @@ bast_irq_pc104_demux(unsigned int irq,
 
         stat = __raw_readb(BAST_VA_PC104_IRQREQ) & 0xf;
 
-        for (i = 0; i < 4 && stat != 0; i++) {
-                if (stat & 1) {
-                        irqno = bast_pc104_irqs[i];
-                        desc = irq_desc + irqno;
+        if (unlikely(stat == 0)) {
+                /* ack if we get an irq with nothing (ie, startup) */
+
+                desc = irq_desc + IRQ_ISA;
+                desc->chip->ack(IRQ_ISA);
+        } else {
+                /* handle the IRQ */
+
+                for (i = 0; stat != 0; i++, stat >>= 1) {
+                        if (stat & 1) {
+                                irqno = bast_pc104_irqs[i];
 
-                        desc_handle_irq(irqno, desc, regs);
+                                desc_handle_irq(irqno, irq_desc + irqno, regs);
+                        }
                 }
+        }
+}
 
-                stat >>= 1;
+static __init int bast_irq_init(void)
+{
+        unsigned int i;
+
+        if (machine_is_bast()) {
+                printk(KERN_INFO "BAST PC104 IRQ routing, (c) 2005 Simtec Electronics\n");
+
+                /* zap all the IRQs */
+
+                __raw_writeb(0x0, BAST_VA_PC104_IRQMASK);
+
+                set_irq_chained_handler(IRQ_ISA, bast_irq_pc104_demux);
+
+                /* reigster our IRQs */
+
+                for (i = 0; i < 4; i++) {
+                        unsigned int irqno = bast_pc104_irqs[i];
+
+                        set_irq_chip(irqno, &bast_pc104_chip);
+                        set_irq_handler(irqno, do_level_IRQ);
+                        set_irq_flags(irqno, IRQF_VALID);
+                }
         }
+
+        return 0;
 }
+
+arch_initcall(bast_irq_init);
diff --git a/arch/arm/mach-s3c2410/devs.c b/arch/arm/mach-s3c2410/devs.c
index 4664bd11adc1..0077937a7ab8 100644
--- a/arch/arm/mach-s3c2410/devs.c
+++ b/arch/arm/mach-s3c2410/devs.c
@@ -29,7 +29,7 @@
 #include <asm/mach/arch.h>
 #include <asm/mach/map.h>
 #include <asm/mach/irq.h>
-
+#include <asm/arch/fb.h>
 #include <asm/hardware.h>
 #include <asm/io.h>
 #include <asm/irq.h>
@@ -103,6 +103,15 @@ struct platform_device s3c_device_lcd = {
 
 EXPORT_SYMBOL(s3c_device_lcd);
 
+static struct s3c2410fb_mach_info s3c2410fb_info;
+
+void __init set_s3c2410fb_info(struct s3c2410fb_mach_info *hard_s3c2410fb_info)
+{
+        memcpy(&s3c2410fb_info,hard_s3c2410fb_info,sizeof(struct s3c2410fb_mach_info));
+        s3c_device_lcd.dev.platform_data = &s3c2410fb_info;
+}
+EXPORT_SYMBOL(set_s3c2410fb_info);
+
 /* NAND Controller */
 
 static struct resource s3c_nand_resource[] = {
diff --git a/arch/arm/mach-s3c2410/mach-anubis.c b/arch/arm/mach-s3c2410/mach-anubis.c
new file mode 100644
index 000000000000..f87aa0b669ad
--- /dev/null
+++ b/arch/arm/mach-s3c2410/mach-anubis.c
@@ -0,0 +1,270 @@
+/* linux/arch/arm/mach-s3c2410/mach-anubis.c
+ *
+ * Copyright (c) 2003-2005 Simtec Electronics
+ *      http://armlinux.simtec.co.uk/
+ *      Ben Dooks <ben@simtec.co.uk>
+ *
+ *
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * Modifications:
+ *      02-May-2005 BJD  Copied from mach-bast.c
+*/
+
+#include <linux/kernel.h>
+#include <linux/types.h>
+#include <linux/interrupt.h>
+#include <linux/list.h>
+#include <linux/timer.h>
+#include <linux/init.h>
+#include <linux/device.h>
+
+#include <asm/mach/arch.h>
+#include <asm/mach/map.h>
+#include <asm/mach/irq.h>
+
+#include <asm/arch/anubis-map.h>
+#include <asm/arch/anubis-irq.h>
+#include <asm/arch/anubis-cpld.h>
+
+#include <asm/hardware.h>
+#include <asm/io.h>
+#include <asm/irq.h>
+#include <asm/mach-types.h>
+
+#include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-gpio.h>
+#include <asm/arch/regs-mem.h>
+#include <asm/arch/regs-lcd.h>
+#include <asm/arch/nand.h>
+
+#include <linux/mtd/mtd.h>
+#include <linux/mtd/nand.h>
+#include <linux/mtd/nand_ecc.h>
+#include <linux/mtd/partitions.h>
+
+#include "clock.h"
+#include "devs.h"
+#include "cpu.h"
+
+#define COPYRIGHT ", (c) 2005 Simtec Electronics"
+
+static struct map_desc anubis_iodesc[] __initdata = {
+  /* ISA IO areas */
+
+  { (u32)S3C24XX_VA_ISA_BYTE, 0x0,         SZ_16M, MT_DEVICE },
+  { (u32)S3C24XX_VA_ISA_WORD, 0x0,         SZ_16M, MT_DEVICE },
+
+  /* we could possibly compress the next set down into a set of smaller tables
+   * pagetables, but that would mean using an L2 section, and it still means
+   * we cannot actually feed the same register to an LDR due to 16K spacing
+   */
+
+  /* CPLD control registers */
+
+  { (u32)ANUBIS_VA_CTRL1,       ANUBIS_PA_CTRL1,        SZ_4K, MT_DEVICE },
+  { (u32)ANUBIS_VA_CTRL2,       ANUBIS_PA_CTRL2,        SZ_4K, MT_DEVICE },
+
+  /* IDE drives */
+
+  { (u32)ANUBIS_IDEPRI,         S3C2410_CS3,            SZ_1M, MT_DEVICE },
+  { (u32)ANUBIS_IDEPRIAUX,      S3C2410_CS3+(1<<26),    SZ_1M, MT_DEVICE },
+
+  { (u32)ANUBIS_IDESEC,         S3C2410_CS4,            SZ_1M, MT_DEVICE },
+  { (u32)ANUBIS_IDESECAUX,      S3C2410_CS4+(1<<26),    SZ_1M, MT_DEVICE },
+};
+
+#define UCON S3C2410_UCON_DEFAULT | S3C2410_UCON_UCLK
+#define ULCON S3C2410_LCON_CS8 | S3C2410_LCON_PNONE | S3C2410_LCON_STOPB
+#define UFCON S3C2410_UFCON_RXTRIG8 | S3C2410_UFCON_FIFOMODE
+
+static struct s3c24xx_uart_clksrc anubis_serial_clocks[] = {
+        [0] = {
+                .name           = "uclk",
+                .divisor        = 1,
+                .min_baud       = 0,
+                .max_baud       = 0,
+        },
+        [1] = {
+                .name           = "pclk",
+                .divisor        = 1,
+                .min_baud       = 0,
+                .max_baud       = 0.
+        }
+};
+
+
+static struct s3c2410_uartcfg anubis_uartcfgs[] = {
+        [0] = {
+                .hwport      = 0,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+                .clocks      = anubis_serial_clocks,
+                .clocks_size = ARRAY_SIZE(anubis_serial_clocks)
+        },
+        [1] = {
+                .hwport      = 2,
+                .flags       = 0,
+                .ucon        = UCON,
+                .ulcon       = ULCON,
+                .ufcon       = UFCON,
+                .clocks      = anubis_serial_clocks,
+                .clocks_size = ARRAY_SIZE(anubis_serial_clocks)
+        },
+};
+
+/* NAND Flash on Anubis board */
+
+static int external_map[]   = { 2 };
+static int chip0_map[]      = { 0 };
+static int chip1_map[]      = { 1 };
+
+struct mtd_partition anubis_default_nand_part[] = {
+        [0] = {
+                .name   = "Boot Agent",
+                .size   = SZ_16K,
+                .offset = 0
+        },
+        [1] = {
+                .name   = "/boot",
+                .size   = SZ_4M - SZ_16K,
+                .offset = SZ_16K,
+        },
+        [2] = {
+                .name   = "user1",
+                .offset = SZ_4M,
+                .size   = SZ_32M - SZ_4M,
+        },
+        [3] = {
+                .name   = "user2",
+                .offset = SZ_32M,
+                .size   = MTDPART_SIZ_FULL,
+        }
+};
+
+/* the Anubis has 3 selectable slots for nand-flash, the two
+ * on-board chip areas, as well as the external slot.
+ *
+ * Note, there is no current hot-plug support for the External
+ * socket.
+*/
+
+static struct s3c2410_nand_set anubis_nand_sets[] = {
+        [1] = {
+                .name           = "External",
+                .nr_chips       = 1,
+                .nr_map         = external_map,
+                .nr_partitions  = ARRAY_SIZE(anubis_default_nand_part),
+                .partitions     = anubis_default_nand_part
+        },
+        [0] = {
+                .name           = "chip0",
+                .nr_chips       = 1,
+                .nr_map         = chip0_map,
+                .nr_partitions  = ARRAY_SIZE(anubis_default_nand_part),
+                .partitions     = anubis_default_nand_part
+        },
+        [2] = {
+                .name           = "chip1",
+                .nr_chips       = 1,
+                .nr_map         = chip1_map,
+                .nr_partitions  = ARRAY_SIZE(anubis_default_nand_part),
+                .partitions     = anubis_default_nand_part
+        },
+};
+
+static void anubis_nand_select(struct s3c2410_nand_set *set, int slot)
+{
+        unsigned int tmp;
+
+        slot = set->nr_map[slot] & 3;
+
+        pr_debug("anubis_nand: selecting slot %d (set %p,%p)\n",
+                 slot, set, set->nr_map);
+
+        tmp = __raw_readb(ANUBIS_VA_CTRL1);
+        tmp &= ~ANUBIS_CTRL1_NANDSEL;
+        tmp |= slot;
+
+        pr_debug("anubis_nand: ctrl1 now %02x\n", tmp);
+
+        __raw_writeb(tmp, ANUBIS_VA_CTRL1);
+}
+
+static struct s3c2410_platform_nand anubis_nand_info = {
+        .tacls          = 25,
+        .twrph0         = 80,
+        .twrph1         = 80,
+        .nr_sets        = ARRAY_SIZE(anubis_nand_sets),
+        .sets           = anubis_nand_sets,
+        .select_chip    = anubis_nand_select,
+};
+
+
+/* Standard Anubis devices */
+
+static struct platform_device *anubis_devices[] __initdata = {
+        &s3c_device_usb,
+        &s3c_device_wdt,
+        &s3c_device_adc,
+        &s3c_device_i2c,
+        &s3c_device_rtc,
+        &s3c_device_nand,
+};
+
+static struct clk *anubis_clocks[] = {
+        &s3c24xx_dclk0,
+        &s3c24xx_dclk1,
+        &s3c24xx_clkout0,
+        &s3c24xx_clkout1,
+        &s3c24xx_uclk,
+};
+
+static struct s3c24xx_board anubis_board __initdata = {
+        .devices       = anubis_devices,
+        .devices_count = ARRAY_SIZE(anubis_devices),
+        .clocks        = anubis_clocks,
+        .clocks_count  = ARRAY_SIZE(anubis_clocks)
+};
+
+void __init anubis_map_io(void)
+{
+        /* initialise the clocks */
+
+        s3c24xx_dclk0.parent = NULL;
+        s3c24xx_dclk0.rate   = 12*1000*1000;
+
+        s3c24xx_dclk1.parent = NULL;
+        s3c24xx_dclk1.rate   = 24*1000*1000;
+
+        s3c24xx_clkout0.parent  = &s3c24xx_dclk0;
+        s3c24xx_clkout1.parent  = &s3c24xx_dclk1;
+
+        s3c24xx_uclk.parent  = &s3c24xx_clkout1;
+
+        s3c_device_nand.dev.platform_data = &anubis_nand_info;
+
+        s3c24xx_init_io(anubis_iodesc, ARRAY_SIZE(anubis_iodesc));
+        s3c24xx_init_clocks(0);
+        s3c24xx_init_uarts(anubis_uartcfgs, ARRAY_SIZE(anubis_uartcfgs));
+        s3c24xx_set_board(&anubis_board);
+
+        /* ensure that the GPIO is setup */
+        s3c2410_gpio_setpin(S3C2410_GPA0, 1);
+}
+
+MACHINE_START(ANUBIS, "Simtec-Anubis")
+        /* Maintainer: Ben Dooks <ben@simtec.co.uk> */
+        .phys_ram       = S3C2410_SDRAM_PA,
+        .phys_io        = S3C2410_PA_UART,
+        .io_pg_offst    = (((u32)S3C24XX_VA_UART) >> 18) & 0xfffc,
+        .boot_params    = S3C2410_SDRAM_PA + 0x100,
+        .map_io         = anubis_map_io,
+        .init_irq       = s3c24xx_init_irq,
+        .timer          = &s3c24xx_timer,
+MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-bast.c b/arch/arm/mach-s3c2410/mach-bast.c
index e9182242da95..1a3367da6408 100644
--- a/arch/arm/mach-s3c2410/mach-bast.c
+++ b/arch/arm/mach-s3c2410/mach-bast.c
@@ -381,7 +381,7 @@ static struct plat_serial8250_port bast_sio_data[] = {
 
 static struct platform_device bast_sio = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = &bast_sio_data,
         },
diff --git a/arch/arm/mach-s3c2410/mach-h1940.c b/arch/arm/mach-s3c2410/mach-h1940.c
index ea4fb1a97a50..6ff1889fbd21 100644
--- a/arch/arm/mach-s3c2410/mach-h1940.c
+++ b/arch/arm/mach-s3c2410/mach-h1940.c
@@ -45,6 +45,9 @@
 
 //#include <asm/debug-ll.h>
 #include <asm/arch/regs-serial.h>
+#include <asm/arch/regs-lcd.h>
+
+#include <asm/arch/fb.h>
 
 #include <linux/serial_core.h>
 
@@ -88,6 +91,48 @@ static struct s3c2410_uartcfg h1940_uartcfgs[] = {
 
 
 
+/**
+ * Set lcd on or off
+ **/
+static struct s3c2410fb_mach_info h1940_lcdcfg __initdata = {
+        .fixed_syncs=           1,
+        .regs={
+                .lcdcon1=       S3C2410_LCDCON1_TFT16BPP | \
+                                S3C2410_LCDCON1_TFT | \
+                                S3C2410_LCDCON1_CLKVAL(0x0C),
+
+                .lcdcon2=       S3C2410_LCDCON2_VBPD(7) | \
+                                S3C2410_LCDCON2_LINEVAL(319) | \
+                                S3C2410_LCDCON2_VFPD(6) | \
+                                S3C2410_LCDCON2_VSPW(0),
+
+                .lcdcon3=       S3C2410_LCDCON3_HBPD(19) | \
+                                S3C2410_LCDCON3_HOZVAL(239) | \
+                                S3C2410_LCDCON3_HFPD(7),
+
+                .lcdcon4=       S3C2410_LCDCON4_MVAL(0) | \
+                                S3C2410_LCDCON4_HSPW(3),
+
+                .lcdcon5=       S3C2410_LCDCON5_FRM565 | \
+                                S3C2410_LCDCON5_INVVLINE | \
+                                S3C2410_LCDCON5_HWSWP,
+        },
+        .lpcsel=        0x02,
+        .gpccon=        0xaa940659,
+        .gpccon_mask=   0xffffffff,
+        .gpcup=         0x0000ffff,
+        .gpcup_mask=    0xffffffff,
+        .gpdcon=        0xaa84aaa0,
+        .gpdcon_mask=   0xffffffff,
+        .gpdup=         0x0000faff,
+        .gpdup_mask=    0xffffffff,
+
+        .width=         240,
+        .height=        320,
+        .xres=          {240,240,240},
+        .yres=          {320,320,320},
+        .bpp=           {16,16,16},
+};
 
 static struct platform_device *h1940_devices[] __initdata = {
         &s3c_device_usb,
@@ -116,6 +161,11 @@ void __init h1940_init_irq(void)
 
 }
 
+void __init h1940_init(void)
+{
+        set_s3c2410fb_info(&h1940_lcdcfg);
+}
+
 MACHINE_START(H1940, "IPAQ-H1940")
         /* Maintainer: Ben Dooks <ben@fluff.org> */
         .phys_ram       = S3C2410_SDRAM_PA,
@@ -124,5 +174,6 @@ MACHINE_START(H1940, "IPAQ-H1940")
         .boot_params    = S3C2410_SDRAM_PA + 0x100,
         .map_io         = h1940_map_io,
         .init_irq       = h1940_init_irq,
+        .init_machine   = h1940_init,
         .timer          = &s3c24xx_timer,
 MACHINE_END
diff --git a/arch/arm/mach-s3c2410/mach-vr1000.c b/arch/arm/mach-s3c2410/mach-vr1000.c
index 924e8464c212..8f9ab2893df4 100644
--- a/arch/arm/mach-s3c2410/mach-vr1000.c
+++ b/arch/arm/mach-s3c2410/mach-vr1000.c
@@ -221,7 +221,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mach-s3c2410/pm-simtec.c b/arch/arm/mach-s3c2410/pm-simtec.c
index 2cb798832223..4c7ccef6c207 100644
--- a/arch/arm/mach-s3c2410/pm-simtec.c
+++ b/arch/arm/mach-s3c2410/pm-simtec.c
@@ -48,7 +48,7 @@ static __init int pm_simtec_init(void)
 
         /* check which machine we are running on */
 
-        if (!machine_is_bast() && !machine_is_vr1000())
+        if (!machine_is_bast() && !machine_is_vr1000() && !machine_is_anubis())
                 return 0;
 
         printk(KERN_INFO "Simtec Board Power Manangement" COPYRIGHT "\n");
diff --git a/arch/arm/mach-s3c2410/time.c b/arch/arm/mach-s3c2410/time.c
index 765a3a9ae032..c0acfb2ad790 100644
--- a/arch/arm/mach-s3c2410/time.c
+++ b/arch/arm/mach-s3c2410/time.c
@@ -164,7 +164,7 @@ static void s3c2410_timer_setup (void)
 
         /* configure the system for whichever machine is in use */
 
-        if (machine_is_bast() || machine_is_vr1000()) {
+        if (machine_is_bast() || machine_is_vr1000() || machine_is_anubis()) {
                 /* timer is at 12MHz, scaler is 1 */
                 timer_usec_ticks = timer_mask_usec_ticks(1, 12000000);
                 tcnt = 12000000 / HZ;
diff --git a/arch/arm/mach-shark/core.c b/arch/arm/mach-shark/core.c
index e737eae4521f..946c0d11c73b 100644
--- a/arch/arm/mach-shark/core.c
+++ b/arch/arm/mach-shark/core.c
@@ -41,7 +41,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
 
 static struct platform_device serial_device = {
         .name                   = "serial8250",
-        .id                     = 0,
+        .id                     = PLAT8250_DEV_PLATFORM,
         .dev                    = {
                 .platform_data  = serial_platform_data,
         },
diff --git a/arch/arm/mm/copypage-v3.S b/arch/arm/mm/copypage-v3.S
index 4940f1908316..3c58ebbf0359 100644
--- a/arch/arm/mm/copypage-v3.S
+++ b/arch/arm/mm/copypage-v3.S
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
                 .text
                 .align  5
diff --git a/arch/arm/mm/copypage-v4wb.S b/arch/arm/mm/copypage-v4wb.S
index b94c345ceb94..83117354b1cd 100644
--- a/arch/arm/mm/copypage-v4wb.S
+++ b/arch/arm/mm/copypage-v4wb.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
         .text
         .align  5
diff --git a/arch/arm/mm/copypage-v4wt.S b/arch/arm/mm/copypage-v4wt.S
index 976793937a93..e1f2af28d549 100644
--- a/arch/arm/mm/copypage-v4wt.S
+++ b/arch/arm/mm/copypage-v4wt.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
         .text
         .align  5
diff --git a/arch/arm/mm/flush.c b/arch/arm/mm/flush.c
index 191788fb18d1..b0208c992576 100644
--- a/arch/arm/mm/flush.c
+++ b/arch/arm/mm/flush.c
@@ -16,6 +16,58 @@
 #include <asm/tlbflush.h>
 
 #ifdef CONFIG_CPU_CACHE_VIPT
+
+void flush_cache_mm(struct mm_struct *mm)
+{
+        if (cache_is_vivt()) {
+                if (cpu_isset(smp_processor_id(), mm->cpu_vm_mask))
+                        __cpuc_flush_user_all();
+                return;
+        }
+
+        if (cache_is_vipt_aliasing()) {
+                asm(    "mcr    p15, 0, %0, c7, c14, 0\n"
+                "       mcr     p15, 0, %0, c7, c5, 0\n"
+                "       mcr     p15, 0, %0, c7, c10, 4"
+                    :
+                    : "r" (0)
+                    : "cc");
+        }
+}
+
+void flush_cache_range(struct vm_area_struct *vma, unsigned long start, unsigned long end)
+{
+        if (cache_is_vivt()) {
+                if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask))
+                        __cpuc_flush_user_range(start & PAGE_MASK, PAGE_ALIGN(end),
+                                                vma->vm_flags);
+                return;
+        }
+
+        if (cache_is_vipt_aliasing()) {
+                asm(    "mcr    p15, 0, %0, c7, c14, 0\n"
+                "       mcr     p15, 0, %0, c7, c5, 0\n"
+                "       mcr     p15, 0, %0, c7, c10, 4"
+                    :
+                    : "r" (0)
+                    : "cc");
+        }
+}
+
+void flush_cache_page(struct vm_area_struct *vma, unsigned long user_addr, unsigned long pfn)
+{
+        if (cache_is_vivt()) {
+                if (cpu_isset(smp_processor_id(), vma->vm_mm->cpu_vm_mask)) {
+                        unsigned long addr = user_addr & PAGE_MASK;
+                        __cpuc_flush_user_range(addr, addr + PAGE_SIZE, vma->vm_flags);
+                }
+                return;
+        }
+
+        if (cache_is_vipt_aliasing())
+                flush_pfn_alias(pfn, user_addr);
+}
+
 #define ALIAS_FLUSH_START       0xffff4000
 
 #define TOP_PTE(x)      pte_offset_kernel(top_pmd, x)
diff --git a/arch/arm/mm/proc-arm1020.S b/arch/arm/mm/proc-arm1020.S
index 5c0ae5260d1c..1d739d282a45 100644
--- a/arch/arm/mm/proc-arm1020.S
+++ b/arch/arm/mm/proc-arm1020.S
@@ -28,7 +28,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1020e.S b/arch/arm/mm/proc-arm1020e.S
index d69389c4d4ba..9b725665b5c7 100644
--- a/arch/arm/mm/proc-arm1020e.S
+++ b/arch/arm/mm/proc-arm1020e.S
@@ -28,7 +28,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1022.S b/arch/arm/mm/proc-arm1022.S
index 747ed963e1df..37b70fa21c76 100644
--- a/arch/arm/mm/proc-arm1022.S
+++ b/arch/arm/mm/proc-arm1022.S
@@ -17,7 +17,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm1026.S b/arch/arm/mm/proc-arm1026.S
index 248110c9cf13..931b690d1be2 100644
--- a/arch/arm/mm/proc-arm1026.S
+++ b/arch/arm/mm/proc-arm1026.S
@@ -17,7 +17,7 @@
 #include <linux/config.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm6_7.S b/arch/arm/mm/proc-arm6_7.S
index 189ef6a71ba1..d0f1bbb48f6c 100644
--- a/arch/arm/mm/proc-arm6_7.S
+++ b/arch/arm/mm/proc-arm6_7.S
@@ -13,7 +13,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S
index 57cfa6a2f54f..c69c9de32391 100644
--- a/arch/arm/mm/proc-arm720.S
+++ b/arch/arm/mm/proc-arm720.S
@@ -33,7 +33,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
diff --git a/arch/arm/mm/proc-macros.S b/arch/arm/mm/proc-macros.S
index 9137fe563599..7cfc2604a1ee 100644
--- a/arch/arm/mm/proc-macros.S
+++ b/arch/arm/mm/proc-macros.S
@@ -4,7 +4,7 @@
  *  VMA_VM_FLAGS
  *  VM_EXEC
  */
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
 /*
diff --git a/arch/arm/mm/proc-sa110.S b/arch/arm/mm/proc-sa110.S
index 360cae905692..34f7e7d3f419 100644
--- a/arch/arm/mm/proc-sa110.S
+++ b/arch/arm/mm/proc-sa110.S
@@ -15,7 +15,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mm/proc-sa1100.S b/arch/arm/mm/proc-sa1100.S
index d447cd5f3dd9..ca14f80d5ab4 100644
--- a/arch/arm/mm/proc-sa1100.S
+++ b/arch/arm/mm/proc-sa1100.S
@@ -20,7 +20,7 @@
 #include <linux/linkage.h>
 #include <linux/init.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/hardware.h>
 #include <asm/pgtable.h>
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S
index 139a38670c5d..eb34823c9dbf 100644
--- a/arch/arm/mm/proc-v6.S
+++ b/arch/arm/mm/proc-v6.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/pgtable.h>
 
diff --git a/arch/arm/mm/tlb-v3.S b/arch/arm/mm/tlb-v3.S
index 44b0daeaff9b..c10786ec8e0a 100644
--- a/arch/arm/mm/tlb-v3.S
+++ b/arch/arm/mm/tlb-v3.S
@@ -13,7 +13,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
 
diff --git a/arch/arm/mm/tlb-v4.S b/arch/arm/mm/tlb-v4.S
index db82ee468248..d6c94457c2b9 100644
--- a/arch/arm/mm/tlb-v4.S
+++ b/arch/arm/mm/tlb-v4.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
 
diff --git a/arch/arm/mm/tlb-v4wb.S b/arch/arm/mm/tlb-v4wb.S
index 7908d5f1f130..cb829ca7845d 100644
--- a/arch/arm/mm/tlb-v4wb.S
+++ b/arch/arm/mm/tlb-v4wb.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
 
diff --git a/arch/arm/mm/tlb-v4wbi.S b/arch/arm/mm/tlb-v4wbi.S
index efbe94bbe1a7..60cfc4a25dd5 100644
--- a/arch/arm/mm/tlb-v4wbi.S
+++ b/arch/arm/mm/tlb-v4wbi.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
 
diff --git a/arch/arm/mm/tlb-v6.S b/arch/arm/mm/tlb-v6.S
index 99ed26e78adf..6f76b89ef46e 100644
--- a/arch/arm/mm/tlb-v6.S
+++ b/arch/arm/mm/tlb-v6.S
@@ -11,7 +11,7 @@
  *  These assume a split I/D TLB.
  */
 #include <linux/linkage.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/tlbflush.h>
 #include "proc-macros.S"
diff --git a/arch/arm/nwfpe/entry26.S b/arch/arm/nwfpe/entry26.S
index 0ed38b0913db..51940a96d6a6 100644
--- a/arch/arm/nwfpe/entry26.S
+++ b/arch/arm/nwfpe/entry26.S
@@ -20,7 +20,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 
 /* This is the kernel's entry point into the floating point emulator.
 It is called from the kernel with code similar to this:
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 345365852f8c..9693e9b4ffd1 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -91,6 +91,13 @@ config OMAP_32K_TIMER_HZ
           Kernel internal timer frequency should be a divisor of 32768,
           such as 64 or 128.
 
+config OMAP_DM_TIMER
+        bool "Use dual-mode timer"
+        default n
+        depends on ARCH_OMAP16XX
+        help
+         Select this option if you want to use OMAP Dual-Mode timers.
+
 choice
         prompt "Low-level debug console UART"
         depends on ARCH_OMAP
@@ -107,6 +114,15 @@ config OMAP_LL_DEBUG_UART3
 
 endchoice
 
+config OMAP_SERIAL_WAKE
+        bool "Enable wake-up events for serial ports"
+        depends OMAP_MUX
+        default y
+        help
+          Select this option if you want to have your system wake up
+          to data on the serial RX line. This allows you to wake the
+          system from serial console.
+
 endmenu
 
 endif
diff --git a/arch/arm/plat-omap/Makefile b/arch/arm/plat-omap/Makefile
index 531e11af54d4..7e144f9cad1c 100644
--- a/arch/arm/plat-omap/Makefile
+++ b/arch/arm/plat-omap/Makefile
@@ -3,7 +3,7 @@
 #
 
 # Common support
-obj-y := common.o dma.o clock.o mux.o gpio.o mcbsp.o usb.o
+obj-y := common.o sram.o sram-fn.o clock.o dma.o mux.o gpio.o mcbsp.o usb.o
 obj-m :=
 obj-n :=
 obj-  :=
@@ -15,3 +15,5 @@ obj-$(CONFIG_ARCH_OMAP16XX) += ocpi.o
 obj-$(CONFIG_PM) += pm.o sleep.o
 
 obj-$(CONFIG_CPU_FREQ) += cpu-omap.o
+obj-$(CONFIG_OMAP_DM_TIMER) += dmtimer.o
+
diff --git a/arch/arm/plat-omap/clock.c b/arch/arm/plat-omap/clock.c
index 59d91b3262ba..52a58b2da288 100644
--- a/arch/arm/plat-omap/clock.c
+++ b/arch/arm/plat-omap/clock.c
@@ -21,6 +21,7 @@
 #include <asm/arch/usb.h>
 
 #include "clock.h"
+#include "sram.h"
 
 static LIST_HEAD(clocks);
 static DECLARE_MUTEX(clocks_sem);
@@ -141,7 +142,7 @@ static struct clk arm_ck = {
 static struct clk armper_ck = {
         .name           = "armper_ck",
         .parent         = &ck_dpll1,
-        .flags          = CLOCK_IN_OMAP730 | CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX |
                           RATE_CKCTL,
         .enable_reg     = ARM_IDLECT2,
         .enable_bit     = EN_PERCK,
@@ -385,7 +386,8 @@ static struct clk uart2_ck = {
         .name           = "uart2_ck",
         /* Direct from ULPD, no parent */
         .rate           = 12000000,
-        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ENABLE_REG_32BIT,
+        .flags          = CLOCK_IN_OMAP1510 | CLOCK_IN_OMAP16XX | ENABLE_REG_32BIT |
+                          ALWAYS_ENABLED,
         .enable_reg     = MOD_CONF_CTRL_0,
         .enable_bit     = 30,   /* Chooses between 12MHz and 48MHz */
         .set_rate       = &set_uart_rate,
@@ -443,6 +445,15 @@ static struct clk usb_hhc_ck16xx = {
         .enable_bit     = 8 /* UHOST_EN */,
 };
 
+static struct clk usb_dc_ck = {
+        .name           = "usb_dc_ck",
+        /* Direct from ULPD, no parent */
+        .rate           = 48000000,
+        .flags          = CLOCK_IN_OMAP16XX | RATE_FIXED,
+        .enable_reg     = SOFT_REQ_REG,
+        .enable_bit     = 4,
+};
+
 static struct clk mclk_1510 = {
         .name           = "mclk",
         /* Direct from ULPD, no parent. May be enabled by ext hardware. */
@@ -552,6 +563,7 @@ static struct clk *  onchip_clks[] = {
         &uart3_16xx,
         &usb_clko,
         &usb_hhc_ck1510, &usb_hhc_ck16xx,
+        &usb_dc_ck,
         &mclk_1510,  &mclk_16xx,
         &bclk_1510,  &bclk_16xx,
         &mmc1_ck,
@@ -946,14 +958,13 @@ static int select_table_rate(struct clk *  clk, unsigned long rate)
         if (!ptr->rate)
                 return -EINVAL;
 
-        if (!ptr->rate)
-                return -EINVAL;
+        /*
+         * In most cases we should not need to reprogram DPLL.
+         * Reprogramming the DPLL is tricky, it must be done from SRAM.
+         */
+        omap_sram_reprogram_clock(ptr->dpllctl_val, ptr->ckctl_val);
 
-        if (unlikely(ck_dpll1.rate == 0)) {
-                omap_writew(ptr->dpllctl_val, DPLL_CTL);
-                ck_dpll1.rate = ptr->pll_rate;
-        }
-        omap_writew(ptr->ckctl_val, ARM_CKCTL);
+        ck_dpll1.rate = ptr->pll_rate;
         propagate_rate(&ck_dpll1);
         return 0;
 }
@@ -1224,9 +1235,11 @@ int __init clk_init(void)
 #endif
         /* Cache rates for clocks connected to ck_ref (not dpll1) */
         propagate_rate(&ck_ref);
-        printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): %ld.%01ld/%ld/%ld MHz\n",
+        printk(KERN_INFO "Clocking rate (xtal/DPLL1/MPU): "
+                "%ld.%01ld/%ld.%01ld/%ld.%01ld MHz\n",
                ck_ref.rate / 1000000, (ck_ref.rate / 100000) % 10,
-               ck_dpll1.rate, arm_ck.rate);
+               ck_dpll1.rate / 1000000, (ck_dpll1.rate / 100000) % 10,
+               arm_ck.rate / 1000000, (arm_ck.rate / 100000) % 10);
 
 #ifdef CONFIG_MACH_OMAP_PERSEUS2
         /* Select slicer output as OMAP input clock */
@@ -1271,7 +1284,9 @@ static int __init omap_late_clk_reset(void)
         struct clk *p;
         __u32 regval32;
 
-        omap_writew(0, SOFT_REQ_REG);
+        /* USB_REQ_EN will be disabled later if necessary (usb_dc_ck) */
+        regval32 = omap_readw(SOFT_REQ_REG) & (1 << 4);
+        omap_writew(regval32, SOFT_REQ_REG);
         omap_writew(0, SOFT_REQ_REG2);
 
         list_for_each_entry(p, &clocks, node) {
diff --git a/arch/arm/plat-omap/common.c b/arch/arm/plat-omap/common.c
index ea967a8f6ce5..6cb20aea7f51 100644
--- a/arch/arm/plat-omap/common.c
+++ b/arch/arm/plat-omap/common.c
@@ -26,6 +26,7 @@
 #include <asm/hardware/clock.h>
 #include <asm/io.h>
 #include <asm/mach-types.h>
+#include <asm/setup.h>
 
 #include <asm/arch/board.h>
 #include <asm/arch/mux.h>
@@ -35,11 +36,11 @@
 
 #define NO_LENGTH_CHECK 0xffffffff
 
-extern int omap_bootloader_tag_len;
-extern u8 omap_bootloader_tag[];
+unsigned char omap_bootloader_tag[512];
+int omap_bootloader_tag_len;
 
 struct omap_board_config_kernel *omap_board_config;
-int omap_board_config_size = 0;
+int omap_board_config_size;
 
 static const void *get_config(u16 tag, size_t len, int skip, size_t *len_out)
 {
diff --git a/arch/arm/plat-omap/dma.c b/arch/arm/plat-omap/dma.c
index c0a5c2fa42bd..da7b65145658 100644
--- a/arch/arm/plat-omap/dma.c
+++ b/arch/arm/plat-omap/dma.c
@@ -425,7 +425,7 @@ static int dma_handle_ch(int ch)
                 dma_chan[ch + 6].saved_csr = csr >> 7;
                 csr &= 0x7f;
         }
-        if (!csr)
+        if ((csr & 0x3f) == 0)
                 return 0;
         if (unlikely(dma_chan[ch].dev_id == -1)) {
                 printk(KERN_WARNING "Spurious interrupt from DMA channel %d (CSR %04x)\n",
@@ -890,11 +890,11 @@ void omap_enable_lcd_dma(void)
         w |= 1 << 8;
         omap_writew(w, OMAP1610_DMA_LCD_CTRL);
 
+        lcd_dma.active = 1;
+
         w = omap_readw(OMAP1610_DMA_LCD_CCR);
         w |= 1 << 7;
         omap_writew(w, OMAP1610_DMA_LCD_CCR);
-
-        lcd_dma.active = 1;
 }
 
 void omap_setup_lcd_dma(void)
@@ -965,8 +965,8 @@ void omap_clear_dma(int lch)
  */
 dma_addr_t omap_get_dma_src_pos(int lch)
 {
-        return (dma_addr_t) (OMAP_DMA_CSSA_L(lch) |
-                             (OMAP_DMA_CSSA_U(lch) << 16));
+        return (dma_addr_t) (omap_readw(OMAP_DMA_CSSA_L(lch)) |
+        (omap_readw(OMAP_DMA_CSSA_U(lch)) << 16));
 }
 
 /*
@@ -979,8 +979,18 @@ dma_addr_t omap_get_dma_src_pos(int lch)
  */
 dma_addr_t omap_get_dma_dst_pos(int lch)
 {
-        return (dma_addr_t) (OMAP_DMA_CDSA_L(lch) |
-                             (OMAP_DMA_CDSA_U(lch) << 16));
+        return (dma_addr_t) (omap_readw(OMAP_DMA_CDSA_L(lch)) |
+        (omap_readw(OMAP_DMA_CDSA_U(lch)) << 16));
+}
+
+/*
+ * Returns current source transfer counting for the given DMA channel.
+ * Can be used to monitor the progress of a transfer inside a  block.
+ * It must be called with disabled interrupts.
+ */
+int omap_get_dma_src_addr_counter(int lch)
+{
+        return (dma_addr_t) omap_readw(OMAP_DMA_CSAC(lch));
 }
 
 int omap_dma_running(void)
@@ -1076,6 +1086,7 @@ arch_initcall(omap_init_dma);
 
 EXPORT_SYMBOL(omap_get_dma_src_pos);
 EXPORT_SYMBOL(omap_get_dma_dst_pos);
+EXPORT_SYMBOL(omap_get_dma_src_addr_counter);
 EXPORT_SYMBOL(omap_clear_dma);
 EXPORT_SYMBOL(omap_set_dma_priority);
 EXPORT_SYMBOL(omap_request_dma);
diff --git a/arch/arm/plat-omap/dmtimer.c b/arch/arm/plat-omap/dmtimer.c
new file mode 100644
index 000000000000..a1468d7326eb
--- /dev/null
+++ b/arch/arm/plat-omap/dmtimer.c
@@ -0,0 +1,260 @@
+/*
+ * linux/arch/arm/plat-omap/dmtimer.c
+ *
+ * OMAP Dual-Mode Timers
+ *
+ * Copyright (C) 2005 Nokia Corporation
+ * Author: Lauri Leukkunen <lauri.leukkunen@nokia.com>
+ *
+ * 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.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN
+ * NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * You should have received a copy of the  GNU General Public License along
+ * with this program; if not, write  to the Free Software Foundation, Inc.,
+ * 675 Mass Ave, Cambridge, MA 02139, USA.
+ */
+
+#include <linux/init.h>
+#include <asm/arch/hardware.h>
+#include <asm/arch/dmtimer.h>
+#include <asm/io.h>
+#include <asm/arch/irqs.h>
+#include <linux/spinlock.h>
+#include <linux/list.h>
+
+#define OMAP_TIMER_COUNT                8
+
+#define OMAP_TIMER_ID_REG               0x00
+#define OMAP_TIMER_OCP_CFG_REG          0x10
+#define OMAP_TIMER_SYS_STAT_REG         0x14
+#define OMAP_TIMER_STAT_REG             0x18
+#define OMAP_TIMER_INT_EN_REG           0x1c
+#define OMAP_TIMER_WAKEUP_EN_REG        0x20
+#define OMAP_TIMER_CTRL_REG             0x24
+#define OMAP_TIMER_COUNTER_REG          0x28
+#define OMAP_TIMER_LOAD_REG             0x2c
+#define OMAP_TIMER_TRIGGER_REG          0x30
+#define OMAP_TIMER_WRITE_PEND_REG       0x34
+#define OMAP_TIMER_MATCH_REG            0x38
+#define OMAP_TIMER_CAPTURE_REG          0x3c
+#define OMAP_TIMER_IF_CTRL_REG          0x40
+
+
+static struct dmtimer_info_struct {
+        struct list_head        unused_timers;
+        struct list_head        reserved_timers;
+} dm_timer_info;
+
+static struct omap_dm_timer dm_timers[] = {
+        { .base=0xfffb1400, .irq=INT_1610_GPTIMER1 },
+        { .base=0xfffb1c00, .irq=INT_1610_GPTIMER2 },
+        { .base=0xfffb2400, .irq=INT_1610_GPTIMER3 },
+        { .base=0xfffb2c00, .irq=INT_1610_GPTIMER4 },
+        { .base=0xfffb3400, .irq=INT_1610_GPTIMER5 },
+        { .base=0xfffb3c00, .irq=INT_1610_GPTIMER6 },
+        { .base=0xfffb4400, .irq=INT_1610_GPTIMER7 },
+        { .base=0xfffb4c00, .irq=INT_1610_GPTIMER8 },
+        { .base=0x0 },
+};
+
+
+static spinlock_t dm_timer_lock;
+
+
+inline void omap_dm_timer_write_reg(struct omap_dm_timer *timer, int reg, u32 value)
+{
+        omap_writel(value, timer->base + reg);
+        while (omap_dm_timer_read_reg(timer, OMAP_TIMER_WRITE_PEND_REG))
+                ;
+}
+
+u32 omap_dm_timer_read_reg(struct omap_dm_timer *timer, int reg)
+{
+        return omap_readl(timer->base + reg);
+}
+
+int omap_dm_timers_active(void)
+{
+        struct omap_dm_timer *timer;
+
+        for (timer = &dm_timers[0]; timer->base; ++timer)
+                if (omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG) &
+                    OMAP_TIMER_CTRL_ST)
+                        return 1;
+
+        return 0;
+}
+
+
+void omap_dm_timer_set_source(struct omap_dm_timer *timer, int source)
+{
+        int n = (timer - dm_timers) << 1;
+        u32 l;
+
+        l = omap_readl(MOD_CONF_CTRL_1) & ~(0x03 << n);
+        l |= source << n;
+        omap_writel(l, MOD_CONF_CTRL_1);
+}
+
+
+static void omap_dm_timer_reset(struct omap_dm_timer *timer)
+{
+        /* Reset and set posted mode */
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_IF_CTRL_REG, 0x06);
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_OCP_CFG_REG, 0x02);
+
+        omap_dm_timer_set_source(timer, OMAP_TIMER_SRC_ARMXOR);
+}
+
+
+
+struct omap_dm_timer * omap_dm_timer_request(void)
+{
+        struct omap_dm_timer *timer = NULL;
+        unsigned long flags;
+
+        spin_lock_irqsave(&dm_timer_lock, flags);
+        if (!list_empty(&dm_timer_info.unused_timers)) {
+                timer = (struct omap_dm_timer *)
+                                dm_timer_info.unused_timers.next;
+                list_move_tail((struct list_head *)timer,
+                                &dm_timer_info.reserved_timers);
+        }
+        spin_unlock_irqrestore(&dm_timer_lock, flags);
+
+        return timer;
+}
+
+
+void omap_dm_timer_free(struct omap_dm_timer *timer)
+{
+        unsigned long flags;
+
+        omap_dm_timer_reset(timer);
+
+        spin_lock_irqsave(&dm_timer_lock, flags);
+        list_move_tail((struct list_head *)timer, &dm_timer_info.unused_timers);
+        spin_unlock_irqrestore(&dm_timer_lock, flags);
+}
+
+void omap_dm_timer_set_int_enable(struct omap_dm_timer *timer,
+                                unsigned int value)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_INT_EN_REG, value);
+}
+
+unsigned int omap_dm_timer_read_status(struct omap_dm_timer *timer)
+{
+        return omap_dm_timer_read_reg(timer, OMAP_TIMER_STAT_REG);
+}
+
+void omap_dm_timer_write_status(struct omap_dm_timer *timer, unsigned int value)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_STAT_REG, value);
+}
+
+void omap_dm_timer_enable_autoreload(struct omap_dm_timer *timer)
+{
+        u32 l;
+        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
+        l |= OMAP_TIMER_CTRL_AR;
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+}
+
+void omap_dm_timer_trigger(struct omap_dm_timer *timer)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_TRIGGER_REG, 1);
+}
+
+void omap_dm_timer_set_trigger(struct omap_dm_timer *timer, unsigned int value)
+{
+        u32 l;
+
+        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
+        l |= value & 0x3;
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+}
+
+void omap_dm_timer_start(struct omap_dm_timer *timer)
+{
+        u32 l;
+
+        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
+        l |= OMAP_TIMER_CTRL_ST;
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+}
+
+void omap_dm_timer_stop(struct omap_dm_timer *timer)
+{
+        u32 l;
+
+        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
+        l &= ~0x1;
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+}
+
+unsigned int omap_dm_timer_read_counter(struct omap_dm_timer *timer)
+{
+        return omap_dm_timer_read_reg(timer, OMAP_TIMER_COUNTER_REG);
+}
+
+void omap_dm_timer_reset_counter(struct omap_dm_timer *timer)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_COUNTER_REG, 0);
+}
+
+void omap_dm_timer_set_load(struct omap_dm_timer *timer, unsigned int load)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_LOAD_REG, load);
+}
+
+void omap_dm_timer_set_match(struct omap_dm_timer *timer, unsigned int match)
+{
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_MATCH_REG, match);
+}
+
+void omap_dm_timer_enable_compare(struct omap_dm_timer *timer)
+{
+        u32 l;
+
+        l = omap_dm_timer_read_reg(timer, OMAP_TIMER_CTRL_REG);
+        l |= OMAP_TIMER_CTRL_CE;
+        omap_dm_timer_write_reg(timer, OMAP_TIMER_CTRL_REG, l);
+}
+
+
+static inline void __dm_timer_init(void)
+{
+        struct omap_dm_timer *timer;
+
+        spin_lock_init(&dm_timer_lock);
+        INIT_LIST_HEAD(&dm_timer_info.unused_timers);
+        INIT_LIST_HEAD(&dm_timer_info.reserved_timers);
+
+        timer = &dm_timers[0];
+        while (timer->base) {
+                list_add_tail((struct list_head *)timer, &dm_timer_info.unused_timers);
+                omap_dm_timer_reset(timer);
+                timer++;
+        }
+}
+
+static int __init omap_dm_timer_init(void)
+{
+        if (cpu_is_omap16xx())
+                __dm_timer_init();
+        return 0;
+}
+
+arch_initcall(omap_dm_timer_init);
diff --git a/arch/arm/plat-omap/gpio.c b/arch/arm/plat-omap/gpio.c
index aa481ea3d702..55059a24ad41 100644
--- a/arch/arm/plat-omap/gpio.c
+++ b/arch/arm/plat-omap/gpio.c
@@ -3,7 +3,7 @@
  *
  * Support functions for OMAP GPIO
  *
- * Copyright (C) 2003 Nokia Corporation
+ * Copyright (C) 2003-2005 Nokia Corporation
  * Written by Juha Yrjölä <juha.yrjola@nokia.com>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -17,8 +17,11 @@
 #include <linux/sched.h>
 #include <linux/interrupt.h>
 #include <linux/ptrace.h>
+#include <linux/sysdev.h>
+#include <linux/err.h>
 
 #include <asm/hardware.h>
+#include <asm/hardware/clock.h>
 #include <asm/irq.h>
 #include <asm/arch/irqs.h>
 #include <asm/arch/gpio.h>
@@ -29,7 +32,7 @@
 /*
  * OMAP1510 GPIO registers
  */
-#define OMAP1510_GPIO_BASE              0xfffce000
+#define OMAP1510_GPIO_BASE              (void __iomem *)0xfffce000
 #define OMAP1510_GPIO_DATA_INPUT        0x00
 #define OMAP1510_GPIO_DATA_OUTPUT       0x04
 #define OMAP1510_GPIO_DIR_CONTROL       0x08
@@ -43,34 +46,37 @@
 /*
  * OMAP1610 specific GPIO registers
  */
-#define OMAP1610_GPIO1_BASE             0xfffbe400
-#define OMAP1610_GPIO2_BASE             0xfffbec00
-#define OMAP1610_GPIO3_BASE             0xfffbb400
-#define OMAP1610_GPIO4_BASE             0xfffbbc00
+#define OMAP1610_GPIO1_BASE             (void __iomem *)0xfffbe400
+#define OMAP1610_GPIO2_BASE             (void __iomem *)0xfffbec00
+#define OMAP1610_GPIO3_BASE             (void __iomem *)0xfffbb400
+#define OMAP1610_GPIO4_BASE             (void __iomem *)0xfffbbc00
 #define OMAP1610_GPIO_REVISION          0x0000
 #define OMAP1610_GPIO_SYSCONFIG         0x0010
 #define OMAP1610_GPIO_SYSSTATUS         0x0014
 #define OMAP1610_GPIO_IRQSTATUS1        0x0018
 #define OMAP1610_GPIO_IRQENABLE1        0x001c
+#define OMAP1610_GPIO_WAKEUPENABLE      0x0028
 #define OMAP1610_GPIO_DATAIN            0x002c
 #define OMAP1610_GPIO_DATAOUT           0x0030
 #define OMAP1610_GPIO_DIRECTION         0x0034
 #define OMAP1610_GPIO_EDGE_CTRL1        0x0038
 #define OMAP1610_GPIO_EDGE_CTRL2        0x003c
 #define OMAP1610_GPIO_CLEAR_IRQENABLE1  0x009c
+#define OMAP1610_GPIO_CLEAR_WAKEUPENA   0x00a8
 #define OMAP1610_GPIO_CLEAR_DATAOUT     0x00b0
 #define OMAP1610_GPIO_SET_IRQENABLE1    0x00dc
+#define OMAP1610_GPIO_SET_WAKEUPENA     0x00e8
 #define OMAP1610_GPIO_SET_DATAOUT       0x00f0
 
 /*
  * OMAP730 specific GPIO registers
  */
-#define OMAP730_GPIO1_BASE              0xfffbc000
-#define OMAP730_GPIO2_BASE              0xfffbc800
-#define OMAP730_GPIO3_BASE              0xfffbd000
-#define OMAP730_GPIO4_BASE              0xfffbd800
-#define OMAP730_GPIO5_BASE              0xfffbe000
-#define OMAP730_GPIO6_BASE              0xfffbe800
+#define OMAP730_GPIO1_BASE              (void __iomem *)0xfffbc000
+#define OMAP730_GPIO2_BASE              (void __iomem *)0xfffbc800
+#define OMAP730_GPIO3_BASE              (void __iomem *)0xfffbd000
+#define OMAP730_GPIO4_BASE              (void __iomem *)0xfffbd800
+#define OMAP730_GPIO5_BASE              (void __iomem *)0xfffbe000
+#define OMAP730_GPIO6_BASE              (void __iomem *)0xfffbe800
 #define OMAP730_GPIO_DATA_INPUT         0x00
 #define OMAP730_GPIO_DATA_OUTPUT        0x04
 #define OMAP730_GPIO_DIR_CONTROL        0x08
@@ -78,14 +84,43 @@
 #define OMAP730_GPIO_INT_MASK           0x10
 #define OMAP730_GPIO_INT_STATUS         0x14
 
+/*
+ * omap24xx specific GPIO registers
+ */
+#define OMAP24XX_GPIO1_BASE             (void __iomem *)0x48018000
+#define OMAP24XX_GPIO2_BASE             (void __iomem *)0x4801a000
+#define OMAP24XX_GPIO3_BASE             (void __iomem *)0x4801c000
+#define OMAP24XX_GPIO4_BASE             (void __iomem *)0x4801e000
+#define OMAP24XX_GPIO_REVISION          0x0000
+#define OMAP24XX_GPIO_SYSCONFIG         0x0010
+#define OMAP24XX_GPIO_SYSSTATUS         0x0014
+#define OMAP24XX_GPIO_IRQSTATUS1        0x0018
+#define OMAP24XX_GPIO_IRQENABLE1        0x001c
+#define OMAP24XX_GPIO_CTRL              0x0030
+#define OMAP24XX_GPIO_OE                0x0034
+#define OMAP24XX_GPIO_DATAIN            0x0038
+#define OMAP24XX_GPIO_DATAOUT           0x003c
+#define OMAP24XX_GPIO_LEVELDETECT0      0x0040
+#define OMAP24XX_GPIO_LEVELDETECT1      0x0044
+#define OMAP24XX_GPIO_RISINGDETECT      0x0048
+#define OMAP24XX_GPIO_FALLINGDETECT     0x004c
+#define OMAP24XX_GPIO_CLEARIRQENABLE1   0x0060
+#define OMAP24XX_GPIO_SETIRQENABLE1     0x0064
+#define OMAP24XX_GPIO_CLEARWKUENA       0x0080
+#define OMAP24XX_GPIO_SETWKUENA         0x0084
+#define OMAP24XX_GPIO_CLEARDATAOUT      0x0090
+#define OMAP24XX_GPIO_SETDATAOUT        0x0094
+
 #define OMAP_MPUIO_MASK         (~OMAP_MAX_GPIO_LINES & 0xff)
 
 struct gpio_bank {
-        u32 base;
+        void __iomem *base;
         u16 irq;
         u16 virtual_irq_start;
-        u8 method;
+        int method;
         u32 reserved_map;
+        u32 suspend_wakeup;
+        u32 saved_wakeup;
         spinlock_t lock;
 };
 
@@ -93,8 +128,9 @@ struct gpio_bank {
 #define METHOD_GPIO_1510        1
 #define METHOD_GPIO_1610        2
 #define METHOD_GPIO_730         3
+#define METHOD_GPIO_24XX        4
 
-#if defined(CONFIG_ARCH_OMAP16XX)
+#ifdef CONFIG_ARCH_OMAP16XX
 static struct gpio_bank gpio_bank_1610[5] = {
         { OMAP_MPUIO_BASE,     INT_MPUIO,           IH_MPUIO_BASE,     METHOD_MPUIO},
         { OMAP1610_GPIO1_BASE, INT_GPIO_BANK1,      IH_GPIO_BASE,      METHOD_GPIO_1610 },
@@ -123,6 +159,15 @@ static struct gpio_bank gpio_bank_730[7] = {
 };
 #endif
 
+#ifdef CONFIG_ARCH_OMAP24XX
+static struct gpio_bank gpio_bank_24xx[4] = {
+        { OMAP24XX_GPIO1_BASE, INT_24XX_GPIO_BANK1, IH_GPIO_BASE,       METHOD_GPIO_24XX },
+        { OMAP24XX_GPIO2_BASE, INT_24XX_GPIO_BANK2, IH_GPIO_BASE + 32,  METHOD_GPIO_24XX },
+        { OMAP24XX_GPIO3_BASE, INT_24XX_GPIO_BANK3, IH_GPIO_BASE + 64,  METHOD_GPIO_24XX },
+        { OMAP24XX_GPIO4_BASE, INT_24XX_GPIO_BANK4, IH_GPIO_BASE + 96,  METHOD_GPIO_24XX },
+};
+#endif
+
 static struct gpio_bank *gpio_bank;
 static int gpio_bank_count;
 
@@ -149,14 +194,23 @@ static inline struct gpio_bank *get_gpio_bank(int gpio)
                 return &gpio_bank[1 + (gpio >> 5)];
         }
 #endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (cpu_is_omap24xx())
+                return &gpio_bank[gpio >> 5];
+#endif
 }
 
 static inline int get_gpio_index(int gpio)
 {
+#ifdef CONFIG_ARCH_OMAP730
         if (cpu_is_omap730())
                 return gpio & 0x1f;
-        else
-                return gpio & 0x0f;
+#endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (cpu_is_omap24xx())
+                return gpio & 0x1f;
+#endif
+        return gpio & 0x0f;
 }
 
 static inline int gpio_valid(int gpio)
@@ -180,6 +234,10 @@ static inline int gpio_valid(int gpio)
         if (cpu_is_omap730() && gpio < 192)
                 return 0;
 #endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (cpu_is_omap24xx() && gpio < 128)
+                return 0;
+#endif
         return -1;
 }
 
@@ -195,7 +253,7 @@ static int check_gpio(int gpio)
 
 static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
 {
-        u32 reg = bank->base;
+        void __iomem *reg = bank->base;
         u32 l;
 
         switch (bank->method) {
@@ -211,6 +269,9 @@ static void _set_gpio_direction(struct gpio_bank *bank, int gpio, int is_input)
         case METHOD_GPIO_730:
                 reg += OMAP730_GPIO_DIR_CONTROL;
                 break;
+        case METHOD_GPIO_24XX:
+                reg += OMAP24XX_GPIO_OE;
+                break;
         }
         l = __raw_readl(reg);
         if (is_input)
@@ -234,7 +295,7 @@ void omap_set_gpio_direction(int gpio, int is_input)
 
 static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
 {
-        u32 reg = bank->base;
+        void __iomem *reg = bank->base;
         u32 l = 0;
 
         switch (bank->method) {
@@ -269,6 +330,13 @@ static void _set_gpio_dataout(struct gpio_bank *bank, int gpio, int enable)
                 else
                         l &= ~(1 << gpio);
                 break;
+        case METHOD_GPIO_24XX:
+                if (enable)
+                        reg += OMAP24XX_GPIO_SETDATAOUT;
+                else
+                        reg += OMAP24XX_GPIO_CLEARDATAOUT;
+                l = 1 << gpio;
+                break;
         default:
                 BUG();
                 return;
@@ -291,7 +359,7 @@ void omap_set_gpio_dataout(int gpio, int enable)
 int omap_get_gpio_datain(int gpio)
 {
         struct gpio_bank *bank;
-        u32 reg;
+        void __iomem *reg;
 
         if (check_gpio(gpio) < 0)
                 return -1;
@@ -310,109 +378,132 @@ int omap_get_gpio_datain(int gpio)
         case METHOD_GPIO_730:
                 reg += OMAP730_GPIO_DATA_INPUT;
                 break;
+        case METHOD_GPIO_24XX:
+                reg += OMAP24XX_GPIO_DATAIN;
+                break;
         default:
                 BUG();
                 return -1;
         }
-        return (__raw_readl(reg) & (1 << get_gpio_index(gpio))) != 0;
+        return (__raw_readl(reg)
+                        & (1 << get_gpio_index(gpio))) != 0;
 }
 
-static void _set_gpio_edge_ctrl(struct gpio_bank *bank, int gpio, int edge)
+#define MOD_REG_BIT(reg, bit_mask, set) \
+do {    \
+        int l = __raw_readl(base + reg); \
+        if (set) l |= bit_mask; \
+        else l &= ~bit_mask; \
+        __raw_writel(l, base + reg); \
+} while(0)
+
+static inline void set_24xx_gpio_triggering(void __iomem *base, int gpio, int trigger)
 {
-        u32 reg = bank->base;
-        u32 l;
+        u32 gpio_bit = 1 << gpio;
+
+        MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT0, gpio_bit,
+                trigger & IRQT_LOW);
+        MOD_REG_BIT(OMAP24XX_GPIO_LEVELDETECT1, gpio_bit,
+                trigger & IRQT_HIGH);
+        MOD_REG_BIT(OMAP24XX_GPIO_RISINGDETECT, gpio_bit,
+                trigger & IRQT_RISING);
+        MOD_REG_BIT(OMAP24XX_GPIO_FALLINGDETECT, gpio_bit,
+                trigger & IRQT_FALLING);
+        /* FIXME: Possibly do 'set_irq_handler(j, do_level_IRQ)' if only level
+         * triggering requested. */
+}
+
+static int _set_gpio_triggering(struct gpio_bank *bank, int gpio, int trigger)
+{
+        void __iomem *reg = bank->base;
+        u32 l = 0;
 
         switch (bank->method) {
         case METHOD_MPUIO:
                 reg += OMAP_MPUIO_GPIO_INT_EDGE;
                 l = __raw_readl(reg);
-                if (edge == OMAP_GPIO_RISING_EDGE)
+                if (trigger == IRQT_RISING)
                         l |= 1 << gpio;
-                else
+                else if (trigger == IRQT_FALLING)
                         l &= ~(1 << gpio);
-                __raw_writel(l, reg);
+                else
+                        goto bad;
                 break;
         case METHOD_GPIO_1510:
                 reg += OMAP1510_GPIO_INT_CONTROL;
                 l = __raw_readl(reg);
-                if (edge == OMAP_GPIO_RISING_EDGE)
+                if (trigger == IRQT_RISING)
                         l |= 1 << gpio;
-                else
+                else if (trigger == IRQT_FALLING)
                         l &= ~(1 << gpio);
-                __raw_writel(l, reg);
+                else
+                        goto bad;
                 break;
         case METHOD_GPIO_1610:
-                edge &= 0x03;
                 if (gpio & 0x08)
                         reg += OMAP1610_GPIO_EDGE_CTRL2;
                 else
                         reg += OMAP1610_GPIO_EDGE_CTRL1;
                 gpio &= 0x07;
+                /* We allow only edge triggering, i.e. two lowest bits */
+                if (trigger & ~IRQT_BOTHEDGE)
+                        BUG();
+                /* NOTE: knows __IRQT_{FAL,RIS}EDGE match OMAP hardware */
+                trigger &= 0x03;
                 l = __raw_readl(reg);
                 l &= ~(3 << (gpio << 1));
-                l |= edge << (gpio << 1);
-                __raw_writel(l, reg);
+                l |= trigger << (gpio << 1);
                 break;
         case METHOD_GPIO_730:
                 reg += OMAP730_GPIO_INT_CONTROL;
                 l = __raw_readl(reg);
-                if (edge == OMAP_GPIO_RISING_EDGE)
+                if (trigger == IRQT_RISING)
                         l |= 1 << gpio;
-                else
+                else if (trigger == IRQT_FALLING)
                         l &= ~(1 << gpio);
-                __raw_writel(l, reg);
+                else
+                        goto bad;
+                break;
+        case METHOD_GPIO_24XX:
+                set_24xx_gpio_triggering(reg, gpio, trigger);
                 break;
         default:
                 BUG();
-                return;
+                goto bad;
         }
+        __raw_writel(l, reg);
+        return 0;
+bad:
+        return -EINVAL;
 }
 
-void omap_set_gpio_edge_ctrl(int gpio, int edge)
+static int gpio_irq_type(unsigned irq, unsigned type)
 {
         struct gpio_bank *bank;
+        unsigned gpio;
+        int retval;
+
+        if (irq > IH_MPUIO_BASE)
+                gpio = OMAP_MPUIO(irq - IH_MPUIO_BASE);
+        else
+                gpio = irq - IH_GPIO_BASE;
 
         if (check_gpio(gpio) < 0)
-                return;
+                return -EINVAL;
+
+        if (type & (__IRQT_LOWLVL|__IRQT_HIGHLVL|IRQT_PROBE))
+                return -EINVAL;
+
         bank = get_gpio_bank(gpio);
         spin_lock(&bank->lock);
-        _set_gpio_edge_ctrl(bank, get_gpio_index(gpio), edge);
+        retval = _set_gpio_triggering(bank, get_gpio_index(gpio), type);
         spin_unlock(&bank->lock);
-}
-
-
-static int _get_gpio_edge_ctrl(struct gpio_bank *bank, int gpio)
-{
-        u32 reg = bank->base, l;
-
-        switch (bank->method) {
-        case METHOD_MPUIO:
-                l = __raw_readl(reg + OMAP_MPUIO_GPIO_INT_EDGE);
-                return (l & (1 << gpio)) ?
-                        OMAP_GPIO_RISING_EDGE : OMAP_GPIO_FALLING_EDGE;
-        case METHOD_GPIO_1510:
-                l = __raw_readl(reg + OMAP1510_GPIO_INT_CONTROL);
-                return (l & (1 << gpio)) ?
-                        OMAP_GPIO_RISING_EDGE : OMAP_GPIO_FALLING_EDGE;
-        case METHOD_GPIO_1610:
-                if (gpio & 0x08)
-                        reg += OMAP1610_GPIO_EDGE_CTRL2;
-                else
-                        reg += OMAP1610_GPIO_EDGE_CTRL1;
-                return (__raw_readl(reg) >> ((gpio & 0x07) << 1)) & 0x03;
-        case METHOD_GPIO_730:
-                l = __raw_readl(reg + OMAP730_GPIO_INT_CONTROL);
-                return (l & (1 << gpio)) ?
-                        OMAP_GPIO_RISING_EDGE : OMAP_GPIO_FALLING_EDGE;
-        default:
-                BUG();
-                return -1;
-        }
+        return retval;
 }
 
 static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
 {
-        u32 reg = bank->base;
+        void __iomem *reg = bank->base;
 
         switch (bank->method) {
         case METHOD_MPUIO:
@@ -428,6 +519,9 @@ static void _clear_gpio_irqbank(struct gpio_bank *bank, int gpio_mask)
         case METHOD_GPIO_730:
                 reg += OMAP730_GPIO_INT_STATUS;
                 break;
+        case METHOD_GPIO_24XX:
+                reg += OMAP24XX_GPIO_IRQSTATUS1;
+                break;
         default:
                 BUG();
                 return;
@@ -442,7 +536,7 @@ static inline void _clear_gpio_irqstatus(struct gpio_bank *bank, int gpio)
 
 static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enable)
 {
-        u32 reg = bank->base;
+        void __iomem *reg = bank->base;
         u32 l;
 
         switch (bank->method) {
@@ -477,6 +571,13 @@ static void _enable_gpio_irqbank(struct gpio_bank *bank, int gpio_mask, int enab
                 else
                         l |= gpio_mask;
                 break;
+        case METHOD_GPIO_24XX:
+                if (enable)
+                        reg += OMAP24XX_GPIO_SETIRQENABLE1;
+                else
+                        reg += OMAP24XX_GPIO_CLEARIRQENABLE1;
+                l = gpio_mask;
+                break;
         default:
                 BUG();
                 return;
@@ -489,6 +590,50 @@ static inline void _set_gpio_irqenable(struct gpio_bank *bank, int gpio, int ena
         _enable_gpio_irqbank(bank, 1 << get_gpio_index(gpio), enable);
 }
 
+/*
+ * Note that ENAWAKEUP needs to be enabled in GPIO_SYSCONFIG register.
+ * 1510 does not seem to have a wake-up register. If JTAG is connected
+ * to the target, system will wake up always on GPIO events. While
+ * system is running all registered GPIO interrupts need to have wake-up
+ * enabled. When system is suspended, only selected GPIO interrupts need
+ * to have wake-up enabled.
+ */
+static int _set_gpio_wakeup(struct gpio_bank *bank, int gpio, int enable)
+{
+        switch (bank->method) {
+        case METHOD_GPIO_1610:
+        case METHOD_GPIO_24XX:
+                spin_lock(&bank->lock);
+                if (enable)
+                        bank->suspend_wakeup |= (1 << gpio);
+                else
+                        bank->suspend_wakeup &= ~(1 << gpio);
+                spin_unlock(&bank->lock);
+                return 0;
+        default:
+                printk(KERN_ERR "Can't enable GPIO wakeup for method %i\n",
+                       bank->method);
+                return -EINVAL;
+        }
+}
+
+/* Use disable_irq_wake() and enable_irq_wake() functions from drivers */
+static int gpio_wake_enable(unsigned int irq, unsigned int enable)
+{
+        unsigned int gpio = irq - IH_GPIO_BASE;
+        struct gpio_bank *bank;
+        int retval;
+
+        if (check_gpio(gpio) < 0)
+                return -ENODEV;
+        bank = get_gpio_bank(gpio);
+        spin_lock(&bank->lock);
+        retval = _set_gpio_wakeup(bank, get_gpio_index(gpio), enable);
+        spin_unlock(&bank->lock);
+
+        return retval;
+}
+
 int omap_request_gpio(int gpio)
 {
         struct gpio_bank *bank;
@@ -505,15 +650,33 @@ int omap_request_gpio(int gpio)
                 return -1;
         }
         bank->reserved_map |= (1 << get_gpio_index(gpio));
+
+        /* Set trigger to none. You need to enable the trigger after request_irq */
+        _set_gpio_triggering(bank, get_gpio_index(gpio), IRQT_NOEDGE);
+
 #ifdef CONFIG_ARCH_OMAP1510
         if (bank->method == METHOD_GPIO_1510) {
-                u32 reg;
+                void __iomem *reg;
 
-                /* Claim the pin for the ARM */
+                /* Claim the pin for MPU */
                 reg = bank->base + OMAP1510_GPIO_PIN_CONTROL;
                 __raw_writel(__raw_readl(reg) | (1 << get_gpio_index(gpio)), reg);
         }
 #endif
+#ifdef CONFIG_ARCH_OMAP16XX
+        if (bank->method == METHOD_GPIO_1610) {
+                /* Enable wake-up during idle for dynamic tick */
+                void __iomem *reg = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
+                __raw_writel(1 << get_gpio_index(gpio), reg);
+        }
+#endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (bank->method == METHOD_GPIO_24XX) {
+                /* Enable wake-up during idle for dynamic tick */
+                void __iomem *reg = bank->base + OMAP24XX_GPIO_SETWKUENA;
+                __raw_writel(1 << get_gpio_index(gpio), reg);
+        }
+#endif
         spin_unlock(&bank->lock);
 
         return 0;
@@ -533,6 +696,20 @@ void omap_free_gpio(int gpio)
                 spin_unlock(&bank->lock);
                 return;
         }
+#ifdef CONFIG_ARCH_OMAP16XX
+        if (bank->method == METHOD_GPIO_1610) {
+                /* Disable wake-up during idle for dynamic tick */
+                void __iomem *reg = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
+                __raw_writel(1 << get_gpio_index(gpio), reg);
+        }
+#endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (bank->method == METHOD_GPIO_24XX) {
+                /* Disable wake-up during idle for dynamic tick */
+                void __iomem *reg = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
+                __raw_writel(1 << get_gpio_index(gpio), reg);
+        }
+#endif
         bank->reserved_map &= ~(1 << get_gpio_index(gpio));
         _set_gpio_direction(bank, get_gpio_index(gpio), 1);
         _set_gpio_irqenable(bank, gpio, 0);
@@ -552,7 +729,7 @@ void omap_free_gpio(int gpio)
 static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
                              struct pt_regs *regs)
 {
-        u32 isr_reg = 0;
+        void __iomem *isr_reg = NULL;
         u32 isr;
         unsigned int gpio_irq;
         struct gpio_bank *bank;
@@ -574,24 +751,30 @@ static void gpio_irq_handler(unsigned int irq, struct irqdesc *desc,
         if (bank->method == METHOD_GPIO_730)
                 isr_reg = bank->base + OMAP730_GPIO_INT_STATUS;
 #endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (bank->method == METHOD_GPIO_24XX)
+                isr_reg = bank->base + OMAP24XX_GPIO_IRQSTATUS1;
+#endif
 
-        isr = __raw_readl(isr_reg);
-        _enable_gpio_irqbank(bank, isr, 0);
-        _clear_gpio_irqbank(bank, isr);
-        _enable_gpio_irqbank(bank, isr, 1);
-        desc->chip->unmask(irq);
-
-        if (unlikely(!isr))
-                return;
-
-        gpio_irq = bank->virtual_irq_start;
-        for (; isr != 0; isr >>= 1, gpio_irq++) {
-                struct irqdesc *d;
-                if (!(isr & 1))
-                        continue;
-                d = irq_desc + gpio_irq;
-                desc_handle_irq(gpio_irq, d, regs);
-        }
+        while(1) {
+                isr = __raw_readl(isr_reg);
+                _enable_gpio_irqbank(bank, isr, 0);
+                _clear_gpio_irqbank(bank, isr);
+                _enable_gpio_irqbank(bank, isr, 1);
+                desc->chip->unmask(irq);
+
+                if (!isr)
+                        break;
+
+                gpio_irq = bank->virtual_irq_start;
+                for (; isr != 0; isr >>= 1, gpio_irq++) {
+                        struct irqdesc *d;
+                        if (!(isr & 1))
+                                continue;
+                        d = irq_desc + gpio_irq;
+                        desc_handle_irq(gpio_irq, d, regs);
+                }
+        }
 }
 
 static void gpio_ack_irq(unsigned int irq)
@@ -613,14 +796,10 @@ static void gpio_mask_irq(unsigned int irq)
 static void gpio_unmask_irq(unsigned int irq)
 {
         unsigned int gpio = irq - IH_GPIO_BASE;
+        unsigned int gpio_idx = get_gpio_index(gpio);
         struct gpio_bank *bank = get_gpio_bank(gpio);
 
-        if (_get_gpio_edge_ctrl(bank, get_gpio_index(gpio)) == OMAP_GPIO_NO_EDGE) {
-                printk(KERN_ERR "OMAP GPIO %d: trying to enable GPIO IRQ while no edge is set\n",
-                       gpio);
-                _set_gpio_edge_ctrl(bank, get_gpio_index(gpio), OMAP_GPIO_RISING_EDGE);
-        }
-        _set_gpio_irqenable(bank, gpio, 1);
+        _set_gpio_irqenable(bank, gpio_idx, 1);
 }
 
 static void mpuio_ack_irq(unsigned int irq)
@@ -645,9 +824,11 @@ static void mpuio_unmask_irq(unsigned int irq)
 }
 
 static struct irqchip gpio_irq_chip = {
-        .ack    = gpio_ack_irq,
-        .mask   = gpio_mask_irq,
-        .unmask = gpio_unmask_irq,
+        .ack            = gpio_ack_irq,
+        .mask           = gpio_mask_irq,
+        .unmask         = gpio_unmask_irq,
+        .set_type       = gpio_irq_type,
+        .set_wake       = gpio_wake_enable,
 };
 
 static struct irqchip mpuio_irq_chip = {
@@ -657,6 +838,7 @@ static struct irqchip mpuio_irq_chip = {
 };
 
 static int initialized = 0;
+static struct clk * gpio_ck = NULL;
 
 static int __init _omap_gpio_init(void)
 {
@@ -665,6 +847,14 @@ static int __init _omap_gpio_init(void)
 
         initialized = 1;
 
+        if (cpu_is_omap1510()) {
+                gpio_ck = clk_get(NULL, "arm_gpio_ck");
+                if (IS_ERR(gpio_ck))
+                        printk("Could not get arm_gpio_ck\n");
+                else
+                        clk_use(gpio_ck);
+        }
+
 #ifdef CONFIG_ARCH_OMAP1510
         if (cpu_is_omap1510()) {
                 printk(KERN_INFO "OMAP1510 GPIO hardware\n");
@@ -674,7 +864,7 @@ static int __init _omap_gpio_init(void)
 #endif
 #if defined(CONFIG_ARCH_OMAP16XX)
         if (cpu_is_omap16xx()) {
-                int rev;
+                u32 rev;
 
                 gpio_bank_count = 5;
                 gpio_bank = gpio_bank_1610;
@@ -690,6 +880,17 @@ static int __init _omap_gpio_init(void)
                 gpio_bank = gpio_bank_730;
         }
 #endif
+#ifdef CONFIG_ARCH_OMAP24XX
+        if (cpu_is_omap24xx()) {
+                int rev;
+
+                gpio_bank_count = 4;
+                gpio_bank = gpio_bank_24xx;
+                rev = omap_readl(gpio_bank[0].base + OMAP24XX_GPIO_REVISION);
+                printk(KERN_INFO "OMAP24xx GPIO hardware version %d.%d\n",
+                        (rev >> 4) & 0x0f, rev & 0x0f);
+        }
+#endif
         for (i = 0; i < gpio_bank_count; i++) {
                 int j, gpio_count = 16;
 
@@ -710,6 +911,7 @@ static int __init _omap_gpio_init(void)
                 if (bank->method == METHOD_GPIO_1610) {
                         __raw_writew(0x0000, bank->base + OMAP1610_GPIO_IRQENABLE1);
                         __raw_writew(0xffff, bank->base + OMAP1610_GPIO_IRQSTATUS1);
+                        __raw_writew(0x0014, bank->base + OMAP1610_GPIO_SYSCONFIG);
                 }
 #endif
 #ifdef CONFIG_ARCH_OMAP730
@@ -720,6 +922,14 @@ static int __init _omap_gpio_init(void)
                         gpio_count = 32; /* 730 has 32-bit GPIOs */
                 }
 #endif
+#ifdef CONFIG_ARCH_OMAP24XX
+                if (bank->method == METHOD_GPIO_24XX) {
+                        __raw_writel(0x00000000, bank->base + OMAP24XX_GPIO_IRQENABLE1);
+                        __raw_writel(0xffffffff, bank->base + OMAP24XX_GPIO_IRQSTATUS1);
+
+                        gpio_count = 32;
+                }
+#endif
                 for (j = bank->virtual_irq_start;
                      j < bank->virtual_irq_start + gpio_count; j++) {
                         if (bank->method == METHOD_MPUIO)
@@ -735,12 +945,97 @@ static int __init _omap_gpio_init(void)
 
         /* Enable system clock for GPIO module.
          * The CAM_CLK_CTRL *is* really the right place. */
-        if (cpu_is_omap1610() || cpu_is_omap1710())
+        if (cpu_is_omap16xx())
                 omap_writel(omap_readl(ULPD_CAM_CLK_CTRL) | 0x04, ULPD_CAM_CLK_CTRL);
 
         return 0;
 }
 
+#if defined (CONFIG_ARCH_OMAP16XX) || defined (CONFIG_ARCH_OMAP24XX)
+static int omap_gpio_suspend(struct sys_device *dev, pm_message_t mesg)
+{
+        int i;
+
+        if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
+                return 0;
+
+        for (i = 0; i < gpio_bank_count; i++) {
+                struct gpio_bank *bank = &gpio_bank[i];
+                void __iomem *wake_status;
+                void __iomem *wake_clear;
+                void __iomem *wake_set;
+
+                switch (bank->method) {
+                case METHOD_GPIO_1610:
+                        wake_status = bank->base + OMAP1610_GPIO_WAKEUPENABLE;
+                        wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
+                        wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
+                        break;
+                case METHOD_GPIO_24XX:
+                        wake_status = bank->base + OMAP24XX_GPIO_SETWKUENA;
+                        wake_clear = bank->base + OMAP24XX_GPIO_CLEARWKUENA;
+                        wake_set = bank->base + OMAP24XX_GPIO_SETWKUENA;
+                        break;
+                default:
+                        continue;
+                }
+
+                spin_lock(&bank->lock);
+                bank->saved_wakeup = __raw_readl(wake_status);
+                __raw_writel(0xffffffff, wake_clear);
+                __raw_writel(bank->suspend_wakeup, wake_set);
+                spin_unlock(&bank->lock);
+        }
+
+        return 0;
+}
+
+static int omap_gpio_resume(struct sys_device *dev)
+{
+        int i;
+
+        if (!cpu_is_omap24xx() && !cpu_is_omap16xx())
+                return 0;
+
+        for (i = 0; i < gpio_bank_count; i++) {
+                struct gpio_bank *bank = &gpio_bank[i];
+                void __iomem *wake_clear;
+                void __iomem *wake_set;
+
+                switch (bank->method) {
+                case METHOD_GPIO_1610:
+                        wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
+                        wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
+                        break;
+                case METHOD_GPIO_24XX:
+                        wake_clear = bank->base + OMAP1610_GPIO_CLEAR_WAKEUPENA;
+                        wake_set = bank->base + OMAP1610_GPIO_SET_WAKEUPENA;
+                        break;
+                default:
+                        continue;
+                }
+
+                spin_lock(&bank->lock);
+                __raw_writel(0xffffffff, wake_clear);
+                __raw_writel(bank->saved_wakeup, wake_set);
+                spin_unlock(&bank->lock);
+        }
+
+        return 0;
+}
+
+static struct sysdev_class omap_gpio_sysclass = {
+        set_kset_name("gpio"),
+        .suspend        = omap_gpio_suspend,
+        .resume         = omap_gpio_resume,
+};
+
+static struct sys_device omap_gpio_device = {
+        .id             = 0,
+        .cls            = &omap_gpio_sysclass,
+};
+#endif
+
 /*
  * This may get called early from board specific init
  */
@@ -752,11 +1047,30 @@ int omap_gpio_init(void)
                 return 0;
 }
 
+static int __init omap_gpio_sysinit(void)
+{
+        int ret = 0;
+
+        if (!initialized)
+                ret = _omap_gpio_init();
+
+#if defined(CONFIG_ARCH_OMAP16XX) || defined(CONFIG_ARCH_OMAP24XX)
+        if (cpu_is_omap16xx() || cpu_is_omap24xx()) {
+                if (ret == 0) {
+                        ret = sysdev_class_register(&omap_gpio_sysclass);
+                        if (ret == 0)
+                                ret = sysdev_register(&omap_gpio_device);
+                }
+        }
+#endif
+
+        return ret;
+}
+
 EXPORT_SYMBOL(omap_request_gpio);
 EXPORT_SYMBOL(omap_free_gpio);
 EXPORT_SYMBOL(omap_set_gpio_direction);
 EXPORT_SYMBOL(omap_set_gpio_dataout);
 EXPORT_SYMBOL(omap_get_gpio_datain);
-EXPORT_SYMBOL(omap_set_gpio_edge_ctrl);
 
-arch_initcall(omap_gpio_init);
+arch_initcall(omap_gpio_sysinit);
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 43567d5edddb..9c9b7df3faf6 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -27,6 +27,7 @@
 #include <asm/arch/dma.h>
 #include <asm/arch/mux.h>
 #include <asm/arch/irqs.h>
+#include <asm/arch/dsp_common.h>
 #include <asm/arch/mcbsp.h>
 
 #include <asm/hardware/clock.h>
@@ -187,9 +188,6 @@ static int omap_mcbsp_check(unsigned int id)
         return -1;
 }
 
-#define EN_XORPCK               1
-#define DSP_RSTCT2              0xe1008014
-
 static void omap_mcbsp_dsp_request(void)
 {
         if (cpu_is_omap1510() || cpu_is_omap16xx()) {
@@ -198,6 +196,11 @@ static void omap_mcbsp_dsp_request(void)
 
                 /* enable 12MHz clock to mcbsp 1 & 3 */
                 clk_use(mcbsp_dspxor_ck);
+
+                /*
+                 * DSP external peripheral reset
+                 * FIXME: This should be moved to dsp code
+                 */
                 __raw_writew(__raw_readw(DSP_RSTCT2) | 1 | 1 << 1,
                              DSP_RSTCT2);
         }
diff --git a/arch/arm/plat-omap/mux.c b/arch/arm/plat-omap/mux.c
index ea7b955b9c81..64482040f89e 100644
--- a/arch/arm/plat-omap/mux.c
+++ b/arch/arm/plat-omap/mux.c
@@ -48,6 +48,9 @@ omap_cfg_reg(const reg_cfg_t reg_cfg)
                 pull_orig = 0, pull = 0;
         unsigned int mask, warn = 0;
 
+        if (cpu_is_omap7xx())
+                return 0;
+
         if (reg_cfg > ARRAY_SIZE(reg_cfg_table)) {
                 printk(KERN_ERR "MUX: reg_cfg %d\n", reg_cfg);
                 return -EINVAL;
diff --git a/arch/arm/plat-omap/ocpi.c b/arch/arm/plat-omap/ocpi.c
index 2ede2ee8cae4..1fb16f9edfd5 100644
--- a/arch/arm/plat-omap/ocpi.c
+++ b/arch/arm/plat-omap/ocpi.c
@@ -25,6 +25,7 @@
 
 #include <linux/config.h>
 #include <linux/module.h>
+#include <linux/version.h>
 #include <linux/types.h>
 #include <linux/errno.h>
 #include <linux/kernel.h>
diff --git a/arch/arm/plat-omap/pm.c b/arch/arm/plat-omap/pm.c
index e6536b16c385..e15c6c1ddec9 100644
--- a/arch/arm/plat-omap/pm.c
+++ b/arch/arm/plat-omap/pm.c
@@ -39,24 +39,32 @@
 #include <linux/sched.h>
 #include <linux/proc_fs.h>
 #include <linux/pm.h>
+#include <linux/interrupt.h>
 
 #include <asm/io.h>
+#include <asm/irq.h>
 #include <asm/mach/time.h>
-#include <asm/mach-types.h>
+#include <asm/mach/irq.h>
 
-#include <asm/arch/omap16xx.h>
+#include <asm/mach-types.h>
+#include <asm/arch/irqs.h>
+#include <asm/arch/tc.h>
 #include <asm/arch/pm.h>
 #include <asm/arch/mux.h>
-#include <asm/arch/tc.h>
 #include <asm/arch/tps65010.h>
+#include <asm/arch/dsp_common.h>
 
 #include "clock.h"
+#include "sram.h"
 
 static unsigned int arm_sleep_save[ARM_SLEEP_SAVE_SIZE];
 static unsigned short ulpd_sleep_save[ULPD_SLEEP_SAVE_SIZE];
 static unsigned int mpui1510_sleep_save[MPUI1510_SLEEP_SAVE_SIZE];
 static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
 
+static void (*omap_sram_idle)(void) = NULL;
+static void (*omap_sram_suspend)(unsigned long r0, unsigned long r1) = NULL;
+
 /*
  * Let's power down on idle, but only if we are really
  * idle, because once we start down the path of
@@ -65,7 +73,6 @@ static unsigned int mpui1610_sleep_save[MPUI1610_SLEEP_SAVE_SIZE];
  */
 void omap_pm_idle(void)
 {
-        int (*func_ptr)(void) = 0;
         unsigned int mask32 = 0;
 
         /*
@@ -84,6 +91,13 @@ void omap_pm_idle(void)
         mask32 = omap_readl(ARM_SYSST);
 
         /*
+         * Prevent the ULPD from entering low power state by setting
+         * POWER_CTRL_REG:4 = 0
+         */
+        omap_writew(omap_readw(ULPD_POWER_CTRL) &
+                    ~ULPD_DEEP_SLEEP_TRANSITION_EN, ULPD_POWER_CTRL);
+
+        /*
          * Since an interrupt may set up a timer, we don't want to
          * reprogram the hardware timer with interrupts enabled.
          * Re-enable interrupts only after returning from idle.
@@ -92,18 +106,9 @@ void omap_pm_idle(void)
 
         if ((mask32 & DSP_IDLE) == 0) {
                 __asm__ volatile ("mcr  p15, 0, r0, c7, c0, 4");
-        } else {
-
-                if (cpu_is_omap1510()) {
-                        func_ptr = (void *)(OMAP1510_SRAM_IDLE_SUSPEND);
-                } else if (cpu_is_omap1610() || cpu_is_omap1710()) {
-                        func_ptr = (void *)(OMAP1610_SRAM_IDLE_SUSPEND);
-                } else if (cpu_is_omap5912()) {
-                        func_ptr = (void *)(OMAP5912_SRAM_IDLE_SUSPEND);
-                }
+        } else
+                omap_sram_idle();
 
-                func_ptr();
-        }
         local_fiq_enable();
         local_irq_enable();
 }
@@ -115,58 +120,55 @@ void omap_pm_idle(void)
  */
 static void omap_pm_wakeup_setup(void)
 {
-        /*
-         * Enable ARM XOR clock and release peripheral from reset by
-         * writing 1 to PER_EN bit in ARM_RSTCT2, this is required
-         * for UART configuration to use UART2 to wake up.
-         */
-
-        omap_writel(omap_readl(ARM_IDLECT2) | ENABLE_XORCLK, ARM_IDLECT2);
-        omap_writel(omap_readl(ARM_RSTCT2) | PER_EN, ARM_RSTCT2);
-        omap_writew(MODEM_32K_EN, ULPD_CLOCK_CTRL);
+        u32 level1_wake = OMAP_IRQ_BIT(INT_IH2_IRQ);
+        u32 level2_wake = OMAP_IRQ_BIT(INT_UART2) | OMAP_IRQ_BIT(INT_KEYBOARD);
 
         /*
-         * Turn off all interrupts except L1-2nd level cascade,
-         * and the L2 wakeup interrupts: keypad and UART2.
+         * Turn off all interrupts except GPIO bank 1, L1-2nd level cascade,
+         * and the L2 wakeup interrupts: keypad and UART2. Note that the
+         * drivers must still separately call omap_set_gpio_wakeup() to
+         * wake up to a GPIO interrupt.
          */
+        if (cpu_is_omap1510() || cpu_is_omap16xx())
+                level1_wake |= OMAP_IRQ_BIT(INT_GPIO_BANK1);
+        else if (cpu_is_omap730())
+                level1_wake |= OMAP_IRQ_BIT(INT_730_GPIO_BANK1);
 
-        omap_writel(~IRQ_LEVEL2, OMAP_IH1_MIR);
+        omap_writel(~level1_wake, OMAP_IH1_MIR);
 
-        if (cpu_is_omap1510()) {
-                omap_writel(~(IRQ_UART2 | IRQ_KEYBOARD),  OMAP_IH2_MIR);
-        }
+        if (cpu_is_omap1510())
+                omap_writel(~level2_wake,  OMAP_IH2_MIR);
 
+        /* INT_1610_WAKE_UP_REQ is needed for GPIO wakeup... */
         if (cpu_is_omap16xx()) {
-                omap_writel(~(IRQ_UART2 | IRQ_KEYBOARD), OMAP_IH2_0_MIR);
-
-                omap_writel(~0x0, OMAP_IH2_1_MIR);
+                omap_writel(~level2_wake, OMAP_IH2_0_MIR);
+                omap_writel(~OMAP_IRQ_BIT(INT_1610_WAKE_UP_REQ), OMAP_IH2_1_MIR);
                 omap_writel(~0x0, OMAP_IH2_2_MIR);
                 omap_writel(~0x0, OMAP_IH2_3_MIR);
         }
 
-        /*  New IRQ agreement */
+        /*  New IRQ agreement, recalculate in cascade order */
+        omap_writel(1, OMAP_IH2_CONTROL);
         omap_writel(1, OMAP_IH1_CONTROL);
-
-        /* external PULL to down, bit 22 = 0 */
-        omap_writel(omap_readl(PULL_DWN_CTRL_2) & ~(1<<22), PULL_DWN_CTRL_2);
 }
 
 void omap_pm_suspend(void)
 {
-        unsigned int mask32 = 0;
         unsigned long arg0 = 0, arg1 = 0;
-        int (*func_ptr)(unsigned short, unsigned short) = 0;
-        unsigned short save_dsp_idlect2;
 
-        printk("PM: OMAP%x is entering deep sleep now ...\n", system_rev);
+        printk("PM: OMAP%x is trying to enter deep sleep...\n", system_rev);
+
+        omap_serial_wake_trigger(1);
 
         if (machine_is_omap_osk()) {
                 /* Stop LED1 (D9) blink */
                 tps65010_set_led(LED1, OFF);
         }
 
+        omap_writew(0xffff, ULPD_SOFT_DISABLE_REQ_REG);
+
         /*
-         * Step 1: turn off interrupts
+         * Step 1: turn off interrupts (FIXME: NOTE: already disabled)
          */
 
         local_irq_disable();
@@ -207,6 +209,8 @@ void omap_pm_suspend(void)
         ARM_SAVE(ARM_CKCTL);
         ARM_SAVE(ARM_IDLECT1);
         ARM_SAVE(ARM_IDLECT2);
+        if (!(cpu_is_omap1510()))
+                ARM_SAVE(ARM_IDLECT3);
         ARM_SAVE(ARM_EWUPCT);
         ARM_SAVE(ARM_RSTCT1);
         ARM_SAVE(ARM_RSTCT2);
@@ -214,42 +218,12 @@ void omap_pm_suspend(void)
         ULPD_SAVE(ULPD_CLOCK_CTRL);
         ULPD_SAVE(ULPD_STATUS_REQ);
 
-        /*
-         * Step 3: LOW_PWR signal enabling
-         *
-         * Allow the LOW_PWR signal to be visible on MPUIO5 ball.
-         */
-        if (cpu_is_omap1510()) {
-                /* POWER_CTRL_REG = 0x1 (LOW_POWER is available) */
-                omap_writew(omap_readw(ULPD_POWER_CTRL) |
-                            OMAP1510_ULPD_LOW_POWER_REQ, ULPD_POWER_CTRL);
-        } else if (cpu_is_omap16xx()) {
-                /* POWER_CTRL_REG = 0x1 (LOW_POWER is available) */
-                omap_writew(omap_readw(ULPD_POWER_CTRL) |
-                            OMAP1610_ULPD_LOW_POWER_REQ, ULPD_POWER_CTRL);
-        }
-
-        /* configure LOW_PWR pin */
-        omap_cfg_reg(T20_1610_LOW_PWR);
+        /* (Step 3 removed - we now allow deep sleep by default) */
 
         /*
          * Step 4: OMAP DSP Shutdown
          */
 
-        /* Set DSP_RST = 1 and DSP_EN = 0, put DSP block into reset */
-        omap_writel((omap_readl(ARM_RSTCT1) | DSP_RST) & ~DSP_ENABLE,
-                    ARM_RSTCT1);
-
-        /* Set DSP boot mode to DSP-IDLE, DSP_BOOT_MODE = 0x2 */
-        omap_writel(DSP_IDLE_MODE, MPUI_DSP_BOOT_CONFIG);
-
-        /* Set EN_DSPCK = 0, stop DSP block clock */
-        omap_writel(omap_readl(ARM_CKCTL) & ~DSP_CLOCK_ENABLE, ARM_CKCTL);
-
-        /* Stop any DSP domain clocks */
-        omap_writel(omap_readl(ARM_IDLECT2) | (1<<EN_APICK), ARM_IDLECT2);
-        save_dsp_idlect2 = __raw_readw(DSP_IDLECT2);
-        __raw_writew(0, DSP_IDLECT2);
 
         /*
          * Step 5: Wakeup Event Setup
@@ -258,24 +232,9 @@ void omap_pm_suspend(void)
         omap_pm_wakeup_setup();
 
         /*
-         * Step 6a: ARM and Traffic controller shutdown
-         *
-         * Step 6 starts here with clock and watchdog disable
+         * Step 6: ARM and Traffic controller shutdown
          */
 
-        /* stop clocks */
-        mask32 = omap_readl(ARM_IDLECT2);
-        mask32 &= ~(1<<EN_WDTCK);  /* bit 0 -> 0 (WDT clock) */
-        mask32 |=  (1<<EN_XORPCK); /* bit 1 -> 1 (XORPCK clock) */
-        mask32 &= ~(1<<EN_PERCK);  /* bit 2 -> 0 (MPUPER_CK clock) */
-        mask32 &= ~(1<<EN_LCDCK);  /* bit 3 -> 0 (LCDC clock) */
-        mask32 &= ~(1<<EN_LBCK);   /* bit 4 -> 0 (local bus clock) */
-        mask32 |=  (1<<EN_APICK);  /* bit 6 -> 1 (MPUI clock) */
-        mask32 &= ~(1<<EN_TIMCK);  /* bit 7 -> 0 (MPU timer clock) */
-        mask32 &= ~(1<<DMACK_REQ); /* bit 8 -> 0 (DMAC clock) */
-        mask32 &= ~(1<<EN_GPIOCK); /* bit 9 -> 0 (GPIO clock) */
-        omap_writel(mask32, ARM_IDLECT2);
-
         /* disable ARM watchdog */
         omap_writel(0x00F5, OMAP_WDT_TIMER_MODE);
         omap_writel(0x00A0, OMAP_WDT_TIMER_MODE);
@@ -295,47 +254,24 @@ void omap_pm_suspend(void)
         arg0 = arm_sleep_save[ARM_SLEEP_SAVE_ARM_IDLECT1];
         arg1 = arm_sleep_save[ARM_SLEEP_SAVE_ARM_IDLECT2];
 
-        if (cpu_is_omap1510()) {
-                func_ptr = (void *)(OMAP1510_SRAM_API_SUSPEND);
-        } else if (cpu_is_omap1610() || cpu_is_omap1710()) {
-                func_ptr = (void *)(OMAP1610_SRAM_API_SUSPEND);
-        } else if (cpu_is_omap5912()) {
-                func_ptr = (void *)(OMAP5912_SRAM_API_SUSPEND);
-        }
-
         /*
          * Step 6c: ARM and Traffic controller shutdown
          *
          * Jump to assembly code. The processor will stay there
          * until wake up.
          */
-
-        func_ptr(arg0, arg1);
+        omap_sram_suspend(arg0, arg1);
 
         /*
          * If we are here, processor is woken up!
          */
 
-        if (cpu_is_omap1510()) {
-                /* POWER_CTRL_REG = 0x0 (LOW_POWER is disabled) */
-                omap_writew(omap_readw(ULPD_POWER_CTRL) &
-                            ~OMAP1510_ULPD_LOW_POWER_REQ, ULPD_POWER_CTRL);
-        } else if (cpu_is_omap16xx()) {
-                /* POWER_CTRL_REG = 0x0 (LOW_POWER is disabled) */
-                omap_writew(omap_readw(ULPD_POWER_CTRL) &
-                            ~OMAP1610_ULPD_LOW_POWER_REQ, ULPD_POWER_CTRL);
-        }
-
-
-        /* Restore DSP clocks */
-        omap_writel(omap_readl(ARM_IDLECT2) | (1<<EN_APICK), ARM_IDLECT2);
-        __raw_writew(save_dsp_idlect2, DSP_IDLECT2);
-        ARM_RESTORE(ARM_IDLECT2);
-
         /*
          * Restore ARM state, except ARM_IDLECT1/2 which omap_cpu_suspend did
          */
 
+        if (!(cpu_is_omap1510()))
+                ARM_RESTORE(ARM_IDLECT3);
         ARM_RESTORE(ARM_CKCTL);
         ARM_RESTORE(ARM_EWUPCT);
         ARM_RESTORE(ARM_RSTCT1);
@@ -366,6 +302,8 @@ void omap_pm_suspend(void)
                 MPUI1610_RESTORE(OMAP_IH2_3_MIR);
         }
 
+        omap_writew(0, ULPD_SOFT_DISABLE_REQ_REG);
+
         /*
          * Reenable interrupts
          */
@@ -373,6 +311,8 @@ void omap_pm_suspend(void)
         local_irq_enable();
         local_fiq_enable();
 
+        omap_serial_wake_trigger(0);
+
         printk("PM: OMAP%x is re-starting from deep sleep...\n", system_rev);
 
         if (machine_is_omap_osk()) {
@@ -401,6 +341,8 @@ static int omap_pm_read_proc(
         ARM_SAVE(ARM_CKCTL);
         ARM_SAVE(ARM_IDLECT1);
         ARM_SAVE(ARM_IDLECT2);
+        if (!(cpu_is_omap1510()))
+                ARM_SAVE(ARM_IDLECT3);
         ARM_SAVE(ARM_EWUPCT);
         ARM_SAVE(ARM_RSTCT1);
         ARM_SAVE(ARM_RSTCT2);
@@ -436,6 +378,7 @@ static int omap_pm_read_proc(
                    "ARM_CKCTL_REG:            0x%-8x     \n"
                    "ARM_IDLECT1_REG:          0x%-8x     \n"
                    "ARM_IDLECT2_REG:          0x%-8x     \n"
+                   "ARM_IDLECT3_REG:          0x%-8x     \n"
                    "ARM_EWUPCT_REG:           0x%-8x     \n"
                    "ARM_RSTCT1_REG:           0x%-8x     \n"
                    "ARM_RSTCT2_REG:           0x%-8x     \n"
@@ -449,6 +392,7 @@ static int omap_pm_read_proc(
                    ARM_SHOW(ARM_CKCTL),
                    ARM_SHOW(ARM_IDLECT1),
                    ARM_SHOW(ARM_IDLECT2),
+                   ARM_SHOW(ARM_IDLECT3),
                    ARM_SHOW(ARM_EWUPCT),
                    ARM_SHOW(ARM_RSTCT1),
                    ARM_SHOW(ARM_RSTCT2),
@@ -507,7 +451,7 @@ static void omap_pm_init_proc(void)
 
         entry = create_proc_read_entry("driver/omap_pm",
                                        S_IWUSR | S_IRUGO, NULL,
-                                       omap_pm_read_proc, 0);
+           omap_pm_read_proc, NULL);
 }
 
 #endif /* DEBUG && CONFIG_PROC_FS */
@@ -580,7 +524,21 @@ static int omap_pm_finish(suspend_state_t state)
 }
 
 
-struct pm_ops omap_pm_ops ={
+static irqreturn_t  omap_wakeup_interrupt(int  irq, void *  dev,
+                                     struct pt_regs *  regs)
+{
+        return IRQ_HANDLED;
+}
+
+static struct irqaction omap_wakeup_irq = {
+        .name           = "peripheral wakeup",
+        .flags          = SA_INTERRUPT,
+        .handler        = omap_wakeup_interrupt
+};
+
+
+
+static struct pm_ops omap_pm_ops ={
         .pm_disk_mode = 0,
         .prepare        = omap_pm_prepare,
         .enter          = omap_pm_enter,
@@ -590,42 +548,61 @@ struct pm_ops omap_pm_ops ={
 static int __init omap_pm_init(void)
 {
         printk("Power Management for TI OMAP.\n");
-        pm_idle = omap_pm_idle;
         /*
          * We copy the assembler sleep/wakeup routines to SRAM.
          * These routines need to be in SRAM as that's the only
          * memory the MPU can see when it wakes up.
          */
-
-#ifdef  CONFIG_ARCH_OMAP1510
         if (cpu_is_omap1510()) {
-                memcpy((void *)OMAP1510_SRAM_IDLE_SUSPEND,
-                       omap1510_idle_loop_suspend,
-                       omap1510_idle_loop_suspend_sz);
-                memcpy((void *)OMAP1510_SRAM_API_SUSPEND, omap1510_cpu_suspend,
-                       omap1510_cpu_suspend_sz);
-        } else
-#endif
-        if (cpu_is_omap1610() || cpu_is_omap1710()) {
-                memcpy((void *)OMAP1610_SRAM_IDLE_SUSPEND,
-                       omap1610_idle_loop_suspend,
-                       omap1610_idle_loop_suspend_sz);
-                memcpy((void *)OMAP1610_SRAM_API_SUSPEND, omap1610_cpu_suspend,
-                       omap1610_cpu_suspend_sz);
-        } else if (cpu_is_omap5912()) {
-                memcpy((void *)OMAP5912_SRAM_IDLE_SUSPEND,
-                       omap1610_idle_loop_suspend,
-                       omap1610_idle_loop_suspend_sz);
-                memcpy((void *)OMAP5912_SRAM_API_SUSPEND, omap1610_cpu_suspend,
-                       omap1610_cpu_suspend_sz);
+                omap_sram_idle = omap_sram_push(omap1510_idle_loop_suspend,
+                                                omap1510_idle_loop_suspend_sz);
+                omap_sram_suspend = omap_sram_push(omap1510_cpu_suspend,
+                                                   omap1510_cpu_suspend_sz);
+        } else if (cpu_is_omap16xx()) {
+                omap_sram_idle = omap_sram_push(omap1610_idle_loop_suspend,
+                                                omap1610_idle_loop_suspend_sz);
+                omap_sram_suspend = omap_sram_push(omap1610_cpu_suspend,
+                                                   omap1610_cpu_suspend_sz);
         }
 
+        if (omap_sram_idle == NULL || omap_sram_suspend == NULL) {
+                printk(KERN_ERR "PM not initialized: Missing SRAM support\n");
+                return -ENODEV;
+        }
+
+        pm_idle = omap_pm_idle;
+
+        setup_irq(INT_1610_WAKE_UP_REQ, &omap_wakeup_irq);
+#if 0
+        /* --- BEGIN BOARD-DEPENDENT CODE --- */
+        /* Sleepx mask direction */
+        omap_writew((omap_readw(0xfffb5008) & ~2), 0xfffb5008);
+        /* Unmask sleepx signal */
+        omap_writew((omap_readw(0xfffb5004) & ~2), 0xfffb5004);
+        /* --- END BOARD-DEPENDENT CODE --- */
+#endif
+
+        /* Program new power ramp-up time
+         * (0 for most boards since we don't lower voltage when in deep sleep)
+         */
+        omap_writew(ULPD_SETUP_ANALOG_CELL_3_VAL, ULPD_SETUP_ANALOG_CELL_3);
+
+        /* Setup ULPD POWER_CTRL_REG - enter deep sleep whenever possible */
+        omap_writew(ULPD_POWER_CTRL_REG_VAL, ULPD_POWER_CTRL);
+
+        /* Configure IDLECT3 */
+        if (cpu_is_omap16xx())
+                omap_writel(OMAP1610_IDLECT3_VAL, OMAP1610_IDLECT3);
+
         pm_set_ops(&omap_pm_ops);
 
 #if defined(DEBUG) && defined(CONFIG_PROC_FS)
         omap_pm_init_proc();
 #endif
 
+        /* configure LOW_PWR pin */
+        omap_cfg_reg(T20_1610_LOW_PWR);
+
         return 0;
 }
 __initcall(omap_pm_init);
diff --git a/arch/arm/plat-omap/sleep.S b/arch/arm/plat-omap/sleep.S
index 279490ce772b..9f745836f6aa 100644
--- a/arch/arm/plat-omap/sleep.S
+++ b/arch/arm/plat-omap/sleep.S
@@ -66,7 +66,7 @@ ENTRY(omap1510_idle_loop_suspend)
         @ get ARM_IDLECT2 into r2
         ldrh    r2, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
         mov     r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff
-        orr     r5,r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff00
+        orr     r5, r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff00
         strh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
 
         @ request ARM idle
@@ -76,7 +76,7 @@ ENTRY(omap1510_idle_loop_suspend)
         strh    r3, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
         mov     r5, #IDLE_WAIT_CYCLES & 0xff
-        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
+        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
 l_1510: subs    r5, r5, #1
         bne     l_1510
 /*
@@ -96,7 +96,7 @@ l_1510:	subs	r5, r5, #1
         strh    r2, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
         strh    r1, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
-        ldmfd   sp!, {r0 - r12, pc}     @ restore regs and return
+        ldmfd   sp!, {r0 - r12, pc}             @ restore regs and return
 
 ENTRY(omap1510_idle_loop_suspend_sz)
         .word   . - omap1510_idle_loop_suspend
@@ -115,8 +115,8 @@ ENTRY(omap1610_idle_loop_suspend)
         @ turn off clock domains
         @ get ARM_IDLECT2 into r2
         ldrh    r2, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
-        mov     r5, #OMAP1610_IDLE_CLOCK_DOMAINS & 0xff
-        orr     r5,r5, #OMAP1610_IDLE_CLOCK_DOMAINS & 0xff00
+        mov     r5, #OMAP1610_IDLECT2_SLEEP_VAL & 0xff
+        orr     r5, r5, #OMAP1610_IDLECT2_SLEEP_VAL & 0xff00
         strh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
 
         @ request ARM idle
@@ -126,7 +126,7 @@ ENTRY(omap1610_idle_loop_suspend)
         strh    r3, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
         mov     r5, #IDLE_WAIT_CYCLES & 0xff
-        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
+        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
 l_1610: subs    r5, r5, #1
         bne     l_1610
 /*
@@ -146,7 +146,7 @@ l_1610:	subs	r5, r5, #1
         strh    r2, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
         strh    r1, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
-        ldmfd   sp!, {r0 - r12, pc}     @ restore regs and return
+        ldmfd   sp!, {r0 - r12, pc}             @ restore regs and return
 
 ENTRY(omap1610_idle_loop_suspend_sz)
         .word   . - omap1610_idle_loop_suspend
@@ -208,7 +208,7 @@ ENTRY(omap1510_cpu_suspend)
 
         @ turn off clock domains
         mov     r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff
-        orr     r5,r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff00
+        orr     r5, r5, #OMAP1510_IDLE_CLOCK_DOMAINS & 0xff00
         strh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
 
         @ request ARM idle
@@ -217,7 +217,7 @@ ENTRY(omap1510_cpu_suspend)
         strh    r3, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
         mov     r5, #IDLE_WAIT_CYCLES & 0xff
-        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
+        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
 l_1510_2:
         subs    r5, r5, #1
         bne     l_1510_2
@@ -237,7 +237,7 @@ l_1510_2:
         strh    r0, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
         @ restore regs and return
-        ldmfd   sp!, {r0 - r12, pc}
+        ldmfd   sp!, {r0 - r12, pc}
 
 ENTRY(omap1510_cpu_suspend_sz)
         .word   . - omap1510_cpu_suspend
@@ -249,21 +249,26 @@ ENTRY(omap1610_cpu_suspend)
         @ save registers on stack
         stmfd   sp!, {r0 - r12, lr}
 
+        @ Drain write cache
+        mov     r4, #0
+        mcr     p15, 0, r0, c7, c10, 4
+        nop
+
         @ load base address of Traffic Controller
-        mov     r4, #TCMIF_ASM_BASE & 0xff000000
-        orr     r4, r4, #TCMIF_ASM_BASE & 0x00ff0000
-        orr     r4, r4, #TCMIF_ASM_BASE & 0x0000ff00
+        mov     r6, #TCMIF_ASM_BASE & 0xff000000
+        orr     r6, r6, #TCMIF_ASM_BASE & 0x00ff0000
+        orr     r6, r6, #TCMIF_ASM_BASE & 0x0000ff00
 
         @ prepare to put SDRAM into self-refresh manually
-        ldr     r5, [r4, #EMIFF_SDRAM_CONFIG_ASM_OFFSET & 0xff]
-        orr     r5, r5, #SELF_REFRESH_MODE & 0xff000000
-        orr     r5, r5, #SELF_REFRESH_MODE & 0x000000ff
-        str     r5, [r4, #EMIFF_SDRAM_CONFIG_ASM_OFFSET & 0xff]
+        ldr     r7, [r6, #EMIFF_SDRAM_CONFIG_ASM_OFFSET & 0xff]
+        orr     r9, r7, #SELF_REFRESH_MODE & 0xff000000
+        orr     r9, r9, #SELF_REFRESH_MODE & 0x000000ff
+        str     r9, [r6, #EMIFF_SDRAM_CONFIG_ASM_OFFSET & 0xff]
 
         @ prepare to put EMIFS to Sleep
-        ldr     r5, [r4, #EMIFS_CONFIG_ASM_OFFSET & 0xff]
-        orr     r5, r5, #IDLE_EMIFS_REQUEST & 0xff
-        str     r5, [r4, #EMIFS_CONFIG_ASM_OFFSET & 0xff]
+        ldr     r8, [r6, #EMIFS_CONFIG_ASM_OFFSET & 0xff]
+        orr     r9, r8, #IDLE_EMIFS_REQUEST & 0xff
+        str     r9, [r6, #EMIFS_CONFIG_ASM_OFFSET & 0xff]
 
         @ load base address of ARM_IDLECT1 and ARM_IDLECT2
         mov     r4, #CLKGEN_REG_ASM_BASE & 0xff000000
@@ -271,26 +276,22 @@ ENTRY(omap1610_cpu_suspend)
         orr     r4, r4, #CLKGEN_REG_ASM_BASE & 0x0000ff00
 
         @ turn off clock domains
-        mov     r5, #OMAP1610_IDLE_CLOCK_DOMAINS & 0xff
-        orr     r5,r5, #OMAP1610_IDLE_CLOCK_DOMAINS & 0xff00
-        strh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
-
-        @ work around errata of OMAP1610/5912. Enable (!) peripheral
-        @ clock to let the chip go into deep sleep
-        ldrh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
-        orr     r5,r5, #EN_PERCK_BIT & 0xff
+        @ do not disable PERCK (0x04)
+        mov     r5, #OMAP1610_IDLECT2_SLEEP_VAL & 0xff
+        orr     r5, r5, #OMAP1610_IDLECT2_SLEEP_VAL & 0xff00
         strh    r5, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
 
         @ request ARM idle
-        mov     r3, #OMAP1610_DEEP_SLEEP_REQUEST & 0xff
-        orr     r3, r3, #OMAP1610_DEEP_SLEEP_REQUEST & 0xff00
+        mov     r3, #OMAP1610_IDLECT1_SLEEP_VAL & 0xff
+        orr     r3, r3, #OMAP1610_IDLECT1_SLEEP_VAL & 0xff00
         strh    r3, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
-        mov     r5, #IDLE_WAIT_CYCLES & 0xff
-        orr     r5, r5, #IDLE_WAIT_CYCLES & 0xff00
-l_1610_2:
-        subs    r5, r5, #1
-        bne     l_1610_2
+        @ disable instruction cache
+        mrc     p15, 0, r9, c1, c0, 0
+        bic     r2, r9, #0x1000
+        mcr     p15, 0, r2, c1, c0, 0
+        nop
+
 /*
  * Let's wait for the next wake up event to wake us up. r0 can't be
  * used here because r0 holds ARM_IDLECT1
@@ -301,13 +302,21 @@ l_1610_2:
  * omap1610_cpu_suspend()'s resume point.
  *
  * It will just start executing here, so we'll restore stuff from the
- * stack, reset the ARM_IDLECT1 and ARM_IDLECT2.
+ * stack.
  */
+        @ re-enable Icache
+        mcr     p15, 0, r9, c1, c0, 0
+
+        @ reset the ARM_IDLECT1 and ARM_IDLECT2.
         strh    r1, [r4, #ARM_IDLECT2_ASM_OFFSET & 0xff]
         strh    r0, [r4, #ARM_IDLECT1_ASM_OFFSET & 0xff]
 
+        @ Restore EMIFF controls
+        str     r7, [r6, #EMIFF_SDRAM_CONFIG_ASM_OFFSET & 0xff]
+        str     r8, [r6, #EMIFS_CONFIG_ASM_OFFSET & 0xff]
+
         @ restore regs and return
-        ldmfd   sp!, {r0 - r12, pc}
+        ldmfd   sp!, {r0 - r12, pc}
 
 ENTRY(omap1610_cpu_suspend_sz)
         .word   . - omap1610_cpu_suspend
diff --git a/arch/arm/plat-omap/sram-fn.S b/arch/arm/plat-omap/sram-fn.S
new file mode 100644
index 000000000000..4bea36964a00
--- /dev/null
+++ b/arch/arm/plat-omap/sram-fn.S
@@ -0,0 +1,58 @@
+/*
+ * linux/arch/arm/plat-omap/sram.S
+ *
+ * Functions that need to be run in internal SRAM
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/config.h>
+#include <linux/linkage.h>
+#include <asm/assembler.h>
+#include <asm/arch/io.h>
+#include <asm/arch/hardware.h>
+
+        .text
+
+/*
+ * Reprograms ULPD and CKCTL.
+ */
+ENTRY(sram_reprogram_clock)
+        stmfd   sp!, {r0 - r12, lr}             @ save registers on stack
+
+        mov     r2, #IO_ADDRESS(DPLL_CTL) & 0xff000000
+        orr     r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x00ff0000
+        orr     r2, r2, #IO_ADDRESS(DPLL_CTL) & 0x0000ff00
+
+        mov     r3, #IO_ADDRESS(ARM_CKCTL) & 0xff000000
+        orr     r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x00ff0000
+        orr     r3, r3, #IO_ADDRESS(ARM_CKCTL) & 0x0000ff00
+
+        tst     r0, #1 << 4                     @ want lock mode?
+        beq     newck                           @ nope
+        bic     r0, r0, #1 << 4                 @ else clear lock bit
+        strh    r0, [r2]                        @ set dpll into bypass mode
+        orr     r0, r0, #1 << 4                 @ set lock bit again
+
+newck:
+        strh    r1, [r3]                        @ write new ckctl value
+        strh    r0, [r2]                        @ write new dpll value
+
+        mov     r4, #0x0700                     @ let the clocks settle
+        orr     r4, r4, #0x00ff
+delay:  sub     r4, r4, #1
+        cmp     r4, #0
+        bne     delay
+
+lock:   ldrh    r4, [r2], #0                    @ read back dpll value
+        tst     r0, #1 << 4                     @ want lock mode?
+        beq     out                             @ nope
+        tst     r4, #1 << 0                     @ dpll rate locked?
+        beq     lock                            @ try again
+
+out:
+        ldmfd   sp!, {r0 - r12, pc}             @ restore regs and return
+ENTRY(sram_reprogram_clock_sz)
+        .word   . - sram_reprogram_clock
diff --git a/arch/arm/plat-omap/sram.c b/arch/arm/plat-omap/sram.c
new file mode 100644
index 000000000000..7719a4062e3a
--- /dev/null
+++ b/arch/arm/plat-omap/sram.c
@@ -0,0 +1,116 @@
+/*
+ * linux/arch/arm/plat-omap/sram.c
+ *
+ * OMAP SRAM detection and management
+ *
+ * Copyright (C) 2005 Nokia Corporation
+ * Written by Tony Lindgren <tony@atomide.com>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include <linux/config.h>
+#include <linux/module.h>
+#include <linux/kernel.h>
+#include <linux/init.h>
+
+#include <asm/mach/map.h>
+#include <asm/io.h>
+#include <asm/cacheflush.h>
+
+#include "sram.h"
+
+#define OMAP1_SRAM_BASE         0xd0000000
+#define OMAP1_SRAM_START        0x20000000
+#define SRAM_BOOTLOADER_SZ      0x80
+
+static unsigned long omap_sram_base;
+static unsigned long omap_sram_size;
+static unsigned long omap_sram_ceil;
+
+/*
+ * The amount of SRAM depends on the core type:
+ * 730 = 200K, 1510 = 512K, 5912 = 256K, 1610 = 16K, 1710 = 16K
+ * Note that we cannot try to test for SRAM here because writes
+ * to secure SRAM will hang the system. Also the SRAM is not
+ * yet mapped at this point.
+ */
+void __init omap_detect_sram(void)
+{
+        omap_sram_base = OMAP1_SRAM_BASE;
+
+        if (cpu_is_omap730())
+                omap_sram_size = 0x32000;
+        else if (cpu_is_omap1510())
+                omap_sram_size = 0x80000;
+        else if (cpu_is_omap1610() || cpu_is_omap1621() || cpu_is_omap1710())
+                omap_sram_size = 0x4000;
+        else if (cpu_is_omap1611())
+                omap_sram_size = 0x3e800;
+        else {
+                printk(KERN_ERR "Could not detect SRAM size\n");
+                omap_sram_size = 0x4000;
+        }
+
+        printk(KERN_INFO "SRAM size: 0x%lx\n", omap_sram_size);
+        omap_sram_ceil = omap_sram_base + omap_sram_size;
+}
+
+static struct map_desc omap_sram_io_desc[] __initdata = {
+        { OMAP1_SRAM_BASE, OMAP1_SRAM_START, 0, MT_DEVICE }
+};
+
+/*
+ * In order to use last 2kB of SRAM on 1611b, we must round the size
+ * up to multiple of PAGE_SIZE. We cannot use ioremap for SRAM, as
+ * clock init needs SRAM early.
+ */
+void __init omap_map_sram(void)
+{
+        if (omap_sram_size == 0)
+                return;
+
+        omap_sram_io_desc[0].length = (omap_sram_size + PAGE_SIZE-1)/PAGE_SIZE;
+        omap_sram_io_desc[0].length *= PAGE_SIZE;
+        iotable_init(omap_sram_io_desc, ARRAY_SIZE(omap_sram_io_desc));
+
+        /*
+         * Looks like we need to preserve some bootloader code at the
+         * beginning of SRAM for jumping to flash for reboot to work...
+         */
+        memset((void *)omap_sram_base + SRAM_BOOTLOADER_SZ, 0,
+               omap_sram_size - SRAM_BOOTLOADER_SZ);
+}
+
+static void (*_omap_sram_reprogram_clock)(u32 dpllctl, u32 ckctl) = NULL;
+
+void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl)
+{
+        if (_omap_sram_reprogram_clock == NULL)
+                panic("Cannot use SRAM");
+
+        return _omap_sram_reprogram_clock(dpllctl, ckctl);
+}
+
+void * omap_sram_push(void * start, unsigned long size)
+{
+        if (size > (omap_sram_ceil - (omap_sram_base + SRAM_BOOTLOADER_SZ))) {
+                printk(KERN_ERR "Not enough space in SRAM\n");
+                return NULL;
+        }
+        omap_sram_ceil -= size;
+        omap_sram_ceil &= ~0x3;
+        memcpy((void *)omap_sram_ceil, start, size);
+
+        return (void *)omap_sram_ceil;
+}
+
+void __init omap_sram_init(void)
+{
+        omap_detect_sram();
+        omap_map_sram();
+        _omap_sram_reprogram_clock = omap_sram_push(sram_reprogram_clock,
+                                                    sram_reprogram_clock_sz);
+}
diff --git a/arch/arm/plat-omap/sram.h b/arch/arm/plat-omap/sram.h
new file mode 100644
index 000000000000..71984efa6ae8
--- /dev/null
+++ b/arch/arm/plat-omap/sram.h
@@ -0,0 +1,21 @@
+/*
+ * linux/arch/arm/plat-omap/sram.h
+ *
+ * Interface for functions that need to be run in internal SRAM
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#ifndef __ARCH_ARM_OMAP_SRAM_H
+#define __ARCH_ARM_OMAP_SRAM_H
+
+extern void * omap_sram_push(void * start, unsigned long size);
+extern void omap_sram_reprogram_clock(u32 dpllctl, u32 ckctl);
+
+/* Do not use these */
+extern void sram_reprogram_clock(u32 ckctl, u32 dpllctl);
+extern unsigned long sram_reprogram_clock_sz;
+
+#endif
diff --git a/arch/arm/plat-omap/usb.c b/arch/arm/plat-omap/usb.c
index 25bc4a8dd763..98f1c76f8660 100644
--- a/arch/arm/plat-omap/usb.c
+++ b/arch/arm/plat-omap/usb.c
@@ -41,6 +41,7 @@
 
 /* These routines should handle the standard chip-specific modes
  * for usb0/1/2 ports, covering basic mux and transceiver setup.
+ * Call omap_usb_init() once, from INIT_MACHINE().
  *
  * Some board-*.c files will need to set up additional mux options,
  * like for suspend handling, vbus sensing, GPIOs, and the D+ pullup.
diff --git a/arch/arm/vfp/entry.S b/arch/arm/vfp/entry.S
index e73c8deca592..6f17187ab32a 100644
--- a/arch/arm/vfp/entry.S
+++ b/arch/arm/vfp/entry.S
@@ -17,7 +17,7 @@
  */
 #include <linux/linkage.h>
 #include <linux/init.h>
-#include <asm/constants.h>
+#include <asm/asm-offsets.h>
 #include <asm/vfpmacros.h>
 
         .globl  do_vfp
diff --git a/arch/arm26/Kconfig b/arch/arm26/Kconfig
index 1f0373267306..1f00b3d03a07 100644
--- a/arch/arm26/Kconfig
+++ b/arch/arm26/Kconfig
@@ -55,6 +55,10 @@ config GENERIC_BUST_SPINLOCK
 config GENERIC_ISA_DMA
         bool
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 
diff --git a/arch/arm26/Makefile b/arch/arm26/Makefile
index ada8985530a5..844a9e46886e 100644
--- a/arch/arm26/Makefile
+++ b/arch/arm26/Makefile
@@ -17,10 +17,6 @@ ifeq ($(CONFIG_FRAME_POINTER),y)
 CFLAGS          +=-fno-omit-frame-pointer -mno-sched-prolog
 endif
 
-ifeq ($(CONFIG_DEBUG_INFO),y)
-CFLAGS          +=-g
-endif
-
 CFLAGS_BOOT     :=-mapcs-26 -mcpu=arm3 -msoft-float -Uarm
 CFLAGS          +=-mapcs-26 -mcpu=arm3 -msoft-float -Uarm
 AFLAGS          +=-mapcs-26 -mcpu=arm3 -msoft-float
@@ -53,10 +49,6 @@ all: zImage
 
 boot := arch/arm26/boot
 
-prepare: include/asm-$(ARCH)/asm_offsets.h
-CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
-
-
 .PHONY: maketools FORCE
 maketools: FORCE
         
@@ -98,12 +90,6 @@ zi:;	$(Q)$(MAKE) $(build)=$(boot) zinstall
         fi; \
         )
 
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
 define archhelp
   echo  '* zImage        - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
   echo  '  Image         - Uncompressed kernel image (arch/$(ARCH)/boot/Image)'
diff --git a/arch/arm26/kernel/entry.S b/arch/arm26/kernel/entry.S
index a231dd88d0e1..6d910ea43d34 100644
--- a/arch/arm26/kernel/entry.S
+++ b/arch/arm26/kernel/entry.S
@@ -10,7 +10,7 @@
 #include <linux/linkage.h>
 
 #include <asm/assembler.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/errno.h>
 #include <asm/hardware.h>
 #include <asm/sysirq.h>
diff --git a/arch/arm26/kernel/time.c b/arch/arm26/kernel/time.c
index 549a6b2e177e..e66aedd02fad 100644
--- a/arch/arm26/kernel/time.c
+++ b/arch/arm26/kernel/time.c
@@ -114,7 +114,7 @@ static unsigned long next_rtc_update;
  */
 static inline void do_set_rtc(void)
 {
-        if (time_status & STA_UNSYNC || set_rtc == NULL)
+        if (!ntp_synced() || set_rtc == NULL)
                 return;
 
 //FIXME - timespec.tv_sec is a time_t not unsigned long
@@ -189,10 +189,7 @@ int do_settimeofday(struct timespec *tv)
 
         xtime.tv_sec = tv->tv_sec;
         xtime.tv_nsec = tv->tv_nsec;
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/arm26/lib/copy_page.S b/arch/arm26/lib/copy_page.S
index 2d79ee12ea1f..c7511a2739d3 100644
--- a/arch/arm26/lib/copy_page.S
+++ b/arch/arm26/lib/copy_page.S
@@ -11,7 +11,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
                 .text
                 .align  5
diff --git a/arch/arm26/lib/csumpartialcopyuser.S b/arch/arm26/lib/csumpartialcopyuser.S
index 5b821188e479..261dd154c1a4 100644
--- a/arch/arm26/lib/csumpartialcopyuser.S
+++ b/arch/arm26/lib/csumpartialcopyuser.S
@@ -11,7 +11,7 @@
 #include <linux/linkage.h>
 #include <asm/assembler.h>
 #include <asm/errno.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
                 .text
 
diff --git a/arch/arm26/lib/getuser.S b/arch/arm26/lib/getuser.S
index e6d59b334851..2b1de7fbfe1f 100644
--- a/arch/arm26/lib/getuser.S
+++ b/arch/arm26/lib/getuser.S
@@ -26,7 +26,7 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000.
  * Note also that it is intended that __get_user_bad is not global.
  */
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/errno.h>
 
diff --git a/arch/arm26/lib/putuser.S b/arch/arm26/lib/putuser.S
index 87588cbe46ae..46c7f15f9f2d 100644
--- a/arch/arm26/lib/putuser.S
+++ b/arch/arm26/lib/putuser.S
@@ -26,7 +26,7 @@
  * Note that ADDR_LIMIT is either 0 or 0xc0000000
  * Note also that it is intended that __put_user_bad is not global.
  */
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/errno.h>
 
diff --git a/arch/arm26/mm/proc-funcs.S b/arch/arm26/mm/proc-funcs.S
index c3d4cd3f457e..f9fca524c57a 100644
--- a/arch/arm26/mm/proc-funcs.S
+++ b/arch/arm26/mm/proc-funcs.S
@@ -14,7 +14,7 @@
  */
 #include <linux/linkage.h>
 #include <asm/assembler.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/procinfo.h>
 #include <asm/ptrace.h>
 
diff --git a/arch/arm26/nwfpe/entry.S b/arch/arm26/nwfpe/entry.S
index 7d6dfaad80c2..e6312000d9f8 100644
--- a/arch/arm26/nwfpe/entry.S
+++ b/arch/arm26/nwfpe/entry.S
@@ -20,7 +20,7 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 /* This is the kernel's entry point into the floating point emulator.
 It is called from the kernel with code similar to this:
diff --git a/arch/cris/Makefile b/arch/cris/Makefile
index 90ca8730b120..a00043a91f16 100644
--- a/arch/cris/Makefile
+++ b/arch/cris/Makefile
@@ -107,8 +107,7 @@ archclean:
         rm -f timage vmlinux.bin decompress.bin rescue.bin cramfs.img
         rm -rf $(LD_SCRIPT).tmp
 
-prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch \
-         include/asm-$(ARCH)/$(SARCH)/offset.h
+prepare: $(SRC_ARCH)/.links $(srctree)/include/asm-$(ARCH)/.arch
 
 # Create some links to make all tools happy
 $(SRC_ARCH)/.links:
@@ -120,6 +119,7 @@ $(SRC_ARCH)/.links:
         @ln -sfn $(SRC_ARCH)/$(SARCH)/lib $(SRC_ARCH)/lib
         @ln -sfn $(SRC_ARCH)/$(SARCH) $(SRC_ARCH)/arch
         @ln -sfn $(SRC_ARCH)/$(SARCH)/vmlinux.lds.S $(SRC_ARCH)/kernel/vmlinux.lds.S
+        @ln -sfn $(SRC_ARCH)/$(SARCH)/asm-offsets.c $(SRC_ARCH)/kernel/asm-offsets.c
         @touch $@
 
 # Create link to sub arch includes
@@ -128,9 +128,3 @@ $(srctree)/include/asm-$(ARCH)/.arch: $(wildcard include/config/arch/*.h)
         @rm -f include/asm-$(ARCH)/arch
         @ln -sf $(srctree)/include/asm-$(ARCH)/$(SARCH) $(srctree)/include/asm-$(ARCH)/arch
         @touch $@
-
-arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                        include/config/MARKER
-
-include/asm-$(ARCH)/$(SARCH)/offset.h: arch/$(ARCH)/$(SARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
diff --git a/arch/cris/arch-v10/kernel/entry.S b/arch/cris/arch-v10/kernel/entry.S
index c0163bf94a50..c808005e8457 100644
--- a/arch/cris/arch-v10/kernel/entry.S
+++ b/arch/cris/arch-v10/kernel/entry.S
@@ -270,7 +270,7 @@
 #include <asm/arch/sv_addr_ag.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>
-#include <asm/arch/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/pgtable.h>
 
diff --git a/arch/cris/arch-v10/kernel/time.c b/arch/cris/arch-v10/kernel/time.c
index 6b7b4e0802e3..dc3dfe9b4a1a 100644
--- a/arch/cris/arch-v10/kernel/time.c
+++ b/arch/cris/arch-v10/kernel/time.c
@@ -240,7 +240,7 @@ timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * The division here is not time critical since it will run once in 
          * 11 minutes
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - (tick_nsec / 1000) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + (tick_nsec / 1000) / 2) {
diff --git a/arch/cris/arch-v32/kernel/entry.S b/arch/cris/arch-v32/kernel/entry.S
index a8ed55e5b403..3bd8503fec68 100644
--- a/arch/cris/arch-v32/kernel/entry.S
+++ b/arch/cris/arch-v32/kernel/entry.S
@@ -23,7 +23,7 @@
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/thread_info.h>
-#include <asm/arch/offset.h>
+#include <asm/asm-offsets.h>
 
 #include <asm/arch/hwregs/asm/reg_map_asm.h>
 #include <asm/arch/hwregs/asm/intr_vect_defs_asm.h>
diff --git a/arch/cris/kernel/time.c b/arch/cris/kernel/time.c
index fa2d4323da25..a2d99b4aedcd 100644
--- a/arch/cris/kernel/time.c
+++ b/arch/cris/kernel/time.c
@@ -114,10 +114,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/frv/kernel/asm-offsets.c b/arch/frv/kernel/asm-offsets.c
new file mode 100644
index 000000000000..9e263112a6e2
--- /dev/null
+++ b/arch/frv/kernel/asm-offsets.c
@@ -0,0 +1 @@
+/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
diff --git a/arch/frv/kernel/time.c b/arch/frv/kernel/time.c
index 075db6644694..8d6558b00e44 100644
--- a/arch/frv/kernel/time.c
+++ b/arch/frv/kernel/time.c
@@ -85,7 +85,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
          * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2
@@ -216,10 +216,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/h8300/Makefile b/arch/h8300/Makefile
index c9b80cffd71d..40b3f56f3666 100644
--- a/arch/h8300/Makefile
+++ b/arch/h8300/Makefile
@@ -61,12 +61,6 @@ archmrproper:
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/asm-offsets.h
-
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
-                                   include/asm include/linux/version.h
-        $(call filechk,gen-asm-offsets)
-
 vmlinux.srec vmlinux.bin: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
@@ -74,5 +68,3 @@ define archhelp
   echo  'vmlinux.bin  - Create raw binary'
   echo  'vmlinux.srec - Create srec binary'
 endef
-
-CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h
diff --git a/arch/h8300/kernel/time.c b/arch/h8300/kernel/time.c
index 8a600218334d..af8c5d2057dd 100644
--- a/arch/h8300/kernel/time.c
+++ b/arch/h8300/kernel/time.c
@@ -116,10 +116,7 @@ int do_settimeofday(struct timespec *tv)
 
         xtime.tv_sec = tv->tv_sec;
         xtime.tv_nsec = tv->tv_nsec;
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/i386/Kconfig b/arch/i386/Kconfig
index 3b3b017e1c15..b22f003eaa6d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -37,6 +37,10 @@ config GENERIC_IOMAP
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 menu "Processor type and features"
@@ -1208,7 +1212,6 @@ config PCI_DIRECT
 config PCI_MMCONFIG
         bool
         depends on PCI && ACPI && (PCI_GOMMCONFIG || PCI_GOANY)
-        select ACPI_BOOT
         default y
 
 source "drivers/pci/pcie/Kconfig"
@@ -1318,6 +1321,11 @@ config GENERIC_IRQ_PROBE
         bool
         default y
 
+config GENERIC_PENDING_IRQ
+        bool
+        depends on GENERIC_HARDIRQS && SMP
+        default y
+
 config X86_SMP
         bool
         depends on SMP && !X86_VOYAGER
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index bf7c9ba709f3..09951990a622 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -156,15 +156,6 @@ install: vmlinux
 install kernel_install:
         $(Q)$(MAKE) $(build)=$(boot) BOOTIMAGE=$(KBUILD_IMAGE) install
 
-prepare: include/asm-$(ARCH)/asm_offsets.h
-CLEAN_FILES += include/asm-$(ARCH)/asm_offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
 archclean:
         $(Q)$(MAKE) $(clean)=arch/i386/boot
 
diff --git a/arch/i386/boot/setup.S b/arch/i386/boot/setup.S
index 8cb420f40c58..ca668d9df164 100644
--- a/arch/i386/boot/setup.S
+++ b/arch/i386/boot/setup.S
@@ -82,7 +82,7 @@ start:
 # This is the setup header, and it must start at %cs:2 (old 0x9020:2)
 
                 .ascii  "HdrS"          # header signature
-                .word   0x0203          # header version number (>= 0x0105)
+                .word   0x0204          # header version number (>= 0x0105)
                                         # or else old loadlin-1.5 will fail)
 realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
 start_sys_seg:  .word   SYSSEG
diff --git a/arch/i386/boot/tools/build.c b/arch/i386/boot/tools/build.c
index 6835f6d47c31..05798419a6a9 100644
--- a/arch/i386/boot/tools/build.c
+++ b/arch/i386/boot/tools/build.c
@@ -177,7 +177,9 @@ int main(int argc, char ** argv)
                 die("Output: seek failed");
         buf[0] = (sys_size & 0xff);
         buf[1] = ((sys_size >> 8) & 0xff);
-        if (write(1, buf, 2) != 2)
+        buf[2] = ((sys_size >> 16) & 0xff);
+        buf[3] = ((sys_size >> 24) & 0xff);
+        if (write(1, buf, 4) != 4)
                 die("Write of image length failed");
 
         return 0;                                           /* Everything is OK */
diff --git a/arch/i386/boot/video.S b/arch/i386/boot/video.S
index 0587477c99f2..92f669470142 100644
--- a/arch/i386/boot/video.S
+++ b/arch/i386/boot/video.S
@@ -97,6 +97,7 @@
 #define PARAM_VESAPM_OFF        0x30
 #define PARAM_LFB_PAGES         0x32
 #define PARAM_VESA_ATTRIB       0x34
+#define PARAM_CAPABILITIES      0x36
 
 /* Define DO_STORE according to CONFIG_VIDEO_RETAIN */
 #ifdef CONFIG_VIDEO_RETAIN
@@ -233,6 +234,10 @@ mopar_gr:
         movw    18(%di), %ax
         movl    %eax, %fs:(PARAM_LFB_SIZE)
 
+# store mode capabilities
+        movl    10(%di), %eax
+        movl    %eax, %fs:(PARAM_CAPABILITIES)
+
 # switching the DAC to 8-bit is for <= 8 bpp only
         movw    %fs:(PARAM_LFB_DEPTH), %ax
         cmpw    $8, %ax
@@ -1944,7 +1949,7 @@ store_edid:
         movw    $0x4f15, %ax                    # do VBE/DDC
         movw    $0x01, %bx
         movw    $0x00, %cx
-        movw    $0x01, %dx
+        movw    $0x00, %dx
         movw    $0x140, %di
         int     $0x10
 
diff --git a/arch/i386/defconfig b/arch/i386/defconfig
index ca07b95c06b8..6a431b926019 100644
--- a/arch/i386/defconfig
+++ b/arch/i386/defconfig
@@ -131,8 +131,6 @@ CONFIG_SOFTWARE_SUSPEND=y
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_SLEEP=y
 CONFIG_ACPI_SLEEP_PROC_FS=y
 CONFIG_ACPI_AC=y
@@ -144,10 +142,8 @@ CONFIG_ACPI_THERMAL=y
 # CONFIG_ACPI_ASUS is not set
 # CONFIG_ACPI_TOSHIBA is not set
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_X86_PM_TIMER is not set
 
diff --git a/arch/i386/kernel/Makefile b/arch/i386/kernel/Makefile
index 64682a0edacf..f10de0f2c5e6 100644
--- a/arch/i386/kernel/Makefile
+++ b/arch/i386/kernel/Makefile
@@ -11,7 +11,7 @@ obj-y	:= process.o semaphore.o signal.o entry.o traps.o irq.o vm86.o \
 
 obj-y                           += cpu/
 obj-y                           += timers/
-obj-$(CONFIG_ACPI_BOOT)         += acpi/
+obj-$(CONFIG_ACPI)              += acpi/
 obj-$(CONFIG_X86_BIOS_REBOOT)   += reboot.o
 obj-$(CONFIG_MCA)               += mca.o
 obj-$(CONFIG_X86_MSR)           += msr.o
diff --git a/arch/i386/kernel/acpi/Makefile b/arch/i386/kernel/acpi/Makefile
index 5e291a20c03d..267ca48e1b6c 100644
--- a/arch/i386/kernel/acpi/Makefile
+++ b/arch/i386/kernel/acpi/Makefile
@@ -1,4 +1,4 @@
-obj-$(CONFIG_ACPI_BOOT)         := boot.o
+obj-y                           := boot.o
 obj-$(CONFIG_X86_IO_APIC)       += earlyquirk.o
 obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup.o
 
diff --git a/arch/i386/kernel/acpi/boot.c b/arch/i386/kernel/acpi/boot.c
index 34ee500c26e5..a63351c085c6 100644
--- a/arch/i386/kernel/acpi/boot.c
+++ b/arch/i386/kernel/acpi/boot.c
@@ -40,19 +40,25 @@
 
 #ifdef  CONFIG_X86_64
 
-static inline void  acpi_madt_oem_check(char *oem_id, char *oem_table_id) { }
+static inline void acpi_madt_oem_check(char *oem_id, char *oem_table_id)
+{
+}
 extern void __init clustered_apic_check(void);
-static inline int ioapic_setup_disabled(void) { return 0; }
+static inline int ioapic_setup_disabled(void)
+{
+        return 0;
+}
+
 #include <asm/proto.h>
 
-#else   /* X86 */
+#else                           /* X86 */
 
 #ifdef  CONFIG_X86_LOCAL_APIC
 #include <mach_apic.h>
 #include <mach_mpparse.h>
-#endif  /* CONFIG_X86_LOCAL_APIC */
+#endif                          /* CONFIG_X86_LOCAL_APIC */
 
-#endif  /* X86 */
+#endif                          /* X86 */
 
 #define BAD_MADT_ENTRY(entry, end) (                                        \
                 (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
@@ -60,13 +66,8 @@ static inline int ioapic_setup_disabled(void) { return 0; }
 
 #define PREFIX                  "ACPI: "
 
-#ifdef CONFIG_ACPI_PCI
 int acpi_noirq __initdata;      /* skip ACPI IRQ initialization */
-int acpi_pci_disabled __initdata; /* skip ACPI PCI scan and IRQ initialization */
-#else
-int acpi_noirq __initdata = 1;
-int acpi_pci_disabled __initdata = 1;
-#endif
+int acpi_pci_disabled __initdata;       /* skip ACPI PCI scan and IRQ initialization */
 int acpi_ht __initdata = 1;     /* enable HT */
 
 int acpi_lapic;
@@ -88,7 +89,7 @@ static u64 acpi_lapic_addr __initdata = APIC_DEFAULT_PHYS_BASE;
 
 #define MAX_MADT_ENTRIES        256
 u8 x86_acpiid_to_apicid[MAX_MADT_ENTRIES] =
-                        { [0 ... MAX_MADT_ENTRIES-1] = 0xff };
+    {[0 ... MAX_MADT_ENTRIES - 1] = 0xff };
 EXPORT_SYMBOL(x86_acpiid_to_apicid);
 
 /* --------------------------------------------------------------------------
@@ -99,7 +100,7 @@ EXPORT_SYMBOL(x86_acpiid_to_apicid);
  * The default interrupt routing model is PIC (8259).  This gets
  * overriden if IOAPICs are enumerated (below).
  */
-enum acpi_irq_model_id          acpi_irq_model = ACPI_IRQ_MODEL_PIC;
+enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_PIC;
 
 #ifdef  CONFIG_X86_64
 
@@ -107,7 +108,7 @@ enum acpi_irq_model_id		acpi_irq_model = ACPI_IRQ_MODEL_PIC;
 char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
 {
         if (!phys_addr || !size)
-        return NULL;
+                return NULL;
 
         if (phys_addr < (end_pfn_map << PAGE_SHIFT))
                 return __va(phys_addr);
@@ -134,8 +135,8 @@ char *__acpi_map_table(unsigned long phys, unsigned long size)
         unsigned long base, offset, mapped_size;
         int idx;
 
-        if (phys + size < 8*1024*1024) 
-                return __va(phys); 
+        if (phys + size < 8 * 1024 * 1024)
+                return __va(phys);
 
         offset = phys & (PAGE_SIZE - 1);
         mapped_size = PAGE_SIZE - offset;
@@ -154,7 +155,7 @@ char *__acpi_map_table(unsigned long phys, unsigned long size)
                 mapped_size += PAGE_SIZE;
         }
 
-        return ((unsigned char *) base + offset);
+        return ((unsigned char *)base + offset);
 }
 #endif
 
@@ -172,7 +173,7 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
         if (!phys_addr || !size)
                 return -EINVAL;
 
-        mcfg = (struct acpi_table_mcfg *) __acpi_map_table(phys_addr, size);
+        mcfg = (struct acpi_table_mcfg *)__acpi_map_table(phys_addr, size);
         if (!mcfg) {
                 printk(KERN_WARNING PREFIX "Unable to map MCFG\n");
                 return -ENODEV;
@@ -209,20 +210,17 @@ int __init acpi_parse_mcfg(unsigned long phys_addr, unsigned long size)
 
         return 0;
 }
-#endif /* CONFIG_PCI_MMCONFIG */
+#endif                          /* CONFIG_PCI_MMCONFIG */
 
 #ifdef CONFIG_X86_LOCAL_APIC
-static int __init
-acpi_parse_madt (
-        unsigned long           phys_addr,
-        unsigned long           size)
+static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
 {
-        struct acpi_table_madt  *madt = NULL;
+        struct acpi_table_madt *madt = NULL;
 
         if (!phys_addr || !size)
                 return -EINVAL;
 
-        madt = (struct acpi_table_madt *) __acpi_map_table(phys_addr, size);
+        madt = (struct acpi_table_madt *)__acpi_map_table(phys_addr, size);
         if (!madt) {
                 printk(KERN_WARNING PREFIX "Unable to map MADT\n");
                 return -ENODEV;
@@ -232,22 +230,20 @@ acpi_parse_madt (
                 acpi_lapic_addr = (u64) madt->lapic_address;
 
                 printk(KERN_DEBUG PREFIX "Local APIC address 0x%08x\n",
-                        madt->lapic_address);
+                       madt->lapic_address);
         }
 
         acpi_madt_oem_check(madt->header.oem_id, madt->header.oem_table_id);
-        
+
         return 0;
 }
 
-
 static int __init
-acpi_parse_lapic (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lapic(acpi_table_entry_header * header, const unsigned long end)
 {
-        struct acpi_table_lapic *processor = NULL;
+        struct acpi_table_lapic *processor = NULL;
 
-        processor = (struct acpi_table_lapic*) header;
+        processor = (struct acpi_table_lapic *)header;
 
         if (BAD_MADT_ENTRY(processor, end))
                 return -EINVAL;
@@ -260,20 +256,19 @@ acpi_parse_lapic (
 
         x86_acpiid_to_apicid[processor->acpi_id] = processor->id;
 
-        mp_register_lapic (
-                processor->id,                                     /* APIC ID */
-                processor->flags.enabled);                        /* Enabled? */
+        mp_register_lapic(processor->id,        /* APIC ID */
+                          processor->flags.enabled);    /* Enabled? */
 
         return 0;
 }
 
 static int __init
-acpi_parse_lapic_addr_ovr (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
+                          const unsigned long end)
 {
         struct acpi_table_lapic_addr_ovr *lapic_addr_ovr = NULL;
 
-        lapic_addr_ovr = (struct acpi_table_lapic_addr_ovr*) header;
+        lapic_addr_ovr = (struct acpi_table_lapic_addr_ovr *)header;
 
         if (BAD_MADT_ENTRY(lapic_addr_ovr, end))
                 return -EINVAL;
@@ -284,12 +279,11 @@ acpi_parse_lapic_addr_ovr (
 }
 
 static int __init
-acpi_parse_lapic_nmi (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_lapic_nmi *lapic_nmi = NULL;
 
-        lapic_nmi = (struct acpi_table_lapic_nmi*) header;
+        lapic_nmi = (struct acpi_table_lapic_nmi *)header;
 
         if (BAD_MADT_ENTRY(lapic_nmi, end))
                 return -EINVAL;
@@ -302,37 +296,32 @@ acpi_parse_lapic_nmi (
         return 0;
 }
 
+#endif                          /*CONFIG_X86_LOCAL_APIC */
 
-#endif /*CONFIG_X86_LOCAL_APIC*/
-
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef CONFIG_X86_IO_APIC
 
 static int __init
-acpi_parse_ioapic (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_ioapic(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_ioapic *ioapic = NULL;
 
-        ioapic = (struct acpi_table_ioapic*) header;
+        ioapic = (struct acpi_table_ioapic *)header;
 
         if (BAD_MADT_ENTRY(ioapic, end))
                 return -EINVAL;
- 
+
         acpi_table_print_madt_entry(header);
 
-        mp_register_ioapic (
-                ioapic->id,
-                ioapic->address,
-                ioapic->global_irq_base);
- 
+        mp_register_ioapic(ioapic->id,
+                           ioapic->address, ioapic->global_irq_base);
+
         return 0;
 }
 
 /*
  * Parse Interrupt Source Override for the ACPI SCI
  */
-static void
-acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
+static void acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
 {
         if (trigger == 0)       /* compatible SCI trigger is level */
                 trigger = 3;
@@ -348,7 +337,7 @@ acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
                 polarity = acpi_sci_flags.polarity;
 
         /*
-         * mp_config_acpi_legacy_irqs() already setup IRQs < 16
+         * mp_config_acpi_legacy_irqs() already setup IRQs < 16
          * If GSI is < 16, this will update its flags,
          * else it will create a new mp_irqs[] entry.
          */
@@ -363,12 +352,12 @@ acpi_sci_ioapic_setup(u32 gsi, u16 polarity, u16 trigger)
 }
 
 static int __init
-acpi_parse_int_src_ovr (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_int_src_ovr(acpi_table_entry_header * header,
+                       const unsigned long end)
 {
         struct acpi_table_int_src_ovr *intsrc = NULL;
 
-        intsrc = (struct acpi_table_int_src_ovr*) header;
+        intsrc = (struct acpi_table_int_src_ovr *)header;
 
         if (BAD_MADT_ENTRY(intsrc, end))
                 return -EINVAL;
@@ -377,33 +366,30 @@ acpi_parse_int_src_ovr (
 
         if (intsrc->bus_irq == acpi_fadt.sci_int) {
                 acpi_sci_ioapic_setup(intsrc->global_irq,
-                        intsrc->flags.polarity, intsrc->flags.trigger);
+                                      intsrc->flags.polarity,
+                                      intsrc->flags.trigger);
                 return 0;
         }
 
         if (acpi_skip_timer_override &&
-                intsrc->bus_irq == 0 && intsrc->global_irq == 2) {
-                        printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
-                        return 0;
+            intsrc->bus_irq == 0 && intsrc->global_irq == 2) {
+                printk(PREFIX "BIOS IRQ0 pin2 override ignored.\n");
+                return 0;
         }
 
-        mp_override_legacy_irq (
-                intsrc->bus_irq,
-                intsrc->flags.polarity,
-                intsrc->flags.trigger,
-                intsrc->global_irq);
+        mp_override_legacy_irq(intsrc->bus_irq,
+                               intsrc->flags.polarity,
+                               intsrc->flags.trigger, intsrc->global_irq);
 
         return 0;
 }
 
-
 static int __init
-acpi_parse_nmi_src (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_nmi_src *nmi_src = NULL;
 
-        nmi_src = (struct acpi_table_nmi_src*) header;
+        nmi_src = (struct acpi_table_nmi_src *)header;
 
         if (BAD_MADT_ENTRY(nmi_src, end))
                 return -EINVAL;
@@ -415,9 +401,7 @@ acpi_parse_nmi_src (
         return 0;
 }
 
-#endif /* CONFIG_X86_IO_APIC */
-
-#ifdef  CONFIG_ACPI_BUS
+#endif                          /* CONFIG_X86_IO_APIC */
 
 /*
  * acpi_pic_sci_set_trigger()
@@ -433,8 +417,7 @@ acpi_parse_nmi_src (
  * ECLR2 is IRQ's 8-15 (IRQ 8, 13 must be 0)
  */
 
-void __init
-acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
+void __init acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
 {
         unsigned int mask = 1 << irq;
         unsigned int old, new;
@@ -454,10 +437,10 @@ acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
          * routing tables..
          */
         switch (trigger) {
-        case 1: /* Edge - clear */
+        case 1:         /* Edge - clear */
                 new &= ~mask;
                 break;
-        case 3: /* Level - set */
+        case 3:         /* Level - set */
                 new |= mask;
                 break;
         }
@@ -470,21 +453,22 @@ acpi_pic_sci_set_trigger(unsigned int irq, u16 trigger)
         outb(new >> 8, 0x4d1);
 }
 
-
-#endif /* CONFIG_ACPI_BUS */
-
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
 #ifdef CONFIG_X86_IO_APIC
         if (use_pci_vector() && !platform_legacy_irq(gsi))
-                *irq = IO_APIC_VECTOR(gsi);
+                *irq = IO_APIC_VECTOR(gsi);
         else
 #endif
                 *irq = gsi;
         return 0;
 }
 
-unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
+/*
+ * success: return IRQ number (>=0)
+ * failure: return < 0
+ */
+int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
 {
         unsigned int irq;
         unsigned int plat_gsi = gsi;
@@ -497,7 +481,7 @@ unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
                 extern void eisa_set_level_irq(unsigned int irq);
 
                 if (edge_level == ACPI_LEVEL_SENSITIVE)
-                                eisa_set_level_irq(gsi);
+                        eisa_set_level_irq(gsi);
         }
 #endif
 
@@ -509,60 +493,58 @@ unsigned int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
         acpi_gsi_to_irq(plat_gsi, &irq);
         return irq;
 }
+
 EXPORT_SYMBOL(acpi_register_gsi);
 
 /*
  *  ACPI based hotplug support for CPU
  */
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
-int
-acpi_map_lsapic(acpi_handle handle, int *pcpu)
+int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 {
         /* TBD */
         return -EINVAL;
 }
-EXPORT_SYMBOL(acpi_map_lsapic);
 
+EXPORT_SYMBOL(acpi_map_lsapic);
 
-int
-acpi_unmap_lsapic(int cpu)
+int acpi_unmap_lsapic(int cpu)
 {
         /* TBD */
         return -EINVAL;
 }
+
 EXPORT_SYMBOL(acpi_unmap_lsapic);
-#endif /* CONFIG_ACPI_HOTPLUG_CPU */
+#endif                          /* CONFIG_ACPI_HOTPLUG_CPU */
 
-int
-acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
+int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
 {
         /* TBD */
         return -EINVAL;
 }
+
 EXPORT_SYMBOL(acpi_register_ioapic);
 
-int
-acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
+int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 {
         /* TBD */
         return -EINVAL;
 }
+
 EXPORT_SYMBOL(acpi_unregister_ioapic);
 
 static unsigned long __init
-acpi_scan_rsdp (
-        unsigned long           start,
-        unsigned long           length)
+acpi_scan_rsdp(unsigned long start, unsigned long length)
 {
-        unsigned long           offset = 0;
-        unsigned long           sig_len = sizeof("RSD PTR ") - 1;
+        unsigned long offset = 0;
+        unsigned long sig_len = sizeof("RSD PTR ") - 1;
 
         /*
          * Scan all 16-byte boundaries of the physical memory region for the
          * RSDP signature.
          */
         for (offset = 0; offset < length; offset += 16) {
-                if (strncmp((char *) (start + offset), "RSD PTR ", sig_len))
+                if (strncmp((char *)(start + offset), "RSD PTR ", sig_len))
                         continue;
                 return (start + offset);
         }
@@ -575,20 +557,19 @@ static int __init acpi_parse_sbf(unsigned long phys_addr, unsigned long size)
         struct acpi_table_sbf *sb;
 
         if (!phys_addr || !size)
-        return -EINVAL;
+                return -EINVAL;
 
-        sb = (struct acpi_table_sbf *) __acpi_map_table(phys_addr, size);
+        sb = (struct acpi_table_sbf *)__acpi_map_table(phys_addr, size);
         if (!sb) {
                 printk(KERN_WARNING PREFIX "Unable to map SBF\n");
                 return -ENODEV;
         }
 
-        sbf_port = sb->sbf_cmos; /* Save CMOS port */
+        sbf_port = sb->sbf_cmos;        /* Save CMOS port */
 
         return 0;
 }
 
-
 #ifdef CONFIG_HPET_TIMER
 
 static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)
@@ -598,7 +579,7 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)
         if (!phys || !size)
                 return -EINVAL;
 
-        hpet_tbl = (struct acpi_table_hpet *) __acpi_map_table(phys, size);
+        hpet_tbl = (struct acpi_table_hpet *)__acpi_map_table(phys, size);
         if (!hpet_tbl) {
                 printk(KERN_WARNING PREFIX "Unable to map HPET\n");
                 return -ENODEV;
@@ -609,22 +590,21 @@ static int __init acpi_parse_hpet(unsigned long phys, unsigned long size)
                        "memory.\n");
                 return -1;
         }
-
 #ifdef  CONFIG_X86_64
-        vxtime.hpet_address = hpet_tbl->addr.addrl |
-                ((long) hpet_tbl->addr.addrh << 32);
+        vxtime.hpet_address = hpet_tbl->addr.addrl |
+            ((long)hpet_tbl->addr.addrh << 32);
 
-        printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
-               hpet_tbl->id, vxtime.hpet_address);
-#else   /* X86 */
+        printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
+               hpet_tbl->id, vxtime.hpet_address);
+#else                           /* X86 */
         {
                 extern unsigned long hpet_address;
 
                 hpet_address = hpet_tbl->addr.addrl;
                 printk(KERN_INFO PREFIX "HPET id: %#x base: %#lx\n",
-                        hpet_tbl->id, hpet_address);
+                       hpet_tbl->id, hpet_address);
         }
-#endif  /* X86 */
+#endif                          /* X86 */
 
         return 0;
 }
@@ -640,28 +620,25 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
 {
         struct fadt_descriptor_rev2 *fadt = NULL;
 
-        fadt = (struct fadt_descriptor_rev2*) __acpi_map_table(phys,size);
-        if(!fadt) {
+        fadt = (struct fadt_descriptor_rev2 *)__acpi_map_table(phys, size);
+        if (!fadt) {
                 printk(KERN_WARNING PREFIX "Unable to map FADT\n");
                 return 0;
         }
-
-#ifdef  CONFIG_ACPI_INTERPRETER
         /* initialize sci_int early for INT_SRC_OVR MADT parsing */
         acpi_fadt.sci_int = fadt->sci_int;
-#endif
 
-#ifdef CONFIG_ACPI_BUS
         /* initialize rev and apic_phys_dest_mode for x86_64 genapic */
         acpi_fadt.revision = fadt->revision;
-        acpi_fadt.force_apic_physical_destination_mode = fadt->force_apic_physical_destination_mode;
-#endif
+        acpi_fadt.force_apic_physical_destination_mode =
+            fadt->force_apic_physical_destination_mode;
 
 #ifdef CONFIG_X86_PM_TIMER
         /* detect the location of the ACPI PM Timer */
         if (fadt->revision >= FADT2_REVISION_ID) {
                 /* FADT rev. 2 */
-                if (fadt->xpm_tmr_blk.address_space_id != ACPI_ADR_SPACE_SYSTEM_IO)
+                if (fadt->xpm_tmr_blk.address_space_id !=
+                    ACPI_ADR_SPACE_SYSTEM_IO)
                         return 0;
 
                 pmtmr_ioport = fadt->xpm_tmr_blk.address;
@@ -670,16 +647,15 @@ static int __init acpi_parse_fadt(unsigned long phys, unsigned long size)
                 pmtmr_ioport = fadt->V1_pm_tmr_blk;
         }
         if (pmtmr_ioport)
-                printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n", pmtmr_ioport);
+                printk(KERN_INFO PREFIX "PM-Timer IO Port: %#x\n",
+                       pmtmr_ioport);
 #endif
         return 0;
 }
 
-
-unsigned long __init
-acpi_find_rsdp (void)
+unsigned long __init acpi_find_rsdp(void)
 {
-        unsigned long           rsdp_phys = 0;
+        unsigned long rsdp_phys = 0;
 
         if (efi_enabled) {
                 if (efi.acpi20)
@@ -691,9 +667,9 @@ acpi_find_rsdp (void)
          * Scan memory looking for the RSDP signature. First search EBDA (low
          * memory) paragraphs and then search upper memory (E0000-FFFFF).
          */
-        rsdp_phys = acpi_scan_rsdp (0, 0x400);
+        rsdp_phys = acpi_scan_rsdp(0, 0x400);
         if (!rsdp_phys)
-                rsdp_phys = acpi_scan_rsdp (0xE0000, 0x20000);
+                rsdp_phys = acpi_scan_rsdp(0xE0000, 0x20000);
 
         return rsdp_phys;
 }
@@ -703,8 +679,7 @@ acpi_find_rsdp (void)
  * Parse LAPIC entries in MADT
  * returns 0 on success, < 0 on error
  */
-static int __init
-acpi_parse_madt_lapic_entries(void)
+static int __init acpi_parse_madt_lapic_entries(void)
 {
         int count;
 
@@ -713,28 +688,31 @@ acpi_parse_madt_lapic_entries(void)
          * and (optionally) overriden by a LAPIC_ADDR_OVR entry (64-bit value).
          */
 
-        count = acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0);
+        count =
+            acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR,
+                                  acpi_parse_lapic_addr_ovr, 0);
         if (count < 0) {
-                printk(KERN_ERR PREFIX "Error parsing LAPIC address override entry\n");
+                printk(KERN_ERR PREFIX
+                       "Error parsing LAPIC address override entry\n");
                 return count;
         }
 
         mp_register_lapic_address(acpi_lapic_addr);
 
         count = acpi_table_parse_madt(ACPI_MADT_LAPIC, acpi_parse_lapic,
-                                       MAX_APICS);
-        if (!count) { 
+                                      MAX_APICS);
+        if (!count) {
                 printk(KERN_ERR PREFIX "No LAPIC entries present\n");
                 /* TBD: Cleanup to allow fallback to MPS */
                 return -ENODEV;
-        }
-        else if (count < 0) {
+        } else if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing LAPIC entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
                 return count;
         }
 
-        count = acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0);
+        count =
+            acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0);
         if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
@@ -742,15 +720,14 @@ acpi_parse_madt_lapic_entries(void)
         }
         return 0;
 }
-#endif /* CONFIG_X86_LOCAL_APIC */
+#endif                          /* CONFIG_X86_LOCAL_APIC */
 
-#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI_INTERPRETER)
+#ifdef  CONFIG_X86_IO_APIC
 /*
  * Parse IOAPIC related entries in MADT
  * returns 0 on success, < 0 on error
  */
-static int __init
-acpi_parse_madt_ioapic_entries(void)
+static int __init acpi_parse_madt_ioapic_entries(void)
 {
         int count;
 
@@ -762,30 +739,34 @@ acpi_parse_madt_ioapic_entries(void)
          */
         if (acpi_disabled || acpi_noirq) {
                 return -ENODEV;
-        }
+        }
 
         /*
-         * if "noapic" boot option, don't look for IO-APICs
+         * if "noapic" boot option, don't look for IO-APICs
          */
         if (skip_ioapic_setup) {
                 printk(KERN_INFO PREFIX "Skipping IOAPIC probe "
-                        "due to 'noapic' option.\n");
+                       "due to 'noapic' option.\n");
                 return -ENODEV;
         }
 
-        count = acpi_table_parse_madt(ACPI_MADT_IOAPIC, acpi_parse_ioapic, MAX_IO_APICS);
+        count =
+            acpi_table_parse_madt(ACPI_MADT_IOAPIC, acpi_parse_ioapic,
+                                  MAX_IO_APICS);
         if (!count) {
                 printk(KERN_ERR PREFIX "No IOAPIC entries present\n");
                 return -ENODEV;
-        }
-        else if (count < 0) {
+        } else if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing IOAPIC entry\n");
                 return count;
         }
 
-        count = acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, NR_IRQ_VECTORS);
+        count =
+            acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr,
+                                  NR_IRQ_VECTORS);
         if (count < 0) {
-                printk(KERN_ERR PREFIX "Error parsing interrupt source overrides entry\n");
+                printk(KERN_ERR PREFIX
+                       "Error parsing interrupt source overrides entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
                 return count;
         }
@@ -800,7 +781,9 @@ acpi_parse_madt_ioapic_entries(void)
         /* Fill in identity legacy mapings where no override */
         mp_config_acpi_legacy_irqs();
 
-        count = acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src, NR_IRQ_VECTORS);
+        count =
+            acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src,
+                                  NR_IRQ_VECTORS);
         if (count < 0) {
                 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
                 /* TBD: Cleanup to allow fallback to MPS */
@@ -814,11 +797,9 @@ static inline int acpi_parse_madt_ioapic_entries(void)
 {
         return -1;
 }
-#endif /* !(CONFIG_X86_IO_APIC && CONFIG_ACPI_INTERPRETER) */
+#endif  /* !CONFIG_X86_IO_APIC */
 
-
-static void __init
-acpi_process_madt(void)
+static void __init acpi_process_madt(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
         int count, error;
@@ -853,7 +834,8 @@ acpi_process_madt(void)
                         /*
                          * Dell Precision Workstation 410, 610 come here.
                          */
-                        printk(KERN_ERR PREFIX "Invalid BIOS MADT, disabling ACPI\n");
+                        printk(KERN_ERR PREFIX
+                               "Invalid BIOS MADT, disabling ACPI\n");
                         disable_acpi();
                 }
         }
@@ -865,7 +847,6 @@ extern int acpi_force;
 
 #ifdef __i386__
 
-#ifdef  CONFIG_ACPI_PCI
 static int __init disable_acpi_irq(struct dmi_system_id *d)
 {
         if (!acpi_force) {
@@ -885,12 +866,11 @@ static int __init disable_acpi_pci(struct dmi_system_id *d)
         }
         return 0;
 }
-#endif
 
 static int __init dmi_disable_acpi(struct dmi_system_id *d)
 {
         if (!acpi_force) {
-                printk(KERN_NOTICE "%s detected: acpi off\n",d->ident);
+                printk(KERN_NOTICE "%s detected: acpi off\n", d->ident);
                 disable_acpi();
         } else {
                 printk(KERN_NOTICE
@@ -905,7 +885,8 @@ static int __init dmi_disable_acpi(struct dmi_system_id *d)
 static int __init force_acpi_ht(struct dmi_system_id *d)
 {
         if (!acpi_force) {
-                printk(KERN_NOTICE "%s detected: force use of acpi=ht\n", d->ident);
+                printk(KERN_NOTICE "%s detected: force use of acpi=ht\n",
+                       d->ident);
                 disable_acpi();
                 acpi_ht = 1;
         } else {
@@ -924,155 +905,155 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
          * Boxes that need ACPI disabled
          */
         {
-                .callback = dmi_disable_acpi,
-                .ident = "IBM Thinkpad",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
-                        DMI_MATCH(DMI_BOARD_NAME, "2629H1G"),
-                },
-        },
+         .callback = dmi_disable_acpi,
+         .ident = "IBM Thinkpad",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
+                     DMI_MATCH(DMI_BOARD_NAME, "2629H1G"),
+                     },
+         },
 
         /*
          * Boxes that need acpi=ht
          */
         {
-                .callback = force_acpi_ht,
-                .ident = "FSC Primergy T850",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "FSC Primergy T850",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "FUJITSU SIEMENS"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "PRIMERGY T850"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "DELL GX240",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"),
-                        DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "DELL GX240",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "Dell Computer Corporation"),
+                     DMI_MATCH(DMI_BOARD_NAME, "OptiPlex GX240"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "HP VISUALIZE NT Workstation",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "HP VISUALIZE NT Workstation"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "HP VISUALIZE NT Workstation",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "Hewlett-Packard"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "HP VISUALIZE NT Workstation"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "Compaq Workstation W8000",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "Compaq Workstation W8000",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Compaq"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "Workstation W8000"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "ASUS P4B266",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_BOARD_NAME, "P4B266"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "ASUS P4B266",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                     DMI_MATCH(DMI_BOARD_NAME, "P4B266"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "ASUS P2B-DS",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_BOARD_NAME, "P2B-DS"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "ASUS P2B-DS",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                     DMI_MATCH(DMI_BOARD_NAME, "P2B-DS"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "ASUS CUR-DLS",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_BOARD_NAME, "CUR-DLS"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "ASUS CUR-DLS",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                     DMI_MATCH(DMI_BOARD_NAME, "CUR-DLS"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "ABIT i440BX-W83977",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ABIT <http://www.abit.com>"),
-                        DMI_MATCH(DMI_BOARD_NAME, "i440BX-W83977 (BP6)"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "ABIT i440BX-W83977",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ABIT <http://www.abit.com>"),
+                     DMI_MATCH(DMI_BOARD_NAME, "i440BX-W83977 (BP6)"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "IBM Bladecenter",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
-                        DMI_MATCH(DMI_BOARD_NAME, "IBM eServer BladeCenter HS20"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "IBM Bladecenter",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
+                     DMI_MATCH(DMI_BOARD_NAME, "IBM eServer BladeCenter HS20"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "IBM eServer xSeries 360",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
-                        DMI_MATCH(DMI_BOARD_NAME, "eServer xSeries 360"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "IBM eServer xSeries 360",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
+                     DMI_MATCH(DMI_BOARD_NAME, "eServer xSeries 360"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "IBM eserver xSeries 330",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
-                        DMI_MATCH(DMI_BOARD_NAME, "eserver xSeries 330"),
-                },
-        },
+         .callback = force_acpi_ht,
+         .ident = "IBM eserver xSeries 330",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
+                     DMI_MATCH(DMI_BOARD_NAME, "eserver xSeries 330"),
+                     },
+         },
         {
-                .callback = force_acpi_ht,
-                .ident = "IBM eserver xSeries 440",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),
-                },
-        },
-
-#ifdef  CONFIG_ACPI_PCI
+         .callback = force_acpi_ht,
+         .ident = "IBM eserver xSeries 440",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "IBM"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "eserver xSeries 440"),
+                     },
+         },
+
         /*
          * Boxes that need ACPI PCI IRQ routing disabled
          */
         {
-                .callback = disable_acpi_irq,
-                .ident = "ASUS A7V",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC"),
-                        DMI_MATCH(DMI_BOARD_NAME, "<A7V>"),
-                        /* newer BIOS, Revision 1011, does work */
-                        DMI_MATCH(DMI_BIOS_VERSION, "ASUS A7V ACPI BIOS Revision 1007"),
-                },
-        },
+         .callback = disable_acpi_irq,
+         .ident = "ASUS A7V",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC"),
+                     DMI_MATCH(DMI_BOARD_NAME, "<A7V>"),
+                     /* newer BIOS, Revision 1011, does work */
+                     DMI_MATCH(DMI_BIOS_VERSION,
+                               "ASUS A7V ACPI BIOS Revision 1007"),
+                     },
+         },
 
         /*
          * Boxes that need ACPI PCI IRQ routing and PCI scan disabled
          */
-        {       /* _BBN 0 bug */
-                .callback = disable_acpi_pci,
-                .ident = "ASUS PR-DLS",
-                .matches = {
-                        DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
-                        DMI_MATCH(DMI_BOARD_NAME, "PR-DLS"),
-                        DMI_MATCH(DMI_BIOS_VERSION, "ASUS PR-DLS ACPI BIOS Revision 1010"),
-                        DMI_MATCH(DMI_BIOS_DATE, "03/21/2003")
-                },
-        },
+        {                       /* _BBN 0 bug */
+         .callback = disable_acpi_pci,
+         .ident = "ASUS PR-DLS",
+         .matches = {
+                     DMI_MATCH(DMI_BOARD_VENDOR, "ASUSTeK Computer INC."),
+                     DMI_MATCH(DMI_BOARD_NAME, "PR-DLS"),
+                     DMI_MATCH(DMI_BIOS_VERSION,
+                               "ASUS PR-DLS ACPI BIOS Revision 1010"),
+                     DMI_MATCH(DMI_BIOS_DATE, "03/21/2003")
+                     },
+         },
         {
-                .callback = disable_acpi_pci,
-                .ident = "Acer TravelMate 36x Laptop",
-                .matches = {
-                        DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
-                        DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
-                },
-        },
-#endif
-        { }
+         .callback = disable_acpi_pci,
+         .ident = "Acer TravelMate 36x Laptop",
+         .matches = {
+                     DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
+                     DMI_MATCH(DMI_PRODUCT_NAME, "TravelMate 360"),
+                     },
+         },
+        {}
 };
 
-#endif  /* __i386__ */
+#endif                          /* __i386__ */
 
 /*
  * acpi_boot_table_init() and acpi_boot_init()
@@ -1097,8 +1078,7 @@ static struct dmi_system_id __initdata acpi_dmi_table[] = {
  *      !0: failure
  */
 
-int __init
-acpi_boot_table_init(void)
+int __init acpi_boot_table_init(void)
 {
         int error;
 
@@ -1111,7 +1091,7 @@ acpi_boot_table_init(void)
          * One exception: acpi=ht continues far enough to enumerate LAPICs
          */
         if (acpi_disabled && !acpi_ht)
-                 return 1;
+                return 1;
 
         /* 
          * Initialize the ACPI boot-time table parser.
@@ -1121,7 +1101,6 @@ acpi_boot_table_init(void)
                 disable_acpi();
                 return error;
         }
-
 #ifdef __i386__
         check_acpi_pci();
 #endif
@@ -1145,7 +1124,6 @@ acpi_boot_table_init(void)
         return 0;
 }
 
-
 int __init acpi_boot_init(void)
 {
         /*
@@ -1153,7 +1131,7 @@ int __init acpi_boot_init(void)
          * One exception: acpi=ht continues far enough to enumerate LAPICs
          */
         if (acpi_disabled && !acpi_ht)
-                 return 1;
+                return 1;
 
         acpi_table_parse(ACPI_BOOT, acpi_parse_sbf);
 
@@ -1171,4 +1149,3 @@ int __init acpi_boot_init(void)
 
         return 0;
 }
-
diff --git a/arch/i386/kernel/acpi/earlyquirk.c b/arch/i386/kernel/acpi/earlyquirk.c
index 726a5ca4b165..f1b9d2a46dab 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -8,44 +8,44 @@
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
 
-static int __init check_bridge(int vendor, int device) 
+static int __init check_bridge(int vendor, int device)
 {
         /* According to Nvidia all timer overrides are bogus. Just ignore
            them all. */
-        if (vendor == PCI_VENDOR_ID_NVIDIA) { 
-                acpi_skip_timer_override = 1;           
+        if (vendor == PCI_VENDOR_ID_NVIDIA) {
+                acpi_skip_timer_override = 1;
         }
         return 0;
 }
-   
-void __init check_acpi_pci(void) 
-{ 
-        int num,slot,func; 
+
+void __init check_acpi_pci(void)
+{
+        int num, slot, func;
 
         /* Assume the machine supports type 1. If not it will 
            always read ffffffff and should not have any side effect. */
 
         /* Poor man's PCI discovery */
-        for (num = 0; num < 32; num++) { 
-                for (slot = 0; slot < 32; slot++) { 
-                        for (func = 0; func < 8; func++) { 
+        for (num = 0; num < 32; num++) {
+                for (slot = 0; slot < 32; slot++) {
+                        for (func = 0; func < 8; func++) {
                                 u32 class;
                                 u32 vendor;
-                                class = read_pci_config(num,slot,func,
+                                class = read_pci_config(num, slot, func,
                                                         PCI_CLASS_REVISION);
                                 if (class == 0xffffffff)
-                                        break; 
+                                        break;
 
                                 if ((class >> 16) != PCI_CLASS_BRIDGE_PCI)
-                                        continue; 
-                                
-                                vendor = read_pci_config(num, slot, func, 
+                                        continue;
+
+                                vendor = read_pci_config(num, slot, func,
                                                          PCI_VENDOR_ID);
-                                
-                                if (check_bridge(vendor&0xffff, vendor >> 16))
-                                        return; 
-                        } 
-                        
+
+                                if (check_bridge(vendor & 0xffff, vendor >> 16))
+                                        return;
+                        }
+
                 }
         }
 }
diff --git a/arch/i386/kernel/acpi/sleep.c b/arch/i386/kernel/acpi/sleep.c
index c1af93032ff3..1cb2b186a3af 100644
--- a/arch/i386/kernel/acpi/sleep.c
+++ b/arch/i386/kernel/acpi/sleep.c
@@ -20,12 +20,13 @@ extern void zap_low_mappings(void);
 
 extern unsigned long FASTCALL(acpi_copy_wakeup_routine(unsigned long));
 
-static void init_low_mapping(pgd_t *pgd, int pgd_limit)
+static void init_low_mapping(pgd_t * pgd, int pgd_limit)
 {
         int pgd_ofs = 0;
 
-        while ((pgd_ofs < pgd_limit) && (pgd_ofs + USER_PTRS_PER_PGD < PTRS_PER_PGD)) {
-                set_pgd(pgd, *(pgd+USER_PTRS_PER_PGD));
+        while ((pgd_ofs < pgd_limit)
+               && (pgd_ofs + USER_PTRS_PER_PGD < PTRS_PER_PGD)) {
+                set_pgd(pgd, *(pgd + USER_PTRS_PER_PGD));
                 pgd_ofs++, pgd++;
         }
         flush_tlb_all();
@@ -37,12 +38,13 @@ static void init_low_mapping(pgd_t *pgd, int pgd_limit)
  * Create an identity mapped page table and copy the wakeup routine to
  * low memory.
  */
-int acpi_save_state_mem (void)
+int acpi_save_state_mem(void)
 {
         if (!acpi_wakeup_address)
                 return 1;
         init_low_mapping(swapper_pg_dir, USER_PTRS_PER_PGD);
-        memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);
+        memcpy((void *)acpi_wakeup_address, &wakeup_start,
+               &wakeup_end - &wakeup_start);
         acpi_copy_wakeup_routine(acpi_wakeup_address);
 
         return 0;
@@ -51,7 +53,7 @@ int acpi_save_state_mem (void)
 /*
  * acpi_restore_state - undo effects of acpi_save_state_mem
  */
-void acpi_restore_state_mem (void)
+void acpi_restore_state_mem(void)
 {
         zap_low_mappings();
 }
@@ -67,7 +69,8 @@ void acpi_restore_state_mem (void)
 void __init acpi_reserve_bootmem(void)
 {
         if ((&wakeup_end - &wakeup_start) > PAGE_SIZE) {
-                printk(KERN_ERR "ACPI: Wakeup code way too big, S3 disabled.\n");
+                printk(KERN_ERR
+                       "ACPI: Wakeup code way too big, S3 disabled.\n");
                 return;
         }
 
@@ -90,10 +93,8 @@ static int __init acpi_sleep_setup(char *str)
         return 1;
 }
 
-
 __setup("acpi_sleep=", acpi_sleep_setup);
 
-
 static __init int reset_videomode_after_s3(struct dmi_system_id *d)
 {
         acpi_video_flags |= 2;
@@ -101,14 +102,14 @@ static __init int reset_videomode_after_s3(struct dmi_system_id *d)
 }
 
 static __initdata struct dmi_system_id acpisleep_dmi_table[] = {
-        {       /* Reset video mode after returning from ACPI S3 sleep */
-                .callback = reset_videomode_after_s3,
-                .ident = "Toshiba Satellite 4030cdt",
-                .matches = {
-                        DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
-                },
-        },
-        { }
+        {                       /* Reset video mode after returning from ACPI S3 sleep */
+         .callback = reset_videomode_after_s3,
+         .ident = "Toshiba Satellite 4030cdt",
+         .matches = {
+                     DMI_MATCH(DMI_PRODUCT_NAME, "S4030CDT/4.3"),
+                     },
+         },
+        {}
 };
 
 static int __init acpisleep_dmi_init(void)
diff --git a/arch/i386/kernel/acpi/wakeup.S b/arch/i386/kernel/acpi/wakeup.S
index 44d886c745ec..7c74fe0dc93c 100644
--- a/arch/i386/kernel/acpi/wakeup.S
+++ b/arch/i386/kernel/acpi/wakeup.S
@@ -304,12 +304,6 @@ ret_point:
         call    restore_processor_state
         ret
 
-ENTRY(do_suspend_lowlevel_s4bios)
-        call save_processor_state
-        call save_registers
-        call acpi_enter_sleep_state_s4bios
-        ret
-
 ALIGN
 # saved registers
 saved_gdt:      .long   0,0
diff --git a/arch/i386/kernel/cpu/common.c b/arch/i386/kernel/cpu/common.c
index 46ce9b248f55..9ad43be9a01f 100644
--- a/arch/i386/kernel/cpu/common.c
+++ b/arch/i386/kernel/cpu/common.c
@@ -151,7 +151,7 @@ static char __devinit *table_lookup_model(struct cpuinfo_x86 *c)
 }
 
 
-void __devinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
+static void __devinit get_cpu_vendor(struct cpuinfo_x86 *c, int early)
 {
         char *v = c->x86_vendor_id;
         int i;
diff --git a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
index 60a9e54dd20e..822c8ce9d1f1 100644
--- a/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
+++ b/arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
@@ -31,6 +31,7 @@
 #include <linux/cpufreq.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/compiler.h>
 #include <asm/io.h>
 #include <asm/delay.h>
 #include <asm/uaccess.h>
@@ -57,6 +58,8 @@ static struct cpufreq_acpi_io	*acpi_io_data[NR_CPUS];
 
 static struct cpufreq_driver acpi_cpufreq_driver;
 
+static unsigned int acpi_pstate_strict;
+
 static int
 acpi_processor_write_port(
         u16     port,
@@ -163,34 +166,44 @@ acpi_processor_set_performance (
         }
 
         /*
-         * Then we read the 'status_register' and compare the value with the
-         * target state's 'status' to make sure the transition was successful.
-         * Note that we'll poll for up to 1ms (100 cycles of 10us) before
-         * giving up.
+         * Assume the write went through when acpi_pstate_strict is not used.
+         * As read status_register is an expensive operation and there 
+         * are no specific error cases where an IO port write will fail.
          */
-
-        port = data->acpi_data.status_register.address;
-        bit_width = data->acpi_data.status_register.bit_width;
-
-        dprintk("Looking for 0x%08x from port 0x%04x\n",
-                (u32) data->acpi_data.states[state].status, port);
-
-        for (i=0; i<100; i++) {
-                ret = acpi_processor_read_port(port, bit_width, &value);
-                if (ret) {      
-                        dprintk("Invalid port width 0x%04x\n", bit_width);
-                        retval = ret;
-                        goto migrate_end;
+        if (acpi_pstate_strict) {
+                /* Then we read the 'status_register' and compare the value 
+                 * with the target state's 'status' to make sure the 
+                 * transition was successful.
+                 * Note that we'll poll for up to 1ms (100 cycles of 10us) 
+                 * before giving up.
+                 */
+
+                port = data->acpi_data.status_register.address;
+                bit_width = data->acpi_data.status_register.bit_width;
+
+                dprintk("Looking for 0x%08x from port 0x%04x\n",
+                        (u32) data->acpi_data.states[state].status, port);
+
+                for (i=0; i<100; i++) {
+                        ret = acpi_processor_read_port(port, bit_width, &value);
+                        if (ret) {      
+                                dprintk("Invalid port width 0x%04x\n", bit_width);
+                                retval = ret;
+                                goto migrate_end;
+                        }
+                        if (value == (u32) data->acpi_data.states[state].status)
+                                break;
+                        udelay(10);
                 }
-                if (value == (u32) data->acpi_data.states[state].status)
-                        break;
-                udelay(10);
+        } else {
+                i = 0;
+                value = (u32) data->acpi_data.states[state].status;
         }
 
         /* notify cpufreq */
         cpufreq_notify_transition(&cpufreq_freqs, CPUFREQ_POSTCHANGE);
 
-        if (value != (u32) data->acpi_data.states[state].status) {
+        if (unlikely(value != (u32) data->acpi_data.states[state].status)) {
                 unsigned int tmp = cpufreq_freqs.new;
                 cpufreq_freqs.new = cpufreq_freqs.old;
                 cpufreq_freqs.old = tmp;
@@ -537,6 +550,8 @@ acpi_cpufreq_exit (void)
         return;
 }
 
+module_param(acpi_pstate_strict, uint, 0644);
+MODULE_PARM_DESC(acpi_pstate_strict, "value 0 or non-zero. non-zero -> strict ACPI checks are performed during frequency changes.");
 
 late_initcall(acpi_cpufreq_init);
 module_exit(acpi_cpufreq_exit);
diff --git a/arch/i386/kernel/cpu/cpufreq/longhaul.c b/arch/i386/kernel/cpu/cpufreq/longhaul.c
index bf02b5026e62..8ef38544453c 100644
--- a/arch/i386/kernel/cpu/cpufreq/longhaul.c
+++ b/arch/i386/kernel/cpu/cpufreq/longhaul.c
@@ -467,11 +467,11 @@ static void __init longhaul_setup_voltagescaling(void)
         }
 
         if (vrmrev==0) {
-                dprintk ("VRM 8.5 \n");
+                dprintk ("VRM 8.5\n");
                 memcpy (voltage_table, vrm85scales, sizeof(voltage_table));
                 numvscales = (voltage_table[maxvid]-voltage_table[minvid])/25;
         } else {
-                dprintk ("Mobile VRM \n");
+                dprintk ("Mobile VRM\n");
                 memcpy (voltage_table, mobilevrmscales, sizeof(voltage_table));
                 numvscales = (voltage_table[maxvid]-voltage_table[minvid])/5;
         }
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
index 327a55d4d1c6..c397b6220430 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
@@ -259,7 +259,7 @@ static int centrino_cpu_init_table(struct cpufreq_policy *policy)
 
         if (model->op_points == NULL) {
                 /* Matched a non-match */
-                dprintk(KERN_INFO PFX "no table support for CPU model \"%s\": \n",
+                dprintk(KERN_INFO PFX "no table support for CPU model \"%s\"\n",
                        cpu->x86_model_id);
 #ifndef CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI
                 dprintk(KERN_INFO PFX "try compiling with CONFIG_X86_SPEEDSTEP_CENTRINO_ACPI enabled\n");
@@ -402,7 +402,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
 
         for (i=0; i<p.state_count; i++) {
                 if (p.states[i].control != p.states[i].status) {
-                        dprintk("Different control (%x) and status values (%x)\n",
+                        dprintk("Different control (%llu) and status values (%llu)\n",
                                 p.states[i].control, p.states[i].status);
                         result = -EINVAL;
                         goto err_unreg;
@@ -415,7 +415,7 @@ static int centrino_cpu_init_acpi(struct cpufreq_policy *policy)
                 }
 
                 if (p.states[i].core_frequency > p.states[0].core_frequency) {
-                        dprintk("P%u has larger frequency (%u) than P0 (%u), skipping\n", i,
+                        dprintk("P%u has larger frequency (%llu) than P0 (%llu), skipping\n", i,
                                 p.states[i].core_frequency, p.states[0].core_frequency);
                         p.states[i].core_frequency = 0;
                         continue;
@@ -498,13 +498,6 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
         if (cpu->x86_vendor != X86_VENDOR_INTEL || !cpu_has(cpu, X86_FEATURE_EST))
                 return -ENODEV;
 
-        for (i = 0; i < N_IDS; i++)
-                if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
-                        break;
-
-        if (i != N_IDS)
-                centrino_cpu[policy->cpu] = &cpu_ids[i];
-
         if (is_const_loops_cpu(policy->cpu)) {
                 centrino_driver.flags |= CPUFREQ_CONST_LOOPS;
         }
@@ -513,6 +506,13 @@ static int centrino_cpu_init(struct cpufreq_policy *policy)
                 if (policy->cpu != 0)
                         return -ENODEV;
 
+                for (i = 0; i < N_IDS; i++)
+                        if (centrino_verify_cpu_id(cpu, &cpu_ids[i]))
+                                break;
+
+                if (i != N_IDS)
+                        centrino_cpu[policy->cpu] = &cpu_ids[i];
+
                 if (!centrino_cpu[policy->cpu]) {
                         dprintk(KERN_INFO PFX "found unsupported CPU with "
                         "Enhanced SpeedStep: send /proc/cpuinfo to "
diff --git a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
index b25fb6b635ae..2718fb6f6aba 100644
--- a/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
+++ b/arch/i386/kernel/cpu/cpufreq/speedstep-smi.c
@@ -99,7 +99,7 @@ static int speedstep_smi_get_freqs (unsigned int *low, unsigned int *high)
         u32 function = GET_SPEEDSTEP_FREQS;
 
         if (!(ist_info.event & 0xFFFF)) {
-                dprintk("bug #1422 -- can't read freqs from BIOS\n", result);
+                dprintk("bug #1422 -- can't read freqs from BIOS\n");
                 return -ENODEV;
         }
 
diff --git a/arch/i386/kernel/dmi_scan.c b/arch/i386/kernel/dmi_scan.c
index a3cdf894302b..58516e2ac172 100644
--- a/arch/i386/kernel/dmi_scan.c
+++ b/arch/i386/kernel/dmi_scan.c
@@ -6,32 +6,28 @@
 #include <linux/bootmem.h>
 
 
-struct dmi_header {
-        u8 type;
-        u8 length;
-        u16 handle;
-};
-
-#undef DMI_DEBUG
-
-#ifdef DMI_DEBUG
-#define dmi_printk(x) printk x
-#else
-#define dmi_printk(x)
-#endif
-
 static char * __init dmi_string(struct dmi_header *dm, u8 s)
 {
         u8 *bp = ((u8 *) dm) + dm->length;
+        char *str = "";
 
-        if (!s)
-                return "";
-        s--;
-        while (s > 0 && *bp) {
-                bp += strlen(bp) + 1;
+        if (s) {
                 s--;
-        }
-        return bp;
+                while (s > 0 && *bp) {
+                        bp += strlen(bp) + 1;
+                        s--;
+                }
+
+                if (*bp != 0) {
+                        str = alloc_bootmem(strlen(bp) + 1);
+                        if (str != NULL)
+                                strcpy(str, bp);
+                        else
+                                printk(KERN_ERR "dmi_string: out of memory.\n");
+                }
+        }
+
+        return str;
 }
 
 /*
@@ -84,69 +80,76 @@ static int __init dmi_checksum(u8 *buf)
         return sum == 0;
 }
 
-static int __init dmi_iterate(void (*decode)(struct dmi_header *))
+static char *dmi_ident[DMI_STRING_MAX];
+static LIST_HEAD(dmi_devices);
+
+/*
+ *      Save a DMI string
+ */
+static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string)
 {
-        u8 buf[15];
-        char __iomem *p, *q;
+        char *p, *d = (char*) dm;
 
-        /*
-         * no iounmap() for that ioremap(); it would be a no-op, but it's
-         * so early in setup that sucker gets confused into doing what
-         * it shouldn't if we actually call it.
-         */
-        p = ioremap(0xF0000, 0x10000);
+        if (dmi_ident[slot])
+                return;
+
+        p = dmi_string(dm, d[string]);
         if (p == NULL)
-                return -1;
+                return;
 
-        for (q = p; q < p + 0x10000; q += 16) {
-                memcpy_fromio(buf, q, 15);
-                if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
-                        u16 num = (buf[13] << 8) | buf[12];
-                        u16 len = (buf[7] << 8) | buf[6];
-                        u32 base = (buf[11] << 24) | (buf[10] << 16) |
-                                   (buf[9] << 8) | buf[8];
+        dmi_ident[slot] = p;
+}
 
-                        /*
-                         * DMI version 0.0 means that the real version is taken from
-                         * the SMBIOS version, which we don't know at this point.
-                         */
-                        if (buf[14] != 0)
-                                printk(KERN_INFO "DMI %d.%d present.\n",
-                                        buf[14] >> 4, buf[14] & 0xF);
-                        else
-                                printk(KERN_INFO "DMI present.\n");
+static void __init dmi_save_devices(struct dmi_header *dm)
+{
+        int i, count = (dm->length - sizeof(struct dmi_header)) / 2;
+        struct dmi_device *dev;
+
+        for (i = 0; i < count; i++) {
+                char *d = ((char *) dm) + (i * 2);
 
-                        dmi_printk((KERN_INFO "%d structures occupying %d bytes.\n",
-                                num, len));
-                        dmi_printk((KERN_INFO "DMI table at 0x%08X.\n", base));
+                /* Skip disabled device */
+                if ((*d & 0x80) == 0)
+                        continue;
 
-                        if (dmi_table(base,len, num, decode) == 0)
-                                return 0;
+                dev = alloc_bootmem(sizeof(*dev));
+                if (!dev) {
+                        printk(KERN_ERR "dmi_save_devices: out of memory.\n");
+                        break;
                 }
+
+                dev->type = *d++ & 0x7f;
+                dev->name = dmi_string(dm, *d);
+                dev->device_data = NULL;
+
+                list_add(&dev->list, &dmi_devices);
         }
-        return -1;
 }
 
-static char *dmi_ident[DMI_STRING_MAX];
-
-/*
- *      Save a DMI string
- */
-static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string)
+static void __init dmi_save_ipmi_device(struct dmi_header *dm)
 {
-        char *d = (char*)dm;
-        char *p = dmi_string(dm, d[string]);
+        struct dmi_device *dev;
+        void * data;
 
-        if (p == NULL || *p == 0)
+        data = alloc_bootmem(dm->length);
+        if (data == NULL) {
+                printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
                 return;
-        if (dmi_ident[slot])
+        }
+
+        memcpy(data, dm, dm->length);
+
+        dev = alloc_bootmem(sizeof(*dev));
+        if (!dev) {
+                printk(KERN_ERR "dmi_save_ipmi_device: out of memory.\n");
                 return;
+        }
 
-        dmi_ident[slot] = alloc_bootmem(strlen(p) + 1);
-        if(dmi_ident[slot])
-                strcpy(dmi_ident[slot], p);
-        else
-                printk(KERN_ERR "dmi_save_ident: out of memory.\n");
+        dev->type = DMI_DEV_TYPE_IPMI;
+        dev->name = "IPMI controller";
+        dev->device_data = data;
+
+        list_add(&dev->list, &dmi_devices);
 }
 
 /*
@@ -156,42 +159,69 @@ static void __init dmi_save_ident(struct dmi_header *dm, int slot, int string)
  */
 static void __init dmi_decode(struct dmi_header *dm)
 {
-        u8 *data __attribute__((__unused__)) = (u8 *)dm;
-        
         switch(dm->type) {
-        case  0:
-                dmi_printk(("BIOS Vendor: %s\n", dmi_string(dm, data[4])));
+        case 0:         /* BIOS Information */
                 dmi_save_ident(dm, DMI_BIOS_VENDOR, 4);
-                dmi_printk(("BIOS Version: %s\n", dmi_string(dm, data[5])));
                 dmi_save_ident(dm, DMI_BIOS_VERSION, 5);
-                dmi_printk(("BIOS Release: %s\n", dmi_string(dm, data[8])));
                 dmi_save_ident(dm, DMI_BIOS_DATE, 8);
                 break;
-        case 1:
-                dmi_printk(("System Vendor: %s\n", dmi_string(dm, data[4])));
+        case 1:         /* System Information */
                 dmi_save_ident(dm, DMI_SYS_VENDOR, 4);
-                dmi_printk(("Product Name: %s\n", dmi_string(dm, data[5])));
                 dmi_save_ident(dm, DMI_PRODUCT_NAME, 5);
-                dmi_printk(("Version: %s\n", dmi_string(dm, data[6])));
                 dmi_save_ident(dm, DMI_PRODUCT_VERSION, 6);
-                dmi_printk(("Serial Number: %s\n", dmi_string(dm, data[7])));
                 dmi_save_ident(dm, DMI_PRODUCT_SERIAL, 7);
                 break;
-        case 2:
-                dmi_printk(("Board Vendor: %s\n", dmi_string(dm, data[4])));
+        case 2:         /* Base Board Information */
                 dmi_save_ident(dm, DMI_BOARD_VENDOR, 4);
-                dmi_printk(("Board Name: %s\n", dmi_string(dm, data[5])));
                 dmi_save_ident(dm, DMI_BOARD_NAME, 5);
-                dmi_printk(("Board Version: %s\n", dmi_string(dm, data[6])));
                 dmi_save_ident(dm, DMI_BOARD_VERSION, 6);
                 break;
+        case 10:        /* Onboard Devices Information */
+                dmi_save_devices(dm);
+                break;
+        case 38:        /* IPMI Device Information */
+                dmi_save_ipmi_device(dm);
         }
 }
 
 void __init dmi_scan_machine(void)
 {
-        if (dmi_iterate(dmi_decode))
-                printk(KERN_INFO "DMI not present.\n");
+        u8 buf[15];
+        char __iomem *p, *q;
+
+        /*
+         * no iounmap() for that ioremap(); it would be a no-op, but it's
+         * so early in setup that sucker gets confused into doing what
+         * it shouldn't if we actually call it.
+         */
+        p = ioremap(0xF0000, 0x10000);
+        if (p == NULL)
+                goto out;
+
+        for (q = p; q < p + 0x10000; q += 16) {
+                memcpy_fromio(buf, q, 15);
+                if ((memcmp(buf, "_DMI_", 5) == 0) && dmi_checksum(buf)) {
+                        u16 num = (buf[13] << 8) | buf[12];
+                        u16 len = (buf[7] << 8) | buf[6];
+                        u32 base = (buf[11] << 24) | (buf[10] << 16) |
+                                   (buf[9] << 8) | buf[8];
+
+                        /*
+                         * DMI version 0.0 means that the real version is taken from
+                         * the SMBIOS version, which we don't know at this point.
+                         */
+                        if (buf[14] != 0)
+                                printk(KERN_INFO "DMI %d.%d present.\n",
+                                        buf[14] >> 4, buf[14] & 0xF);
+                        else
+                                printk(KERN_INFO "DMI present.\n");
+
+                        if (dmi_table(base,len, num, dmi_decode) == 0)
+                                return;
+                }
+        }
+
+out:    printk(KERN_INFO "DMI not present.\n");
 }
 
 
@@ -218,9 +248,9 @@ int dmi_check_system(struct dmi_system_id *list)
                         /* No match */
                         goto fail;
                 }
+                count++;
                 if (d->callback && d->callback(d))
                         break;
-                count++;
 fail:           d++;
         }
 
@@ -240,3 +270,32 @@ char *dmi_get_system_info(int field)
         return dmi_ident[field];
 }
 EXPORT_SYMBOL(dmi_get_system_info);
+
+/**
+ *      dmi_find_device - find onboard device by type/name
+ *      @type: device type or %DMI_DEV_TYPE_ANY to match all device types
+ *      @desc: device name string or %NULL to match all
+ *      @from: previous device found in search, or %NULL for new search.
+ *
+ *      Iterates through the list of known onboard devices. If a device is
+ *      found with a matching @vendor and @device, a pointer to its device
+ *      structure is returned.  Otherwise, %NULL is returned.
+ *      A new search is initiated by passing %NULL to the @from argument.
+ *      If @from is not %NULL, searches continue from next device.
+ */
+struct dmi_device * dmi_find_device(int type, const char *name,
+                                    struct dmi_device *from)
+{
+        struct list_head *d, *head = from ? &from->list : &dmi_devices;
+
+        for(d = head->next; d != &dmi_devices; d = d->next) {
+                struct dmi_device *dev = list_entry(d, struct dmi_device, list);
+
+                if (((type == DMI_DEV_TYPE_ANY) || (dev->type == type)) &&
+                    ((name == NULL) || (strcmp(dev->name, name) == 0)))
+                        return dev;
+        }
+
+        return NULL;
+}
+EXPORT_SYMBOL(dmi_find_device);
diff --git a/arch/i386/kernel/entry.S b/arch/i386/kernel/entry.S
index abb909793efc..3aad03839660 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -507,7 +507,7 @@ label:						\
         pushl $__KERNEL_CS;                     \
         pushl $sysenter_past_esp
 
-ENTRY(debug)
+KPROBE_ENTRY(debug)
         cmpl $sysenter_entry,(%esp)
         jne debug_stack_correct
         FIX_STACK(12, debug_stack_correct, debug_esp_fix_insn)
@@ -518,7 +518,7 @@ debug_stack_correct:
         movl %esp,%eax                  # pt_regs pointer
         call do_debug
         jmp ret_from_exception
-
+        .previous .text
 /*
  * NMI is doubly nasty. It can happen _while_ we're handling
  * a debug fault, and the debug fault hasn't yet been able to
@@ -591,13 +591,14 @@ nmi_16bit_stack:
         .long 1b,iret_exc
 .previous
 
-ENTRY(int3)
+KPROBE_ENTRY(int3)
         pushl $-1                       # mark this as an int
         SAVE_ALL
         xorl %edx,%edx          # zero error code
         movl %esp,%eax          # pt_regs pointer
         call do_int3
         jmp ret_from_exception
+        .previous .text
 
 ENTRY(overflow)
         pushl $0
@@ -631,17 +632,19 @@ ENTRY(stack_segment)
         pushl $do_stack_segment
         jmp error_code
 
-ENTRY(general_protection)
+KPROBE_ENTRY(general_protection)
         pushl $do_general_protection
         jmp error_code
+        .previous .text
 
 ENTRY(alignment_check)
         pushl $do_alignment_check
         jmp error_code
 
-ENTRY(page_fault)
+KPROBE_ENTRY(page_fault)
         pushl $do_page_fault
         jmp error_code
+        .previous .text
 
 #ifdef CONFIG_X86_MCE
 ENTRY(machine_check)
diff --git a/arch/i386/kernel/head.S b/arch/i386/kernel/head.S
index 0480ca9e9e57..e437fb367498 100644
--- a/arch/i386/kernel/head.S
+++ b/arch/i386/kernel/head.S
@@ -17,7 +17,7 @@
 #include <asm/desc.h>
 #include <asm/cache.h>
 #include <asm/thread_info.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/setup.h>
 
 /*
diff --git a/arch/i386/kernel/io_apic.c b/arch/i386/kernel/io_apic.c
index 6578f40bd501..35d3ce26a544 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -33,6 +33,7 @@
 #include <linux/acpi.h>
 #include <linux/module.h>
 #include <linux/sysdev.h>
+
 #include <asm/io.h>
 #include <asm/smp.h>
 #include <asm/desc.h>
@@ -77,7 +78,7 @@ static struct irq_pin_list {
         int apic, pin, next;
 } irq_2_pin[PIN_MAP_SIZE];
 
-int vector_irq[NR_VECTORS] = { [0 ... NR_VECTORS - 1] = -1};
+int vector_irq[NR_VECTORS] __read_mostly = { [0 ... NR_VECTORS - 1] = -1};
 #ifdef CONFIG_PCI_MSI
 #define vector_to_irq(vector)   \
         (platform_legacy_irq(vector) ? vector : vector_irq[vector])
@@ -222,13 +223,21 @@ static void clear_IO_APIC (void)
                         clear_IO_APIC_pin(apic, pin);
 }
 
+#ifdef CONFIG_SMP
 static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
 {
         unsigned long flags;
         int pin;
         struct irq_pin_list *entry = irq_2_pin + irq;
         unsigned int apicid_value;
+        cpumask_t tmp;
         
+        cpus_and(tmp, cpumask, cpu_online_map);
+        if (cpus_empty(tmp))
+                tmp = TARGET_CPUS;
+
+        cpus_and(cpumask, tmp, CPU_MASK_ALL);
+
         apicid_value = cpu_mask_to_apicid(cpumask);
         /* Prepare to do the io_apic_write */
         apicid_value = apicid_value << 24;
@@ -242,6 +251,7 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
                         break;
                 entry = irq_2_pin + entry->next;
         }
+        set_irq_info(irq, cpumask);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 }
 
@@ -259,7 +269,6 @@ static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t cpumask)
 #  define Dprintk(x...) 
 # endif
 
-cpumask_t __cacheline_aligned pending_irq_balance_cpumask[NR_IRQS];
 
 #define IRQBALANCE_CHECK_ARCH -999
 static int irqbalance_disabled = IRQBALANCE_CHECK_ARCH;
@@ -328,12 +337,7 @@ static inline void balance_irq(int cpu, int irq)
         cpus_and(allowed_mask, cpu_online_map, irq_affinity[irq]);
         new_cpu = move(cpu, allowed_mask, now, 1);
         if (cpu != new_cpu) {
-                irq_desc_t *desc = irq_desc + irq;
-                unsigned long flags;
-
-                spin_lock_irqsave(&desc->lock, flags);
-                pending_irq_balance_cpumask[irq] = cpumask_of_cpu(new_cpu);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                set_pending_irq(irq, cpumask_of_cpu(new_cpu));
         }
 }
 
@@ -528,16 +532,12 @@ tryanotherirq:
         cpus_and(tmp, target_cpu_mask, allowed_mask);
 
         if (!cpus_empty(tmp)) {
-                irq_desc_t *desc = irq_desc + selected_irq;
-                unsigned long flags;
 
                 Dprintk("irq = %d moved to cpu = %d\n",
                                 selected_irq, min_loaded);
                 /* mark for change destination */
-                spin_lock_irqsave(&desc->lock, flags);
-                pending_irq_balance_cpumask[selected_irq] =
-                                        cpumask_of_cpu(min_loaded);
-                spin_unlock_irqrestore(&desc->lock, flags);
+                set_pending_irq(selected_irq, cpumask_of_cpu(min_loaded));
+
                 /* Since we made a change, come back sooner to 
                  * check for more variation.
                  */
@@ -568,12 +568,12 @@ static int balanced_irq(void *unused)
         
         /* push everything to CPU 0 to give us a starting point.  */
         for (i = 0 ; i < NR_IRQS ; i++) {
-                pending_irq_balance_cpumask[i] = cpumask_of_cpu(0);
+                pending_irq_cpumask[i] = cpumask_of_cpu(0);
+                set_pending_irq(i, cpumask_of_cpu(0));
         }
 
         for ( ; ; ) {
-                set_current_state(TASK_INTERRUPTIBLE);
-                time_remaining = schedule_timeout(time_remaining);
+                time_remaining = schedule_timeout_interruptible(time_remaining);
                 try_to_freeze();
                 if (time_after(jiffies,
                                 prev_balance_time+balanced_irq_interval)) {
@@ -647,20 +647,9 @@ int __init irqbalance_disable(char *str)
 
 __setup("noirqbalance", irqbalance_disable);
 
-static inline void move_irq(int irq)
-{
-        /* note - we hold the desc->lock */
-        if (unlikely(!cpus_empty(pending_irq_balance_cpumask[irq]))) {
-                set_ioapic_affinity_irq(irq, pending_irq_balance_cpumask[irq]);
-                cpus_clear(pending_irq_balance_cpumask[irq]);
-        }
-}
-
 late_initcall(balanced_irq_init);
-
-#else /* !CONFIG_IRQBALANCE */
-static inline void move_irq(int irq) { }
 #endif /* CONFIG_IRQBALANCE */
+#endif /* CONFIG_SMP */
 
 #ifndef CONFIG_SMP
 void fastcall send_IPI_self(int vector)
@@ -820,6 +809,7 @@ EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
  * we need to reprogram the ioredtbls to cater for the cpus which have come online
  * so mask in all cases should simply be TARGET_CPUS
  */
+#ifdef CONFIG_SMP
 void __init setup_ioapic_dest(void)
 {
         int pin, ioapic, irq, irq_entry;
@@ -838,6 +828,7 @@ void __init setup_ioapic_dest(void)
 
         }
 }
+#endif
 
 /*
  * EISA Edge/Level control register, ELCR
@@ -1127,7 +1118,7 @@ static inline int IO_APIC_irq_trigger(int irq)
 }
 
 /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
-u8 irq_vector[NR_IRQ_VECTORS] = { FIRST_DEVICE_VECTOR , 0 };
+u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };
 
 int assign_irq_vector(int irq)
 {
@@ -1249,6 +1240,7 @@ static void __init setup_IO_APIC_irqs(void)
                 spin_lock_irqsave(&ioapic_lock, flags);
                 io_apic_write(apic, 0x11+2*pin, *(((int *)&entry)+1));
                 io_apic_write(apic, 0x10+2*pin, *(((int *)&entry)+0));
+                set_native_irq_info(irq, TARGET_CPUS);
                 spin_unlock_irqrestore(&ioapic_lock, flags);
         }
         }
@@ -1641,9 +1633,9 @@ void disable_IO_APIC(void)
         clear_IO_APIC();
 
         /*
-         * If the i82559 is routed through an IOAPIC
+         * If the i8259 is routed through an IOAPIC
          * Put that IOAPIC in virtual wire mode
-         * so legacy interrups can be delivered.
+         * so legacy interrupts can be delivered.
          */
         pin = find_isa_irq_pin(0, mp_ExtINT);
         if (pin != -1) {
@@ -1944,6 +1936,7 @@ static void ack_edge_ioapic_vector(unsigned int vector)
 {
         int irq = vector_to_irq(vector);
 
+        move_irq(vector);
         ack_edge_ioapic_irq(irq);
 }
 
@@ -1958,6 +1951,7 @@ static void end_level_ioapic_vector (unsigned int vector)
 {
         int irq = vector_to_irq(vector);
 
+        move_irq(vector);
         end_level_ioapic_irq(irq);
 }
 
@@ -1975,14 +1969,17 @@ static void unmask_IO_APIC_vector (unsigned int vector)
         unmask_IO_APIC_irq(irq);
 }
 
+#ifdef CONFIG_SMP
 static void set_ioapic_affinity_vector (unsigned int vector,
                                         cpumask_t cpu_mask)
 {
         int irq = vector_to_irq(vector);
 
+        set_native_irq_info(vector, cpu_mask);
         set_ioapic_affinity_irq(irq, cpu_mask);
 }
 #endif
+#endif
 
 /*
  * Level and edge triggered IO-APIC interrupts need different handling,
@@ -1992,7 +1989,7 @@ static void set_ioapic_affinity_vector (unsigned int vector,
  * edge-triggered handler, without risking IRQ storms and other ugly
  * races.
  */
-static struct hw_interrupt_type ioapic_edge_type = {
+static struct hw_interrupt_type ioapic_edge_type __read_mostly = {
         .typename       = "IO-APIC-edge",
         .startup        = startup_edge_ioapic,
         .shutdown       = shutdown_edge_ioapic,
@@ -2000,10 +1997,12 @@ static struct hw_interrupt_type ioapic_edge_type = {
         .disable        = disable_edge_ioapic,
         .ack            = ack_edge_ioapic,
         .end            = end_edge_ioapic,
+#ifdef CONFIG_SMP
         .set_affinity   = set_ioapic_affinity,
+#endif
 };
 
-static struct hw_interrupt_type ioapic_level_type = {
+static struct hw_interrupt_type ioapic_level_type __read_mostly = {
         .typename       = "IO-APIC-level",
         .startup        = startup_level_ioapic,
         .shutdown       = shutdown_level_ioapic,
@@ -2011,7 +2010,9 @@ static struct hw_interrupt_type ioapic_level_type = {
         .disable        = disable_level_ioapic,
         .ack            = mask_and_ack_level_ioapic,
         .end            = end_level_ioapic,
+#ifdef CONFIG_SMP
         .set_affinity   = set_ioapic_affinity,
+#endif
 };
 
 static inline void init_IO_APIC_traps(void)
@@ -2074,7 +2075,7 @@ static void ack_lapic_irq (unsigned int irq)
 
 static void end_lapic_irq (unsigned int i) { /* nothing */ }
 
-static struct hw_interrupt_type lapic_irq_type = {
+static struct hw_interrupt_type lapic_irq_type __read_mostly = {
         .typename       = "local-APIC-edge",
         .startup        = NULL, /* startup_irq() not used for IRQ0 */
         .shutdown       = NULL, /* shutdown_irq() not used for IRQ0 */
@@ -2421,7 +2422,7 @@ device_initcall(ioapic_init_sysfs);
                           ACPI-based IOAPIC Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 int __init io_apic_get_unique_id (int ioapic, int apic_id)
 {
@@ -2569,9 +2570,10 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         spin_lock_irqsave(&ioapic_lock, flags);
         io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1));
         io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0));
+        set_native_irq_info(use_pci_vector() ? entry.vector : irq, TARGET_CPUS);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 
         return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
diff --git a/arch/i386/kernel/kprobes.c b/arch/i386/kernel/kprobes.c
index a6d8c45961d3..6345b430b105 100644
--- a/arch/i386/kernel/kprobes.c
+++ b/arch/i386/kernel/kprobes.c
@@ -62,32 +62,32 @@ static inline int is_IF_modifier(kprobe_opcode_t opcode)
         return 0;
 }
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         return 0;
 }
 
-void arch_copy_kprobe(struct kprobe *p)
+void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
         memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
         p->opcode = *p->addr;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         *p->addr = BREAKPOINT_INSTRUCTION;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         *p->addr = p->opcode;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
 }
 
@@ -127,7 +127,8 @@ static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
                 regs->eip = (unsigned long)&p->ainsn.insn;
 }
 
-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+                                      struct pt_regs *regs)
 {
         unsigned long *sara = (unsigned long *)&regs->esp;
         struct kretprobe_instance *ri;
@@ -150,7 +151,7 @@ void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
  * Interrupts are disabled on entry as trap3 is an interrupt gate and they
  * remain disabled thorough out this function.
  */
-static int kprobe_handler(struct pt_regs *regs)
+static int __kprobes kprobe_handler(struct pt_regs *regs)
 {
         struct kprobe *p;
         int ret = 0;
@@ -176,7 +177,8 @@ static int kprobe_handler(struct pt_regs *regs)
                    Disarm the probe we just hit, and ignore it. */
                 p = get_kprobe(addr);
                 if (p) {
-                        if (kprobe_status == KPROBE_HIT_SS) {
+                        if (kprobe_status == KPROBE_HIT_SS &&
+                                *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
                                 regs->eflags &= ~TF_MASK;
                                 regs->eflags |= kprobe_saved_eflags;
                                 unlock_kprobes();
@@ -220,7 +222,10 @@ static int kprobe_handler(struct pt_regs *regs)
                          * either a probepoint or a debugger breakpoint
                          * at this address.  In either case, no further
                          * handling of this interrupt is appropriate.
+                         * Back up over the (now missing) int3 and run
+                         * the original instruction.
                          */
+                        regs->eip -= sizeof(kprobe_opcode_t);
                         ret = 1;
                 }
                 /* Not one of ours: let kernel handle it */
@@ -259,7 +264,7 @@ no_kprobe:
 /*
  * Called when we hit the probe point at kretprobe_trampoline
  */
-int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head;
@@ -338,7 +343,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
  * that is atop the stack is the address following the copied instruction.
  * We need to make it the address following the original instruction.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         unsigned long *tos = (unsigned long *)&regs->esp;
         unsigned long next_eip = 0;
@@ -444,8 +449,8 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 /*
  * Wrapper routine to for handling exceptions.
  */
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         switch (val) {
@@ -473,7 +478,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         return NOTIFY_DONE;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
         unsigned long addr;
@@ -495,7 +500,7 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void jprobe_return(void)
+void __kprobes jprobe_return(void)
 {
         preempt_enable_no_resched();
         asm volatile ("       xchgl   %%ebx,%%esp     \n"
@@ -506,7 +511,7 @@ void jprobe_return(void)
                       (jprobe_saved_esp):"memory");
 }
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         u8 *addr = (u8 *) (regs->eip - 1);
         unsigned long stack_addr = (unsigned long)jprobe_saved_esp;
diff --git a/arch/i386/kernel/mpparse.c b/arch/i386/kernel/mpparse.c
index 5d0b9a8fc43d..15949fd08109 100644
--- a/arch/i386/kernel/mpparse.c
+++ b/arch/i386/kernel/mpparse.c
@@ -122,8 +122,8 @@ static int MP_valid_apicid(int apicid, int version)
 
 static void __init MP_processor_info (struct mpc_config_processor *m)
 {
-        int ver, apicid, cpu, found_bsp = 0;
-        physid_mask_t tmp;
+        int ver, apicid;
+        physid_mask_t phys_cpu;
         
         if (!(m->mpc_cpuflag & CPU_ENABLED))
                 return;
@@ -181,7 +181,6 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
         if (m->mpc_cpuflag & CPU_BOOTPROCESSOR) {
                 Dprintk("    Bootup CPU\n");
                 boot_cpu_physical_apicid = m->mpc_apicid;
-                found_bsp = 1;
         }
 
         if (num_processors >= NR_CPUS) {
@@ -195,29 +194,26 @@ static void __init MP_processor_info (struct mpc_config_processor *m)
                         " Processor ignored.\n", maxcpus); 
                 return;
         }
-        num_processors++;
         ver = m->mpc_apicver;
 
         if (!MP_valid_apicid(apicid, ver)) {
                 printk(KERN_WARNING "Processor #%d INVALID. (Max ID: %d).\n",
                         m->mpc_apicid, MAX_APICS);
-                --num_processors;
                 return;
         }
 
-        if (found_bsp)
-                cpu = 0;
-        else
-                cpu = num_processors - 1;
-        cpu_set(cpu, cpu_possible_map);
-        tmp = apicid_to_cpu_present(apicid);
-        physids_or(phys_cpu_present_map, phys_cpu_present_map, tmp);
-        
+        cpu_set(num_processors, cpu_possible_map);
+        num_processors++;
+        phys_cpu = apicid_to_cpu_present(apicid);
+        physids_or(phys_cpu_present_map, phys_cpu_present_map, phys_cpu);
+
         /*
          * Validate version
          */
         if (ver == 0x0) {
-                printk(KERN_WARNING "BIOS bug, APIC version is 0 for CPU#%d! fixing up to 0x10. (tell your hw vendor)\n", m->mpc_apicid);
+                printk(KERN_WARNING "BIOS bug, APIC version is 0 for CPU#%d! "
+                                "fixing up to 0x10. (tell your hw vendor)\n",
+                                m->mpc_apicid);
                 ver = 0x10;
         }
         apic_version[m->mpc_apicid] = ver;
@@ -668,8 +664,6 @@ void __init get_smp_config (void)
         struct intel_mp_floating *mpf = mpf_found;
 
         /*
-         * ACPI may be used to obtain the entire SMP configuration or just to 
-         * enumerate/configure processors (CONFIG_ACPI_BOOT).  Note that 
          * ACPI supports both logical (e.g. Hyper-Threading) and physical 
          * processors, where MPS only supports physical.
          */
@@ -825,7 +819,7 @@ void __init find_smp_config (void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 void __init mp_register_lapic_address (
         u64                     address)
@@ -871,7 +865,7 @@ void __init mp_register_lapic (
         MP_processor_info(&processor);
 }
 
-#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT))
+#ifdef  CONFIG_X86_IO_APIC
 
 #define MP_ISA_BUS              0
 #define MP_MAX_IOAPIC_PIN       127
@@ -1086,11 +1080,9 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
          */
         static int              gsi_to_irq[MAX_GSI_NUM];
 
-#ifdef CONFIG_ACPI_BUS
         /* Don't set up the ACPI SCI because it's already set up */
         if (acpi_fadt.sci_int == gsi)
                 return gsi;
-#endif
 
         ioapic = mp_find_ioapic(gsi);
         if (ioapic < 0) {
@@ -1133,13 +1125,11 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
                 if (gsi < MAX_GSI_NUM) {
                         if (gsi > 15)
                                 gsi = pci_irq++;
-#ifdef CONFIG_ACPI_BUS
                         /*
                          * Don't assign IRQ used by ACPI SCI
                          */
                         if (gsi == acpi_fadt.sci_int)
                                 gsi = pci_irq++;
-#endif
                         gsi_to_irq[irq] = gsi;
                 } else {
                         printk(KERN_ERR "GSI %u is too high\n", gsi);
@@ -1153,5 +1143,5 @@ int mp_register_gsi (u32 gsi, int edge_level, int active_high_low)
         return gsi;
 }
 
-#endif /*CONFIG_X86_IO_APIC && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)*/
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_X86_IO_APIC */
+#endif /* CONFIG_ACPI */
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index 8bbdbda07a2d..0178457db721 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -478,6 +478,11 @@ void touch_nmi_watchdog (void)
          */
         for (i = 0; i < NR_CPUS; i++)
                 alert_counter[i] = 0;
+
+        /*
+         * Tickle the softlockup detector too:
+         */
+        touch_softlockup_watchdog();
 }
 
 extern void die_nmi(struct pt_regs *, const char *msg);
diff --git a/arch/i386/kernel/ptrace.c b/arch/i386/kernel/ptrace.c
index 340980203b09..7b6368bf8974 100644
--- a/arch/i386/kernel/ptrace.c
+++ b/arch/i386/kernel/ptrace.c
@@ -694,17 +694,22 @@ void send_sigtrap(struct task_struct *tsk, struct pt_regs *regs, int error_code)
 __attribute__((regparm(3)))
 int do_syscall_trace(struct pt_regs *regs, int entryexit)
 {
-        int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU), ret = 0;
-        /* With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall
-         * interception. */
+        int is_sysemu = test_thread_flag(TIF_SYSCALL_EMU);
+        /*
+         * With TIF_SYSCALL_EMU set we want to ignore TIF_SINGLESTEP for syscall
+         * interception
+         */
         int is_singlestep = !is_sysemu && test_thread_flag(TIF_SINGLESTEP);
+        int ret = 0;
 
         /* do the secure computing check first */
-        secure_computing(regs->orig_eax);
+        if (!entryexit)
+                secure_computing(regs->orig_eax);
 
         if (unlikely(current->audit_context)) {
                 if (entryexit)
-                        audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax);
+                        audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+                                                regs->eax);
                 /* Debug traps, when using PTRACE_SINGLESTEP, must be sent only
                  * on the syscall exit path. Normally, when TIF_SYSCALL_AUDIT is
                  * not used, entry.S will call us only on syscall exit, not
@@ -738,7 +743,7 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
         /* the 0x80 provides a way for the tracing parent to distinguish
            between a syscall stop and SIGTRAP delivery */
         /* Note that the debugger could change the result of test_thread_flag!*/
-        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80 : 0));
+        ptrace_notify(SIGTRAP | ((current->ptrace & PT_TRACESYSGOOD) ? 0x80:0));
 
         /*
          * this isn't the same as continuing with a signal, but it will do
@@ -750,7 +755,7 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
                 current->exit_code = 0;
         }
         ret = is_sysemu;
- out:
+out:
         if (unlikely(current->audit_context) && !entryexit)
                 audit_syscall_entry(current, AUDIT_ARCH_I386, regs->orig_eax,
                                     regs->ebx, regs->ecx, regs->edx, regs->esi);
@@ -759,6 +764,7 @@ int do_syscall_trace(struct pt_regs *regs, int entryexit)
 
         regs->orig_eax = -1; /* force skip of syscall restarting */
         if (unlikely(current->audit_context))
-                audit_syscall_exit(current, AUDITSC_RESULT(regs->eax), regs->eax);
+                audit_syscall_exit(current, AUDITSC_RESULT(regs->eax),
+                                regs->eax);
         return 1;
 }
diff --git a/arch/i386/kernel/setup.c b/arch/i386/kernel/setup.c
index 294bcca985ab..f3d808451d25 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -82,19 +82,19 @@ EXPORT_SYMBOL(efi_enabled);
 /* cpu data as detected by the assembly code in head.S */
 struct cpuinfo_x86 new_cpu_data __initdata = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
 /* common cpu data for all cpus */
-struct cpuinfo_x86 boot_cpu_data = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
+struct cpuinfo_x86 boot_cpu_data __read_mostly = { 0, 0, 0, 0, -1, 1, 0, 0, -1 };
 EXPORT_SYMBOL(boot_cpu_data);
 
 unsigned long mmu_cr4_features;
 
-#ifdef  CONFIG_ACPI_INTERPRETER
+#ifdef  CONFIG_ACPI
         int acpi_disabled = 0;
 #else
         int acpi_disabled = 1;
 #endif
 EXPORT_SYMBOL(acpi_disabled);
 
-#ifdef  CONFIG_ACPI_BOOT
+#ifdef  CONFIG_ACPI
 int __initdata acpi_force = 0;
 extern acpi_interrupt_flags     acpi_sci_flags;
 #endif
@@ -139,6 +139,7 @@ struct sys_desc_table_struct {
         unsigned char table[0];
 };
 struct edid_info edid_info;
+EXPORT_SYMBOL_GPL(edid_info);
 struct ist_info ist_info;
 #if defined(CONFIG_X86_SPEEDSTEP_SMI) || \
         defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
@@ -798,7 +799,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                 }
 #endif
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
                 /* "acpi=off" disables both ACPI table parsing and interpreter */
                 else if (!memcmp(from, "acpi=off", 8)) {
                         disable_acpi();
@@ -854,7 +855,7 @@ static void __init parse_cmdline_early (char ** cmdline_p)
                 else if (!memcmp(from, "noapic", 6))
                         disable_ioapic_setup();
 #endif /* CONFIG_X86_LOCAL_APIC */
-#endif /* CONFIG_ACPI_BOOT */
+#endif /* CONFIG_ACPI */
 
 #ifdef CONFIG_X86_LOCAL_APIC
                 /* enable local APIC */
@@ -1299,7 +1300,7 @@ legacy_init_iomem_resources(struct resource *code_resource, struct resource *dat
  */
 static void __init register_memory(void)
 {
-        unsigned long gapstart, gapsize;
+        unsigned long gapstart, gapsize, round;
         unsigned long long last;
         int           i;
 
@@ -1344,14 +1345,14 @@ static void __init register_memory(void)
         }
 
         /*
-         * Start allocating dynamic PCI memory a bit into the gap,
-         * aligned up to the nearest megabyte.
-         *
-         * Question: should we try to pad it up a bit (do something
-         * like " + (gapsize >> 3)" in there too?). We now have the
-         * technology.
+         * See how much we want to round up: start off with
+         * rounding to the next 1MB area.
          */
-        pci_mem_start = (gapstart + 0xfffff) & ~0xfffff;
+        round = 0x100000;
+        while ((gapsize >> 4) > round)
+                round += round;
+        /* Fun with two's complement */
+        pci_mem_start = (gapstart + round) & -round;
 
         printk("Allocating PCI resources starting at %08lx (gap: %08lx:%08lx)\n",
                 pci_mem_start, gapstart, gapsize);
@@ -1579,7 +1580,7 @@ void __init setup_arch(char **cmdline_p)
         if (efi_enabled)
                 efi_map_memmap();
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /*
          * Parse the ACPI tables for possible boot-time SMP configuration.
          */
diff --git a/arch/i386/kernel/sigframe.h b/arch/i386/kernel/sigframe.h
index d21b14f5c25c..0b2221711dad 100644
--- a/arch/i386/kernel/sigframe.h
+++ b/arch/i386/kernel/sigframe.h
@@ -1,6 +1,6 @@
 struct sigframe
 {
-        char *pretcode;
+        char __user *pretcode;
         int sig;
         struct sigcontext sc;
         struct _fpstate fpstate;
@@ -10,10 +10,10 @@ struct sigframe
 
 struct rt_sigframe
 {
-        char *pretcode;
+        char __user *pretcode;
         int sig;
-        struct siginfo *pinfo;
-        void *puc;
+        struct siginfo __user *pinfo;
+        void __user *puc;
         struct siginfo info;
         struct ucontext uc;
         struct _fpstate fpstate;
diff --git a/arch/i386/kernel/smpboot.c b/arch/i386/kernel/smpboot.c
index 5e4893d2b9f2..c70cd2a08304 100644
--- a/arch/i386/kernel/smpboot.c
+++ b/arch/i386/kernel/smpboot.c
@@ -1330,8 +1330,7 @@ void __cpu_die(unsigned int cpu)
                         printk ("CPU %d is now offline\n", cpu);
                         return;
                 }
-                current->state = TASK_UNINTERRUPTIBLE;
-                schedule_timeout(HZ/10);
+                msleep(100);
         }
         printk(KERN_ERR "CPU %u didn't die...\n", cpu);
 }
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index 6f794a78ee1e..2883a4d4f01f 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -194,10 +194,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
@@ -252,8 +249,7 @@ EXPORT_SYMBOL(profile_pc);
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id,
-                                        struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
 #ifdef CONFIG_X86_IO_APIC
         if (timer_ack) {
@@ -307,7 +303,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
 
         cur_timer->mark_offset();
  
-        do_timer_interrupt(irq, NULL, regs);
+        do_timer_interrupt(irq, regs);
 
         write_sequnlock(&xtime_lock);
         return IRQ_HANDLED;
@@ -333,8 +329,7 @@ EXPORT_SYMBOL(get_cmos_time);
 
 static void sync_cmos_clock(unsigned long dummy);
 
-static struct timer_list sync_cmos_timer =
-                                      TIMER_INITIALIZER(sync_cmos_clock, 0, 0);
+static DEFINE_TIMER(sync_cmos_timer, sync_cmos_clock, 0, 0);
 
 static void sync_cmos_clock(unsigned long dummy)
 {
@@ -348,7 +343,7 @@ static void sync_cmos_clock(unsigned long dummy)
          * This code is run on a timer.  If the clock is set, that timer
          * may not expire at the correct time.  Thus, we adjust...
          */
-        if ((time_status & STA_UNSYNC) != 0)
+        if (!ntp_synced())
                 /*
                  * Not synced, exit, do not restart a timer (if one is
                  * running, let it run out).
@@ -422,6 +417,7 @@ static int timer_resume(struct sys_device *dev)
                 last_timer->resume();
         cur_timer = last_timer;
         last_timer = NULL;
+        touch_softlockup_watchdog();
         return 0;
 }
 
diff --git a/arch/i386/kernel/timers/timer_hpet.c b/arch/i386/kernel/timers/timer_hpet.c
index 001de97c9e4a..d973a8b681fd 100644
--- a/arch/i386/kernel/timers/timer_hpet.c
+++ b/arch/i386/kernel/timers/timer_hpet.c
@@ -18,8 +18,8 @@
 #include "mach_timer.h"
 #include <asm/hpet.h>
 
-static unsigned long __read_mostly hpet_usec_quotient;  /* convert hpet clks to usec */
-static unsigned long tsc_hpet_quotient;         /* convert tsc to hpet clks */
+static unsigned long hpet_usec_quotient __read_mostly;  /* convert hpet clks to usec */
+static unsigned long tsc_hpet_quotient __read_mostly;   /* convert tsc to hpet clks */
 static unsigned long hpet_last;         /* hpet counter value at last tick*/
 static unsigned long last_tsc_low;      /* lsb 32 bits of Time Stamp Counter */
 static unsigned long last_tsc_high;     /* msb 32 bits of Time Stamp Counter */
diff --git a/arch/i386/kernel/traps.c b/arch/i386/kernel/traps.c
index 54629bb5893a..09a58cb6daa7 100644
--- a/arch/i386/kernel/traps.c
+++ b/arch/i386/kernel/traps.c
@@ -363,8 +363,9 @@ static inline void die_if_kernel(const char * str, struct pt_regs * regs, long e
                 die(str, regs, err);
 }
 
-static void do_trap(int trapnr, int signr, char *str, int vm86,
-                           struct pt_regs * regs, long error_code, siginfo_t *info)
+static void __kprobes do_trap(int trapnr, int signr, char *str, int vm86,
+                              struct pt_regs * regs, long error_code,
+                              siginfo_t *info)
 {
         struct task_struct *tsk = current;
         tsk->thread.error_code = error_code;
@@ -460,7 +461,8 @@ DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
 DO_ERROR_INFO(17, SIGBUS, "alignment check", alignment_check, BUS_ADRALN, 0)
 DO_ERROR_INFO(32, SIGSEGV, "iret exception", iret_error, ILL_BADSTK, 0)
 
-fastcall void do_general_protection(struct pt_regs * regs, long error_code)
+fastcall void __kprobes do_general_protection(struct pt_regs * regs,
+                                              long error_code)
 {
         int cpu = get_cpu();
         struct tss_struct *tss = &per_cpu(init_tss, cpu);
@@ -657,7 +659,7 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)
 
         ++nmi_count(cpu);
 
-        if (!nmi_callback(regs, cpu))
+        if (!rcu_dereference(nmi_callback)(regs, cpu))
                 default_do_nmi(regs);
 
         nmi_exit();
@@ -665,7 +667,7 @@ fastcall void do_nmi(struct pt_regs * regs, long error_code)
 
 void set_nmi_callback(nmi_callback_t callback)
 {
-        nmi_callback = callback;
+        rcu_assign_pointer(nmi_callback, callback);
 }
 EXPORT_SYMBOL_GPL(set_nmi_callback);
 
@@ -676,7 +678,7 @@ void unset_nmi_callback(void)
 EXPORT_SYMBOL_GPL(unset_nmi_callback);
 
 #ifdef CONFIG_KPROBES
-fastcall void do_int3(struct pt_regs *regs, long error_code)
+fastcall void __kprobes do_int3(struct pt_regs *regs, long error_code)
 {
         if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP)
                         == NOTIFY_STOP)
@@ -710,7 +712,7 @@ fastcall void do_int3(struct pt_regs *regs, long error_code)
  * find every occurrence of the TF bit that could be saved away even
  * by user code)
  */
-fastcall void do_debug(struct pt_regs * regs, long error_code)
+fastcall void __kprobes do_debug(struct pt_regs * regs, long error_code)
 {
         unsigned int condition;
         struct task_struct *tsk = current;
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index 761972f8cb6c..4710195b6b74 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -22,6 +22,7 @@ SECTIONS
         *(.text)
         SCHED_TEXT
         LOCK_TEXT
+        KPROBES_TEXT
         *(.fixup)
         *(.gnu.warning)
         } = 0x9090
@@ -143,12 +144,7 @@ SECTIONS
         *(.exitcall.exit)
         }
 
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
+  STABS_DEBUG
+
+  DWARF_DEBUG
 }
diff --git a/arch/i386/kernel/vsyscall-sigreturn.S b/arch/i386/kernel/vsyscall-sigreturn.S
index 68afa50dd7cf..fadb5bc3c374 100644
--- a/arch/i386/kernel/vsyscall-sigreturn.S
+++ b/arch/i386/kernel/vsyscall-sigreturn.S
@@ -7,7 +7,7 @@
  */
 
 #include <asm/unistd.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 
 /* XXX
diff --git a/arch/i386/kernel/vsyscall.lds.S b/arch/i386/kernel/vsyscall.lds.S
index a7977707c8e5..98699ca6e52d 100644
--- a/arch/i386/kernel/vsyscall.lds.S
+++ b/arch/i386/kernel/vsyscall.lds.S
@@ -3,7 +3,7 @@
  * object prelinked to its virtual address, and with only one read-only
  * segment (that fits in one page).  This script controls its layout.
  */
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
 SECTIONS
 {
diff --git a/arch/i386/mach-default/topology.c b/arch/i386/mach-default/topology.c
index 23395fff35d1..b64314069e78 100644
--- a/arch/i386/mach-default/topology.c
+++ b/arch/i386/mach-default/topology.c
@@ -76,7 +76,7 @@ static int __init topology_init(void)
         for_each_online_node(i)
                 arch_register_node(i);
 
-        for_each_cpu(i)
+        for_each_present_cpu(i)
                 arch_register_cpu(i);
         return 0;
 }
@@ -87,7 +87,7 @@ static int __init topology_init(void)
 {
         int i;
 
-        for_each_cpu(i)
+        for_each_present_cpu(i)
                 arch_register_cpu(i);
         return 0;
 }
diff --git a/arch/i386/mach-es7000/es7000plat.c b/arch/i386/mach-es7000/es7000plat.c
index 2000bdca2fc2..dc6660511b07 100644
--- a/arch/i386/mach-es7000/es7000plat.c
+++ b/arch/i386/mach-es7000/es7000plat.c
@@ -51,7 +51,7 @@ struct mip_reg		*host_reg;
 int                     mip_port;
 unsigned long           mip_addr, host_addr;
 
-#if defined(CONFIG_X86_IO_APIC) && (defined(CONFIG_ACPI_INTERPRETER) || defined(CONFIG_ACPI_BOOT))
+#if defined(CONFIG_X86_IO_APIC) && defined(CONFIG_ACPI)
 
 /*
  * GSI override for ES7000 platforms.
@@ -73,7 +73,7 @@ es7000_rename_gsi(int ioapic, int gsi)
         return gsi;
 }
 
-#endif // (CONFIG_X86_IO_APIC) && (CONFIG_ACPI_INTERPRETER || CONFIG_ACPI_BOOT)
+#endif  /* (CONFIG_X86_IO_APIC) && (CONFIG_ACPI) */
 
 void __init
 setup_unisys ()
diff --git a/arch/i386/mm/discontig.c b/arch/i386/mm/discontig.c
index 6711ce3f6916..244d8ec66be2 100644
--- a/arch/i386/mm/discontig.c
+++ b/arch/i386/mm/discontig.c
@@ -37,7 +37,7 @@
 #include <asm/mmzone.h>
 #include <bios_ebda.h>
 
-struct pglist_data *node_data[MAX_NUMNODES];
+struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
 bootmem_data_t node0_bdata;
 
@@ -49,8 +49,8 @@ bootmem_data_t node0_bdata;
  * 2) node_start_pfn   - the starting page frame number for a node
  * 3) node_end_pfn     - the ending page fram number for a node
  */
-unsigned long node_start_pfn[MAX_NUMNODES];
-unsigned long node_end_pfn[MAX_NUMNODES];
+unsigned long node_start_pfn[MAX_NUMNODES] __read_mostly;
+unsigned long node_end_pfn[MAX_NUMNODES] __read_mostly;
 
 
 #ifdef CONFIG_DISCONTIGMEM
@@ -66,7 +66,7 @@ unsigned long node_end_pfn[MAX_NUMNODES];
  *     physnode_map[4-7] = 1;
  *     physnode_map[8- ] = -1;
  */
-s8 physnode_map[MAX_ELEMENTS] = { [0 ... (MAX_ELEMENTS - 1)] = -1};
+s8 physnode_map[MAX_ELEMENTS] __read_mostly = { [0 ... (MAX_ELEMENTS - 1)] = -1};
 EXPORT_SYMBOL(physnode_map);
 
 void memory_present(int nid, unsigned long start, unsigned long end)
diff --git a/arch/i386/mm/fault.c b/arch/i386/mm/fault.c
index 411b8500ad1b..9edd4485b91e 100644
--- a/arch/i386/mm/fault.c
+++ b/arch/i386/mm/fault.c
@@ -21,6 +21,7 @@
 #include <linux/vt_kern.h>              /* For unblank_screen() */
 #include <linux/highmem.h>
 #include <linux/module.h>
+#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -223,7 +224,8 @@ fastcall void do_invalid_op(struct pt_regs *, unsigned long);
  *      bit 1 == 0 means read, 1 means write
  *      bit 2 == 0 means kernel, 1 means user-mode
  */
-fastcall void do_page_fault(struct pt_regs *regs, unsigned long error_code)
+fastcall void __kprobes do_page_fault(struct pt_regs *regs,
+                                      unsigned long error_code)
 {
         struct task_struct *tsk;
         struct mm_struct *mm;
diff --git a/arch/i386/mm/init.c b/arch/i386/mm/init.c
index 9edfc058b894..2ebaf75f732e 100644
--- a/arch/i386/mm/init.c
+++ b/arch/i386/mm/init.c
@@ -393,7 +393,7 @@ void zap_low_mappings (void)
 }
 
 static int disable_nx __initdata = 0;
-u64 __supported_pte_mask = ~_PAGE_NX;
+u64 __supported_pte_mask __read_mostly = ~_PAGE_NX;
 
 /*
  * noexec = on|off
diff --git a/arch/i386/oprofile/init.c b/arch/i386/oprofile/init.c
index c90332de582b..5341d481d92f 100644
--- a/arch/i386/oprofile/init.c
+++ b/arch/i386/oprofile/init.c
@@ -15,9 +15,9 @@
  * with the NMI mode driver.
  */
  
-extern int nmi_init(struct oprofile_operations * ops);
-extern int nmi_timer_init(struct oprofile_operations * ops);
-extern void nmi_exit(void);
+extern int op_nmi_init(struct oprofile_operations * ops);
+extern int op_nmi_timer_init(struct oprofile_operations * ops);
+extern void op_nmi_exit(void);
 extern void x86_backtrace(struct pt_regs * const regs, unsigned int depth);
 
 
@@ -28,11 +28,11 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
         ret = -ENODEV;
 
 #ifdef CONFIG_X86_LOCAL_APIC
-        ret = nmi_init(ops);
+        ret = op_nmi_init(ops);
 #endif
 #ifdef CONFIG_X86_IO_APIC
         if (ret < 0)
-                ret = nmi_timer_init(ops);
+                ret = op_nmi_timer_init(ops);
 #endif
         ops->backtrace = x86_backtrace;
 
@@ -43,6 +43,6 @@ int __init oprofile_arch_init(struct oprofile_operations * ops)
 void oprofile_arch_exit(void)
 {
 #ifdef CONFIG_X86_LOCAL_APIC
-        nmi_exit();
+        op_nmi_exit();
 #endif
 }
diff --git a/arch/i386/oprofile/nmi_int.c b/arch/i386/oprofile/nmi_int.c
index 255e4702d185..0493e8b8ec49 100644
--- a/arch/i386/oprofile/nmi_int.c
+++ b/arch/i386/oprofile/nmi_int.c
@@ -355,7 +355,7 @@ static int __init ppro_init(char ** cpu_type)
 /* in order to get driverfs right */
 static int using_nmi;
 
-int __init nmi_init(struct oprofile_operations *ops)
+int __init op_nmi_init(struct oprofile_operations *ops)
 {
         __u8 vendor = boot_cpu_data.x86_vendor;
         __u8 family = boot_cpu_data.x86;
@@ -420,7 +420,7 @@ int __init nmi_init(struct oprofile_operations *ops)
 }
 
 
-void nmi_exit(void)
+void op_nmi_exit(void)
 {
         if (using_nmi)
                 exit_driverfs();
diff --git a/arch/i386/oprofile/nmi_timer_int.c b/arch/i386/oprofile/nmi_timer_int.c
index c58d0c14f274..ad93cdd55d63 100644
--- a/arch/i386/oprofile/nmi_timer_int.c
+++ b/arch/i386/oprofile/nmi_timer_int.c
@@ -40,7 +40,7 @@ static void timer_stop(void)
 }
 
 
-int __init nmi_timer_init(struct oprofile_operations * ops)
+int __init op_nmi_timer_init(struct oprofile_operations * ops)
 {
         extern int nmi_active;
 
diff --git a/arch/i386/pci/Makefile b/arch/i386/pci/Makefile
index 1bff03f36965..ead6122dd06d 100644
--- a/arch/i386/pci/Makefile
+++ b/arch/i386/pci/Makefile
@@ -5,7 +5,7 @@ obj-$(CONFIG_PCI_MMCONFIG)	+= mmconfig.o
 obj-$(CONFIG_PCI_DIRECT)        += direct.o
 
 pci-y                           := fixup.o
-pci-$(CONFIG_ACPI_PCI)          += acpi.o
+pci-$(CONFIG_ACPI)              += acpi.o
 pci-y                           += legacy.o irq.o
 
 pci-$(CONFIG_X86_VISWS)         := visws.o fixup.o
diff --git a/arch/i386/pci/i386.c b/arch/i386/pci/i386.c
index 3cc480998a47..6d6338500c3c 100644
--- a/arch/i386/pci/i386.c
+++ b/arch/i386/pci/i386.c
@@ -283,9 +283,9 @@ int pci_mmap_page_range(struct pci_dev *dev, struct vm_area_struct *vma,
         /* Write-combine setting is ignored, it is changed via the mtrr
          * interfaces on this platform.
          */
-        if (remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
-                             vma->vm_end - vma->vm_start,
-                             vma->vm_page_prot))
+        if (io_remap_pfn_range(vma, vma->vm_start, vma->vm_pgoff,
+                               vma->vm_end - vma->vm_start,
+                               vma->vm_page_prot))
                 return -EAGAIN;
 
         return 0;
diff --git a/arch/i386/pci/irq.c b/arch/i386/pci/irq.c
index 86348b68fda1..326a2edc3834 100644
--- a/arch/i386/pci/irq.c
+++ b/arch/i386/pci/irq.c
@@ -1075,7 +1075,7 @@ static void pirq_penalize_isa_irq(int irq, int active)
 
 void pcibios_penalize_isa_irq(int irq, int active)
 {
-#ifdef CONFIG_ACPI_PCI
+#ifdef CONFIG_ACPI
         if (!acpi_noirq)
                 acpi_penalize_isa_irq(irq, active);
         else
diff --git a/arch/i386/power/swsusp.S b/arch/i386/power/swsusp.S
index c4105286ff26..c893b897217f 100644
--- a/arch/i386/power/swsusp.S
+++ b/arch/i386/power/swsusp.S
@@ -12,7 +12,7 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
 
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 3deced637f07..ed25d66c8d50 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -60,6 +60,7 @@ choice
 
 config IA64_GENERIC
         bool "generic"
+        select ACPI
         select NUMA
         select ACPI_NUMA
         select VIRTUAL_MEM_MAP
@@ -338,11 +339,6 @@ config IA64_PALINFO
           To use this option, you have to ensure that the "/proc file system
           support" (CONFIG_PROC_FS) is enabled, too.
 
-config ACPI_DEALLOCATE_IRQ
-        bool
-        depends on IOSAPIC && EXPERIMENTAL
-        default y
-
 source "drivers/firmware/Kconfig"
 
 source "fs/Kconfig.binfmt"
@@ -351,38 +347,10 @@ endmenu
 
 menu "Power management and ACPI"
 
-config PM
-        bool "Power Management support"
-        depends on !IA64_HP_SIM
-        default y
-        help
-          "Power Management" means that parts of your computer are shut
-          off or put into a power conserving "sleep" mode if they are not
-          being used.  There are two competing standards for doing this: APM
-          and ACPI.  If you want to use either one, say Y here and then also
-          to the requisite support below.
-
-          Power Management is most important for battery powered laptop
-          computers; if you have a laptop, check out the Linux Laptop home
-          page on the WWW at <http://www.linux-on-laptops.com/> and the
-          Battery Powered Linux mini-HOWTO, available from
-          <http://www.tldp.org/docs.html#howto>.
-
-          Note that, even if you say N here, Linux on the x86 architecture
-          will issue the hlt instruction if nothing is to be done, thereby
-          sending the processor to sleep and saving power.
-
-config ACPI
-        bool
-        depends on !IA64_HP_SIM
-        default y
-
-if !IA64_HP_SIM
+source "kernel/power/Kconfig"
 
 source "drivers/acpi/Kconfig"
 
-endif
-
 if PM
 
 source "arch/ia64/kernel/cpufreq/Kconfig"
@@ -434,6 +402,11 @@ config GENERIC_IRQ_PROBE
         bool
         default y
 
+config GENERIC_PENDING_IRQ
+        bool
+        depends on GENERIC_HARDIRQS && SMP
+        default y
+
 source "arch/ia64/hp/sim/Kconfig"
 
 source "arch/ia64/oprofile/Kconfig"
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index f9bd88ada708..7ed678cf5e41 100644
--- a/arch/ia64/Makefile
+++ b/arch/ia64/Makefile
@@ -82,25 +82,18 @@ unwcheck: vmlinux
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-ia64/.offsets.h.stamp vmlinux.gz bootloader
-
-MRPROPER_FILES += include/asm-ia64/offsets.h
-
-prepare: include/asm-ia64/offsets.h
-
-arch/ia64/kernel/asm-offsets.s: include/asm include/linux/version.h include/config/MARKER
-
-include/asm-ia64/offsets.h: arch/ia64/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-arch/ia64/kernel/asm-offsets.s: include/asm-ia64/.offsets.h.stamp
+prepare:  include/asm-ia64/.offsets.h.stamp
 
 include/asm-ia64/.offsets.h.stamp:
         mkdir -p include/asm-ia64
-        [ -s include/asm-ia64/offsets.h ] \
-         || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/offsets.h
+        [ -s include/asm-ia64/asm-offsets.h ] \
+        || echo "#define IA64_TASK_SIZE 0" > include/asm-ia64/asm-offsets.h
         touch $@
 
+
+
+CLEAN_FILES += vmlinux.gz bootloader include/asm-ia64/.offsets.h.stamp
+
 boot:   lib/lib.a vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
diff --git a/arch/ia64/configs/bigsur_defconfig b/arch/ia64/configs/bigsur_defconfig
index b95fcf86ea00..3b65cbb31b1d 100644
--- a/arch/ia64/configs/bigsur_defconfig
+++ b/arch/ia64/configs/bigsur_defconfig
@@ -107,18 +107,12 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 
 #
diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index dccf35c60b94..08112ab38468 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -111,7 +111,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers
@@ -130,19 +129,12 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 # CONFIG_ACPI_BUTTON is not set
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
 # CONFIG_ACPI_FAN is not set
 # CONFIG_ACPI_PROCESSOR is not set
 CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 
diff --git a/arch/ia64/configs/tiger_defconfig b/arch/ia64/configs/tiger_defconfig
index c853cfcd2d11..d452e18ac494 100644
--- a/arch/ia64/configs/tiger_defconfig
+++ b/arch/ia64/configs/tiger_defconfig
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers
@@ -128,20 +127,13 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
-# CONFIG_ACPI_VIDEO is not set
-# CONFIG_ACPI_HOTKEY is not set
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
 # CONFIG_ACPI_HOTPLUG_CPU is not set
 CONFIG_ACPI_THERMAL=m
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 
diff --git a/arch/ia64/configs/zx1_defconfig b/arch/ia64/configs/zx1_defconfig
index 88e8867fa8e8..80b0e9eb7fb3 100644
--- a/arch/ia64/configs/zx1_defconfig
+++ b/arch/ia64/configs/zx1_defconfig
@@ -109,7 +109,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers
@@ -128,19 +127,12 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=y
-CONFIG_ACPI_VIDEO=m
-CONFIG_ACPI_HOTKEY=m
 CONFIG_ACPI_FAN=y
 CONFIG_ACPI_PROCESSOR=y
 CONFIG_ACPI_THERMAL=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 
diff --git a/arch/ia64/defconfig b/arch/ia64/defconfig
index 8444add76380..5da208115ea1 100644
--- a/arch/ia64/defconfig
+++ b/arch/ia64/defconfig
@@ -99,7 +99,6 @@ CONFIG_COMPAT=y
 CONFIG_IA64_MCA_RECOVERY=y
 CONFIG_PERFMON=y
 CONFIG_IA64_PALINFO=y
-CONFIG_ACPI_DEALLOCATE_IRQ=y
 
 #
 # Firmware Drivers
@@ -118,20 +117,14 @@ CONFIG_ACPI=y
 #
 # ACPI (Advanced Configuration and Power Interface) Support
 #
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_BUTTON=m
-CONFIG_ACPI_VIDEO=m
 CONFIG_ACPI_FAN=m
 CONFIG_ACPI_PROCESSOR=m
 CONFIG_ACPI_HOTPLUG_CPU=y
 CONFIG_ACPI_THERMAL=m
 CONFIG_ACPI_NUMA=y
-CONFIG_ACPI_BLACKLIST_YEAR=0
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 CONFIG_ACPI_CONTAINER=m
 
@@ -341,7 +334,7 @@ CONFIG_SCSI_SYM53C8XX_DEFAULT_TAGS=16
 CONFIG_SCSI_SYM53C8XX_MAX_TAGS=64
 # CONFIG_SCSI_SYM53C8XX_IOMAPPED is not set
 # CONFIG_SCSI_IPR is not set
-CONFIG_SCSI_QLOGIC_FC=y
+# CONFIG_SCSI_QLOGIC_FC is not set
 # CONFIG_SCSI_QLOGIC_FC_FIRMWARE is not set
 CONFIG_SCSI_QLOGIC_1280=y
 # CONFIG_SCSI_QLOGIC_1280_1040 is not set
diff --git a/arch/ia64/hp/sim/simserial.c b/arch/ia64/hp/sim/simserial.c
index 7dcb8582ae0d..b42ec37be51c 100644
--- a/arch/ia64/hp/sim/simserial.c
+++ b/arch/ia64/hp/sim/simserial.c
@@ -130,7 +130,7 @@ static void rs_stop(struct tty_struct *tty)
 
 static void rs_start(struct tty_struct *tty)
 {
-#if SIMSERIAL_DEBUG
+#ifdef SIMSERIAL_DEBUG
         printk("rs_start: tty->stopped=%d tty->hw_stopped=%d tty->flow_stopped=%d\n",
                 tty->stopped, tty->hw_stopped, tty->flow_stopped);
 #endif
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 829a6d80711c..494fad6bf376 100644
--- a/arch/ia64/ia32/ia32_entry.S
+++ b/arch/ia64/ia32/ia32_entry.S
@@ -1,6 +1,6 @@
 #include <asm/asmmacro.h>
 #include <asm/ia32.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/thread_info.h>
 
@@ -215,7 +215,7 @@ ia32_syscall_table:
         data8 sys32_fork
         data8 sys_read
         data8 sys_write
-        data8 sys32_open          /* 5 */
+        data8 compat_sys_open     /* 5 */
         data8 sys_close
         data8 sys32_waitpid
         data8 sys_creat
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index c1e20d65dd6c..e29a8a55486a 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -2359,37 +2359,6 @@ sys32_brk (unsigned int brk)
         return ret;
 }
 
-/*
- * Exactly like fs/open.c:sys_open(), except that it doesn't set the O_LARGEFILE flag.
- */
-asmlinkage long
-sys32_open (const char __user * filename, int flags, int mode)
-{
-        char * tmp;
-        int fd, error;
-
-        tmp = getname(filename);
-        fd = PTR_ERR(tmp);
-        if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
-                if (fd >= 0) {
-                        struct file *f = filp_open(tmp, flags, mode);
-                        error = PTR_ERR(f);
-                        if (IS_ERR(f))
-                                goto out_error;
-                        fd_install(fd, f);
-                }
-out:
-                putname(tmp);
-        }
-        return fd;
-
-out_error:
-        put_unused_fd(fd);
-        fd = error;
-        goto out;
-}
-
 /* Structure for ia32 emulation on ia64 */
 struct epoll_event32
 {
diff --git a/arch/ia64/kernel/Makefile b/arch/ia64/kernel/Makefile
index b242594be55b..307514f7a282 100644
--- a/arch/ia64/kernel/Makefile
+++ b/arch/ia64/kernel/Makefile
@@ -16,7 +16,7 @@ obj-$(CONFIG_IA64_HP_ZX1_SWIOTLB) += acpi-ext.o
 obj-$(CONFIG_IA64_PALINFO)      += palinfo.o
 obj-$(CONFIG_IOSAPIC)           += iosapic.o
 obj-$(CONFIG_MODULES)           += module.o
-obj-$(CONFIG_SMP)               += smp.o smpboot.o domain.o
+obj-$(CONFIG_SMP)               += smp.o smpboot.o
 obj-$(CONFIG_NUMA)              += numa.o
 obj-$(CONFIG_PERFMON)           += perfmon_default_smpl.o
 obj-$(CONFIG_IA64_CYCLONE)      += cyclone.o
diff --git a/arch/ia64/kernel/acpi-ext.c b/arch/ia64/kernel/acpi-ext.c
index 2623df5e2633..13a5b3b49bf8 100644
--- a/arch/ia64/kernel/acpi-ext.c
+++ b/arch/ia64/kernel/acpi-ext.c
@@ -17,20 +17,20 @@
 #include <asm/acpi-ext.h>
 
 struct acpi_vendor_descriptor {
-        u8                              guid_id;
-        efi_guid_t                      guid;
+        u8 guid_id;
+        efi_guid_t guid;
 };
 
 struct acpi_vendor_info {
-        struct acpi_vendor_descriptor   *descriptor;
-        u8                              *data;
-        u32                             length;
+        struct acpi_vendor_descriptor *descriptor;
+        u8 *data;
+        u32 length;
 };
 
 acpi_status
 acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
 {
-        struct acpi_vendor_info *info = (struct acpi_vendor_info *) context;
+        struct acpi_vendor_info *info = (struct acpi_vendor_info *)context;
         struct acpi_resource_vendor *vendor;
         struct acpi_vendor_descriptor *descriptor;
         u32 length;
@@ -38,8 +38,8 @@ acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
         if (resource->id != ACPI_RSTYPE_VENDOR)
                 return AE_OK;
 
-        vendor = (struct acpi_resource_vendor *) &resource->data;
-        descriptor = (struct acpi_vendor_descriptor *) vendor->reserved;
+        vendor = (struct acpi_resource_vendor *)&resource->data;
+        descriptor = (struct acpi_vendor_descriptor *)vendor->reserved;
         if (vendor->length <= sizeof(*info->descriptor) ||
             descriptor->guid_id != info->descriptor->guid_id ||
             efi_guidcmp(descriptor->guid, info->descriptor->guid))
@@ -50,21 +50,24 @@ acpi_vendor_resource_match(struct acpi_resource *resource, void *context)
         if (!info->data)
                 return AE_NO_MEMORY;
 
-        memcpy(info->data, vendor->reserved + sizeof(struct acpi_vendor_descriptor), length);
+        memcpy(info->data,
+               vendor->reserved + sizeof(struct acpi_vendor_descriptor),
+               length);
         info->length = length;
         return AE_CTRL_TERMINATE;
 }
 
 acpi_status
-acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor *id,
-                u8 **data, u32 *length)
+acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor * id,
+                          u8 ** data, u32 * length)
 {
         struct acpi_vendor_info info;
 
         info.descriptor = id;
         info.data = NULL;
 
-        acpi_walk_resources(obj, METHOD_NAME__CRS, acpi_vendor_resource_match, &info);
+        acpi_walk_resources(obj, METHOD_NAME__CRS, acpi_vendor_resource_match,
+                            &info);
         if (!info.data)
                 return AE_NOT_FOUND;
 
@@ -75,17 +78,19 @@ acpi_find_vendor_resource(acpi_handle obj, struct acpi_vendor_descriptor *id,
 
 struct acpi_vendor_descriptor hp_ccsr_descriptor = {
         .guid_id = 2,
-        .guid    = EFI_GUID(0x69e9adf9, 0x924f, 0xab5f, 0xf6, 0x4a, 0x24, 0xd2, 0x01, 0x37, 0x0e, 0xad)
+        .guid =
+            EFI_GUID(0x69e9adf9, 0x924f, 0xab5f, 0xf6, 0x4a, 0x24, 0xd2, 0x01,
+                     0x37, 0x0e, 0xad)
 };
 
-acpi_status
-hp_acpi_csr_space(acpi_handle obj, u64 *csr_base, u64 *csr_length)
+acpi_status hp_acpi_csr_space(acpi_handle obj, u64 * csr_base, u64 * csr_length)
 {
         acpi_status status;
         u8 *data;
         u32 length;
 
-        status = acpi_find_vendor_resource(obj, &hp_ccsr_descriptor, &data, &length);
+        status =
+            acpi_find_vendor_resource(obj, &hp_ccsr_descriptor, &data, &length);
 
         if (ACPI_FAILURE(status) || length != 16)
                 return AE_NOT_FOUND;
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 9609f243e5d0..28a4529fdd60 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -74,12 +74,11 @@ unsigned int acpi_cpei_override;
 unsigned int acpi_cpei_phys_cpuid;
 
 #define MAX_SAPICS 256
-u16 ia64_acpiid_to_sapicid[MAX_SAPICS] =
-        { [0 ... MAX_SAPICS - 1] = -1 };
+u16 ia64_acpiid_to_sapicid[MAX_SAPICS] = {[0 ... MAX_SAPICS - 1] = -1 };
+
 EXPORT_SYMBOL(ia64_acpiid_to_sapicid);
 
-const char *
-acpi_get_sysname (void)
+const char *acpi_get_sysname(void)
 {
 #ifdef CONFIG_IA64_GENERIC
         unsigned long rsdp_phys;
@@ -89,27 +88,29 @@ acpi_get_sysname (void)
 
         rsdp_phys = acpi_find_rsdp();
         if (!rsdp_phys) {
-                printk(KERN_ERR "ACPI 2.0 RSDP not found, default to \"dig\"\n");
+                printk(KERN_ERR
+                       "ACPI 2.0 RSDP not found, default to \"dig\"\n");
                 return "dig";
         }
 
-        rsdp = (struct acpi20_table_rsdp *) __va(rsdp_phys);
+        rsdp = (struct acpi20_table_rsdp *)__va(rsdp_phys);
         if (strncmp(rsdp->signature, RSDP_SIG, sizeof(RSDP_SIG) - 1)) {
-                printk(KERN_ERR "ACPI 2.0 RSDP signature incorrect, default to \"dig\"\n");
+                printk(KERN_ERR
+                       "ACPI 2.0 RSDP signature incorrect, default to \"dig\"\n");
                 return "dig";
         }
 
-        xsdt = (struct acpi_table_xsdt *) __va(rsdp->xsdt_address);
+        xsdt = (struct acpi_table_xsdt *)__va(rsdp->xsdt_address);
         hdr = &xsdt->header;
         if (strncmp(hdr->signature, XSDT_SIG, sizeof(XSDT_SIG) - 1)) {
-                printk(KERN_ERR "ACPI 2.0 XSDT signature incorrect, default to \"dig\"\n");
+                printk(KERN_ERR
+                       "ACPI 2.0 XSDT signature incorrect, default to \"dig\"\n");
                 return "dig";
         }
 
         if (!strcmp(hdr->oem_id, "HP")) {
                 return "hpzx1";
-        }
-        else if (!strcmp(hdr->oem_id, "SGI")) {
+        } else if (!strcmp(hdr->oem_id, "SGI")) {
                 return "sn2";
         }
 
@@ -131,7 +132,7 @@ acpi_get_sysname (void)
 #endif
 }
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 #define ACPI_MAX_PLATFORM_INTERRUPTS    256
 
@@ -146,8 +147,7 @@ enum acpi_irq_model_id acpi_irq_model = ACPI_IRQ_MODEL_IOSAPIC;
  * Interrupt routing API for device drivers.  Provides interrupt vector for
  * a generic platform event.  Currently only CPEI is implemented.
  */
-int
-acpi_request_vector (u32 int_type)
+int acpi_request_vector(u32 int_type)
 {
         int vector = -1;
 
@@ -155,12 +155,12 @@ acpi_request_vector (u32 int_type)
                 /* corrected platform error interrupt */
                 vector = platform_intr_list[int_type];
         } else
-                printk(KERN_ERR "acpi_request_vector(): invalid interrupt type\n");
+                printk(KERN_ERR
+                       "acpi_request_vector(): invalid interrupt type\n");
         return vector;
 }
 
-char *
-__acpi_map_table (unsigned long phys_addr, unsigned long size)
+char *__acpi_map_table(unsigned long phys_addr, unsigned long size)
 {
         return __va(phys_addr);
 }
@@ -169,19 +169,18 @@ __acpi_map_table (unsigned long phys_addr, unsigned long size)
                             Boot-time Table Parsing
    -------------------------------------------------------------------------- */
 
-static int                      total_cpus __initdata;
-static int                      available_cpus __initdata;
-struct acpi_table_madt *        acpi_madt __initdata;
-static u8                       has_8259;
-
+static int total_cpus __initdata;
+static int available_cpus __initdata;
+struct acpi_table_madt *acpi_madt __initdata;
+static u8 has_8259;
 
 static int __init
-acpi_parse_lapic_addr_ovr (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lapic_addr_ovr(acpi_table_entry_header * header,
+                          const unsigned long end)
 {
         struct acpi_table_lapic_addr_ovr *lapic;
 
-        lapic = (struct acpi_table_lapic_addr_ovr *) header;
+        lapic = (struct acpi_table_lapic_addr_ovr *)header;
 
         if (BAD_MADT_ENTRY(lapic, end))
                 return -EINVAL;
@@ -193,22 +192,23 @@ acpi_parse_lapic_addr_ovr (
         return 0;
 }
 
-
 static int __init
-acpi_parse_lsapic (acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lsapic(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_lsapic *lsapic;
 
-        lsapic = (struct acpi_table_lsapic *) header;
+        lsapic = (struct acpi_table_lsapic *)header;
 
         if (BAD_MADT_ENTRY(lsapic, end))
                 return -EINVAL;
 
         if (lsapic->flags.enabled) {
 #ifdef CONFIG_SMP
-                smp_boot_data.cpu_phys_id[available_cpus] = (lsapic->id << 8) | lsapic->eid;
+                smp_boot_data.cpu_phys_id[available_cpus] =
+                    (lsapic->id << 8) | lsapic->eid;
 #endif
-                ia64_acpiid_to_sapicid[lsapic->acpi_id] = (lsapic->id << 8) | lsapic->eid;
+                ia64_acpiid_to_sapicid[lsapic->acpi_id] =
+                    (lsapic->id << 8) | lsapic->eid;
                 ++available_cpus;
         }
 
@@ -216,13 +216,12 @@ acpi_parse_lsapic (acpi_table_entry_header *header, const unsigned long end)
         return 0;
 }
 
-
 static int __init
-acpi_parse_lapic_nmi (acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_lapic_nmi(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_lapic_nmi *lacpi_nmi;
 
-        lacpi_nmi = (struct acpi_table_lapic_nmi*) header;
+        lacpi_nmi = (struct acpi_table_lapic_nmi *)header;
 
         if (BAD_MADT_ENTRY(lacpi_nmi, end))
                 return -EINVAL;
@@ -231,13 +230,12 @@ acpi_parse_lapic_nmi (acpi_table_entry_header *header, const unsigned long end)
         return 0;
 }
 
-
 static int __init
-acpi_parse_iosapic (acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_iosapic(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_iosapic *iosapic;
 
-        iosapic = (struct acpi_table_iosapic *) header;
+        iosapic = (struct acpi_table_iosapic *)header;
 
         if (BAD_MADT_ENTRY(iosapic, end))
                 return -EINVAL;
@@ -245,15 +243,14 @@ acpi_parse_iosapic (acpi_table_entry_header *header, const unsigned long end)
         return iosapic_init(iosapic->address, iosapic->global_irq_base);
 }
 
-
 static int __init
-acpi_parse_plat_int_src (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_plat_int_src(acpi_table_entry_header * header,
+                        const unsigned long end)
 {
         struct acpi_table_plat_int_src *plintsrc;
         int vector;
 
-        plintsrc = (struct acpi_table_plat_int_src *) header;
+        plintsrc = (struct acpi_table_plat_int_src *)header;
 
         if (BAD_MADT_ENTRY(plintsrc, end))
                 return -EINVAL;
@@ -267,8 +264,12 @@ acpi_parse_plat_int_src (
                                                 plintsrc->iosapic_vector,
                                                 plintsrc->eid,
                                                 plintsrc->id,
-                                                (plintsrc->flags.polarity == 1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                                                (plintsrc->flags.trigger == 1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
+                                                (plintsrc->flags.polarity ==
+                                                 1) ? IOSAPIC_POL_HIGH :
+                                                IOSAPIC_POL_LOW,
+                                                (plintsrc->flags.trigger ==
+                                                 1) ? IOSAPIC_EDGE :
+                                                IOSAPIC_LEVEL);
 
         platform_intr_list[plintsrc->type] = vector;
         if (acpi_madt_rev > 1) {
@@ -283,7 +284,6 @@ acpi_parse_plat_int_src (
         return 0;
 }
 
-
 unsigned int can_cpei_retarget(void)
 {
         extern int cpe_vector;
@@ -322,29 +322,30 @@ unsigned int get_cpei_target_cpu(void)
 }
 
 static int __init
-acpi_parse_int_src_ovr (
-        acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_int_src_ovr(acpi_table_entry_header * header,
+                       const unsigned long end)
 {
         struct acpi_table_int_src_ovr *p;
 
-        p = (struct acpi_table_int_src_ovr *) header;
+        p = (struct acpi_table_int_src_ovr *)header;
 
         if (BAD_MADT_ENTRY(p, end))
                 return -EINVAL;
 
         iosapic_override_isa_irq(p->bus_irq, p->global_irq,
-                                 (p->flags.polarity == 1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                                 (p->flags.trigger == 1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
+                                 (p->flags.polarity ==
+                                  1) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
+                                 (p->flags.trigger ==
+                                  1) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
         return 0;
 }
 
-
 static int __init
-acpi_parse_nmi_src (acpi_table_entry_header *header, const unsigned long end)
+acpi_parse_nmi_src(acpi_table_entry_header * header, const unsigned long end)
 {
         struct acpi_table_nmi_src *nmi_src;
 
-        nmi_src = (struct acpi_table_nmi_src*) header;
+        nmi_src = (struct acpi_table_nmi_src *)header;
 
         if (BAD_MADT_ENTRY(nmi_src, end))
                 return -EINVAL;
@@ -353,11 +354,9 @@ acpi_parse_nmi_src (acpi_table_entry_header *header, const unsigned long end)
         return 0;
 }
 
-static void __init
-acpi_madt_oem_check (char *oem_id, char *oem_table_id)
+static void __init acpi_madt_oem_check(char *oem_id, char *oem_table_id)
 {
-        if (!strncmp(oem_id, "IBM", 3) &&
-            (!strncmp(oem_table_id, "SERMOW", 6))) {
+        if (!strncmp(oem_id, "IBM", 3) && (!strncmp(oem_table_id, "SERMOW", 6))) {
 
                 /*
                  * Unfortunately ITC_DRIFT is not yet part of the
@@ -370,19 +369,18 @@ acpi_madt_oem_check (char *oem_id, char *oem_table_id)
         }
 }
 
-static int __init
-acpi_parse_madt (unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_madt(unsigned long phys_addr, unsigned long size)
 {
         if (!phys_addr || !size)
                 return -EINVAL;
 
-        acpi_madt = (struct acpi_table_madt *) __va(phys_addr);
+        acpi_madt = (struct acpi_table_madt *)__va(phys_addr);
 
         acpi_madt_rev = acpi_madt->header.revision;
 
         /* remember the value for reference after free_initmem() */
 #ifdef CONFIG_ITANIUM
-        has_8259 = 1; /* Firmware on old Itanium systems is broken */
+        has_8259 = 1;           /* Firmware on old Itanium systems is broken */
 #else
         has_8259 = acpi_madt->flags.pcat_compat;
 #endif
@@ -396,19 +394,18 @@ acpi_parse_madt (unsigned long phys_addr, unsigned long size)
         printk(KERN_INFO PREFIX "Local APIC address %p\n", ipi_base_addr);
 
         acpi_madt_oem_check(acpi_madt->header.oem_id,
-                acpi_madt->header.oem_table_id);
+                            acpi_madt->header.oem_table_id);
 
         return 0;
 }
 
-
 #ifdef CONFIG_ACPI_NUMA
 
 #undef SLIT_DEBUG
 
 #define PXM_FLAG_LEN ((MAX_PXM_DOMAINS + 1)/32)
 
-static int __initdata srat_num_cpus;                    /* number of cpus */
+static int __initdata srat_num_cpus;    /* number of cpus */
 static u32 __devinitdata pxm_flag[PXM_FLAG_LEN];
 #define pxm_bit_set(bit)        (set_bit(bit,(void *)pxm_flag))
 #define pxm_bit_test(bit)       (test_bit(bit,(void *)pxm_flag))
@@ -421,15 +418,15 @@ static struct acpi_table_slit __initdata *slit_table;
  * ACPI 2.0 SLIT (System Locality Information Table)
  * http://devresource.hp.com/devresource/Docs/TechPapers/IA64/slit.pdf
  */
-void __init
-acpi_numa_slit_init (struct acpi_table_slit *slit)
+void __init acpi_numa_slit_init(struct acpi_table_slit *slit)
 {
         u32 len;
 
         len = sizeof(struct acpi_table_header) + 8
-                + slit->localities * slit->localities;
+            + slit->localities * slit->localities;
         if (slit->header.length != len) {
-                printk(KERN_ERR "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n",
+                printk(KERN_ERR
+                       "ACPI 2.0 SLIT: size mismatch: %d expected, %d actual\n",
                        len, slit->header.length);
                 memset(numa_slit, 10, sizeof(numa_slit));
                 return;
@@ -438,19 +435,20 @@ acpi_numa_slit_init (struct acpi_table_slit *slit)
 }
 
 void __init
-acpi_numa_processor_affinity_init (struct acpi_table_processor_affinity *pa)
+acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
 {
         /* record this node in proximity bitmap */
         pxm_bit_set(pa->proximity_domain);
 
-        node_cpuid[srat_num_cpus].phys_id = (pa->apic_id << 8) | (pa->lsapic_eid);
+        node_cpuid[srat_num_cpus].phys_id =
+            (pa->apic_id << 8) | (pa->lsapic_eid);
         /* nid should be overridden as logical node id later */
         node_cpuid[srat_num_cpus].nid = pa->proximity_domain;
         srat_num_cpus++;
 }
 
 void __init
-acpi_numa_memory_affinity_init (struct acpi_table_memory_affinity *ma)
+acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
 {
         unsigned long paddr, size;
         u8 pxm;
@@ -487,8 +485,7 @@ acpi_numa_memory_affinity_init (struct acpi_table_memory_affinity *ma)
         num_node_memblks++;
 }
 
-void __init
-acpi_numa_arch_fixup (void)
+void __init acpi_numa_arch_fixup(void)
 {
         int i, j, node_from, node_to;
 
@@ -534,21 +531,24 @@ acpi_numa_arch_fixup (void)
         for (i = 0; i < srat_num_cpus; i++)
                 node_cpuid[i].nid = pxm_to_nid_map[node_cpuid[i].nid];
 
-        printk(KERN_INFO "Number of logical nodes in system = %d\n", num_online_nodes());
-        printk(KERN_INFO "Number of memory chunks in system = %d\n", num_node_memblks);
+        printk(KERN_INFO "Number of logical nodes in system = %d\n",
+               num_online_nodes());
+        printk(KERN_INFO "Number of memory chunks in system = %d\n",
+               num_node_memblks);
 
-        if (!slit_table) return;
+        if (!slit_table)
+                return;
         memset(numa_slit, -1, sizeof(numa_slit));
-        for (i=0; i<slit_table->localities; i++) {
+        for (i = 0; i < slit_table->localities; i++) {
                 if (!pxm_bit_test(i))
                         continue;
                 node_from = pxm_to_nid_map[i];
-                for (j=0; j<slit_table->localities; j++) {
+                for (j = 0; j < slit_table->localities; j++) {
                         if (!pxm_bit_test(j))
                                 continue;
                         node_to = pxm_to_nid_map[j];
                         node_distance(node_from, node_to) =
-                                slit_table->entry[i*slit_table->localities + j];
+                            slit_table->entry[i * slit_table->localities + j];
                 }
         }
 
@@ -556,36 +556,41 @@ acpi_numa_arch_fixup (void)
         printk("ACPI 2.0 SLIT locality table:\n");
         for_each_online_node(i) {
                 for_each_online_node(j)
-                        printk("%03d ", node_distance(i,j));
+                    printk("%03d ", node_distance(i, j));
                 printk("\n");
         }
 #endif
 }
-#endif /* CONFIG_ACPI_NUMA */
+#endif                          /* CONFIG_ACPI_NUMA */
 
-unsigned int
-acpi_register_gsi (u32 gsi, int edge_level, int active_high_low)
+/*
+ * success: return IRQ number (>=0)
+ * failure: return < 0
+ */
+int acpi_register_gsi(u32 gsi, int edge_level, int active_high_low)
 {
         if (has_8259 && gsi < 16)
                 return isa_irq_to_vector(gsi);
 
         return iosapic_register_intr(gsi,
-                        (active_high_low == ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH : IOSAPIC_POL_LOW,
-                        (edge_level == ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE : IOSAPIC_LEVEL);
+                                     (active_high_low ==
+                                      ACPI_ACTIVE_HIGH) ? IOSAPIC_POL_HIGH :
+                                     IOSAPIC_POL_LOW,
+                                     (edge_level ==
+                                      ACPI_EDGE_SENSITIVE) ? IOSAPIC_EDGE :
+                                     IOSAPIC_LEVEL);
 }
+
 EXPORT_SYMBOL(acpi_register_gsi);
 
-#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
-void
-acpi_unregister_gsi (u32 gsi)
+void acpi_unregister_gsi(u32 gsi)
 {
         iosapic_unregister_intr(gsi);
 }
+
 EXPORT_SYMBOL(acpi_unregister_gsi);
-#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
 
-static int __init
-acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
+static int __init acpi_parse_fadt(unsigned long phys_addr, unsigned long size)
 {
         struct acpi_table_header *fadt_header;
         struct fadt_descriptor_rev2 *fadt;
@@ -593,11 +598,11 @@ acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
         if (!phys_addr || !size)
                 return -EINVAL;
 
-        fadt_header = (struct acpi_table_header *) __va(phys_addr);
+        fadt_header = (struct acpi_table_header *)__va(phys_addr);
         if (fadt_header->revision != 3)
-                return -ENODEV;         /* Only deal with ACPI 2.0 FADT */
+                return -ENODEV; /* Only deal with ACPI 2.0 FADT */
 
-        fadt = (struct fadt_descriptor_rev2 *) fadt_header;
+        fadt = (struct fadt_descriptor_rev2 *)fadt_header;
 
         if (!(fadt->iapc_boot_arch & BAF_8042_KEYBOARD_CONTROLLER))
                 acpi_kbd_controller_present = 0;
@@ -609,22 +614,19 @@ acpi_parse_fadt (unsigned long phys_addr, unsigned long size)
         return 0;
 }
 
-
-unsigned long __init
-acpi_find_rsdp (void)
+unsigned long __init acpi_find_rsdp(void)
 {
         unsigned long rsdp_phys = 0;
 
         if (efi.acpi20)
                 rsdp_phys = __pa(efi.acpi20);
         else if (efi.acpi)
-                printk(KERN_WARNING PREFIX "v1.0/r0.71 tables no longer supported\n");
+                printk(KERN_WARNING PREFIX
+                       "v1.0/r0.71 tables no longer supported\n");
         return rsdp_phys;
 }
 
-
-int __init
-acpi_boot_init (void)
+int __init acpi_boot_init(void)
 {
 
         /*
@@ -642,31 +644,43 @@ acpi_boot_init (void)
 
         /* Local APIC */
 
-        if (acpi_table_parse_madt(ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0)
-                printk(KERN_ERR PREFIX "Error parsing LAPIC address override entry\n");
+        if (acpi_table_parse_madt
+            (ACPI_MADT_LAPIC_ADDR_OVR, acpi_parse_lapic_addr_ovr, 0) < 0)
+                printk(KERN_ERR PREFIX
+                       "Error parsing LAPIC address override entry\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS) < 1)
-                printk(KERN_ERR PREFIX "Error parsing MADT - no LAPIC entries\n");
+        if (acpi_table_parse_madt(ACPI_MADT_LSAPIC, acpi_parse_lsapic, NR_CPUS)
+            < 1)
+                printk(KERN_ERR PREFIX
+                       "Error parsing MADT - no LAPIC entries\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0) < 0)
+        if (acpi_table_parse_madt(ACPI_MADT_LAPIC_NMI, acpi_parse_lapic_nmi, 0)
+            < 0)
                 printk(KERN_ERR PREFIX "Error parsing LAPIC NMI entry\n");
 
         /* I/O APIC */
 
-        if (acpi_table_parse_madt(ACPI_MADT_IOSAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)
-                printk(KERN_ERR PREFIX "Error parsing MADT - no IOSAPIC entries\n");
+        if (acpi_table_parse_madt
+            (ACPI_MADT_IOSAPIC, acpi_parse_iosapic, NR_IOSAPICS) < 1)
+                printk(KERN_ERR PREFIX
+                       "Error parsing MADT - no IOSAPIC entries\n");
 
         /* System-Level Interrupt Routing */
 
-        if (acpi_table_parse_madt(ACPI_MADT_PLAT_INT_SRC, acpi_parse_plat_int_src, ACPI_MAX_PLATFORM_INTERRUPTS) < 0)
-                printk(KERN_ERR PREFIX "Error parsing platform interrupt source entry\n");
+        if (acpi_table_parse_madt
+            (ACPI_MADT_PLAT_INT_SRC, acpi_parse_plat_int_src,
+             ACPI_MAX_PLATFORM_INTERRUPTS) < 0)
+                printk(KERN_ERR PREFIX
+                       "Error parsing platform interrupt source entry\n");
 
-        if (acpi_table_parse_madt(ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, 0) < 0)
-                printk(KERN_ERR PREFIX "Error parsing interrupt source overrides entry\n");
+        if (acpi_table_parse_madt
+            (ACPI_MADT_INT_SRC_OVR, acpi_parse_int_src_ovr, 0) < 0)
+                printk(KERN_ERR PREFIX
+                       "Error parsing interrupt source overrides entry\n");
 
         if (acpi_table_parse_madt(ACPI_MADT_NMI_SRC, acpi_parse_nmi_src, 0) < 0)
                 printk(KERN_ERR PREFIX "Error parsing NMI SRC entry\n");
-  skip_madt:
+      skip_madt:
 
         /*
          * FADT says whether a legacy keyboard controller is present.
@@ -681,8 +695,9 @@ acpi_boot_init (void)
         if (available_cpus == 0) {
                 printk(KERN_INFO "ACPI: Found 0 CPUS; assuming 1\n");
                 printk(KERN_INFO "CPU 0 (0x%04x)", hard_smp_processor_id());
-                smp_boot_data.cpu_phys_id[available_cpus] = hard_smp_processor_id();
-                available_cpus = 1; /* We've got at least one of these, no? */
+                smp_boot_data.cpu_phys_id[available_cpus] =
+                    hard_smp_processor_id();
+                available_cpus = 1;     /* We've got at least one of these, no? */
         }
         smp_boot_data.cpu_count = available_cpus;
 
@@ -691,8 +706,10 @@ acpi_boot_init (void)
         if (srat_num_cpus == 0) {
                 int cpu, i = 1;
                 for (cpu = 0; cpu < smp_boot_data.cpu_count; cpu++)
-                        if (smp_boot_data.cpu_phys_id[cpu] != hard_smp_processor_id())
-                                node_cpuid[i++].phys_id = smp_boot_data.cpu_phys_id[cpu];
+                        if (smp_boot_data.cpu_phys_id[cpu] !=
+                            hard_smp_processor_id())
+                                node_cpuid[i++].phys_id =
+                                    smp_boot_data.cpu_phys_id[cpu];
         }
 # endif
 #endif
@@ -700,12 +717,12 @@ acpi_boot_init (void)
         build_cpu_to_node_map();
 #endif
         /* Make boot-up look pretty */
-        printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus, total_cpus);
+        printk(KERN_INFO "%d CPUs available, %d CPUs total\n", available_cpus,
+               total_cpus);
         return 0;
 }
 
-int
-acpi_gsi_to_irq (u32 gsi, unsigned int *irq)
+int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
         int vector;
 
@@ -726,11 +743,10 @@ acpi_gsi_to_irq (u32 gsi, unsigned int *irq)
  */
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
 static
-int
-acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)
+int acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)
 {
 #ifdef CONFIG_ACPI_NUMA
-        int                     pxm_id;
+        int pxm_id;
 
         pxm_id = acpi_get_pxm(handle);
 
@@ -738,31 +754,28 @@ acpi_map_cpu2node(acpi_handle handle, int cpu, long physid)
          * Assuming that the container driver would have set the proximity
          * domain and would have initialized pxm_to_nid_map[pxm_id] && pxm_flag
          */
-        node_cpuid[cpu].nid = (pxm_id < 0) ? 0:
-                        pxm_to_nid_map[pxm_id];
+        node_cpuid[cpu].nid = (pxm_id < 0) ? 0 : pxm_to_nid_map[pxm_id];
 
-        node_cpuid[cpu].phys_id =  physid;
+        node_cpuid[cpu].phys_id = physid;
 #endif
-        return(0);
+        return (0);
 }
 
-
-int
-acpi_map_lsapic(acpi_handle handle, int *pcpu)
+int acpi_map_lsapic(acpi_handle handle, int *pcpu)
 {
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
         struct acpi_table_lsapic *lsapic;
         cpumask_t tmp_map;
         long physid;
         int cpu;
- 
+
         if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
                 return -EINVAL;
 
-        if (!buffer.length ||  !buffer.pointer)
+        if (!buffer.length || !buffer.pointer)
                 return -EINVAL;
- 
+
         obj = buffer.pointer;
         if (obj->type != ACPI_TYPE_BUFFER ||
             obj->buffer.length < sizeof(*lsapic)) {
@@ -778,7 +791,7 @@ acpi_map_lsapic(acpi_handle handle, int *pcpu)
                 return -EINVAL;
         }
 
-        physid = ((lsapic->id <<8) | (lsapic->eid));
+        physid = ((lsapic->id << 8) | (lsapic->eid));
 
         acpi_os_free(buffer.pointer);
         buffer.length = ACPI_ALLOCATE_BUFFER;
@@ -786,50 +799,49 @@ acpi_map_lsapic(acpi_handle handle, int *pcpu)
 
         cpus_complement(tmp_map, cpu_present_map);
         cpu = first_cpu(tmp_map);
-        if(cpu >= NR_CPUS)
+        if (cpu >= NR_CPUS)
                 return -EINVAL;
 
         acpi_map_cpu2node(handle, cpu, physid);
 
-        cpu_set(cpu, cpu_present_map);
+        cpu_set(cpu, cpu_present_map);
         ia64_cpu_to_sapicid[cpu] = physid;
         ia64_acpiid_to_sapicid[lsapic->acpi_id] = ia64_cpu_to_sapicid[cpu];
 
         *pcpu = cpu;
-        return(0);
+        return (0);
 }
-EXPORT_SYMBOL(acpi_map_lsapic);
 
+EXPORT_SYMBOL(acpi_map_lsapic);
 
-int
-acpi_unmap_lsapic(int cpu)
+int acpi_unmap_lsapic(int cpu)
 {
         int i;
 
-        for (i=0; i<MAX_SAPICS; i++) {
-                if (ia64_acpiid_to_sapicid[i] == ia64_cpu_to_sapicid[cpu]) {
-                        ia64_acpiid_to_sapicid[i] = -1;
-                        break;
-                }
-        }
+        for (i = 0; i < MAX_SAPICS; i++) {
+                if (ia64_acpiid_to_sapicid[i] == ia64_cpu_to_sapicid[cpu]) {
+                        ia64_acpiid_to_sapicid[i] = -1;
+                        break;
+                }
+        }
         ia64_cpu_to_sapicid[cpu] = -1;
-        cpu_clear(cpu,cpu_present_map);
+        cpu_clear(cpu, cpu_present_map);
 
 #ifdef CONFIG_ACPI_NUMA
         /* NUMA specific cleanup's */
 #endif
 
-        return(0);
+        return (0);
 }
+
 EXPORT_SYMBOL(acpi_unmap_lsapic);
-#endif /* CONFIG_ACPI_HOTPLUG_CPU */
- 
+#endif                          /* CONFIG_ACPI_HOTPLUG_CPU */
 
 #ifdef CONFIG_ACPI_NUMA
 acpi_status __devinit
-acpi_map_iosapic (acpi_handle handle, u32 depth, void *context, void **ret)
+acpi_map_iosapic(acpi_handle handle, u32 depth, void *context, void **ret)
 {
-        struct acpi_buffer buffer = {ACPI_ALLOCATE_BUFFER, NULL};
+        struct acpi_buffer buffer = { ACPI_ALLOCATE_BUFFER, NULL };
         union acpi_object *obj;
         struct acpi_table_iosapic *iosapic;
         unsigned int gsi_base;
@@ -878,10 +890,9 @@ acpi_map_iosapic (acpi_handle handle, u32 depth, void *context, void **ret)
         map_iosapic_to_node(gsi_base, node);
         return AE_OK;
 }
-#endif /* CONFIG_NUMA */
+#endif                          /* CONFIG_NUMA */
 
-int
-acpi_register_ioapic (acpi_handle handle, u64 phys_addr, u32 gsi_base)
+int acpi_register_ioapic(acpi_handle handle, u64 phys_addr, u32 gsi_base)
 {
         int err;
 
@@ -890,17 +901,18 @@ acpi_register_ioapic (acpi_handle handle, u64 phys_addr, u32 gsi_base)
 
 #if CONFIG_ACPI_NUMA
         acpi_map_iosapic(handle, 0, NULL, NULL);
-#endif /* CONFIG_ACPI_NUMA */
+#endif                          /* CONFIG_ACPI_NUMA */
 
         return 0;
 }
+
 EXPORT_SYMBOL(acpi_register_ioapic);
 
-int
-acpi_unregister_ioapic (acpi_handle handle, u32 gsi_base)
+int acpi_unregister_ioapic(acpi_handle handle, u32 gsi_base)
 {
         return iosapic_remove(gsi_base);
 }
+
 EXPORT_SYMBOL(acpi_unregister_ioapic);
 
-#endif /* CONFIG_ACPI_BOOT */
+#endif                          /* CONFIG_ACPI */
diff --git a/arch/ia64/kernel/domain.c b/arch/ia64/kernel/domain.c
deleted file mode 100644
index bbb8efe126b7..000000000000
--- a/arch/ia64/kernel/domain.c
+++ /dev/null
@@ -1,396 +0,0 @@
-/*
- * arch/ia64/kernel/domain.c
- * Architecture specific sched-domains builder.
- *
- * Copyright (C) 2004 Jesse Barnes
- * Copyright (C) 2004 Silicon Graphics, Inc.
- */
-
-#include <linux/sched.h>
-#include <linux/percpu.h>
-#include <linux/slab.h>
-#include <linux/cpumask.h>
-#include <linux/init.h>
-#include <linux/topology.h>
-#include <linux/nodemask.h>
-
-#define SD_NODES_PER_DOMAIN 16
-
-#ifdef CONFIG_NUMA
-/**
- * find_next_best_node - find the next node to include in a sched_domain
- * @node: node whose sched_domain we're building
- * @used_nodes: nodes already in the sched_domain
- *
- * Find the next node to include in a given scheduling domain.  Simply
- * finds the closest node not already in the @used_nodes map.
- *
- * Should use nodemask_t.
- */
-static int find_next_best_node(int node, unsigned long *used_nodes)
-{
-        int i, n, val, min_val, best_node = 0;
-
-        min_val = INT_MAX;
-
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                /* Start at @node */
-                n = (node + i) % MAX_NUMNODES;
-
-                if (!nr_cpus_node(n))
-                        continue;
-
-                /* Skip already used nodes */
-                if (test_bit(n, used_nodes))
-                        continue;
-
-                /* Simple min distance search */
-                val = node_distance(node, n);
-
-                if (val < min_val) {
-                        min_val = val;
-                        best_node = n;
-                }
-        }
-
-        set_bit(best_node, used_nodes);
-        return best_node;
-}
-
-/**
- * sched_domain_node_span - get a cpumask for a node's sched_domain
- * @node: node whose cpumask we're constructing
- * @size: number of nodes to include in this span
- *
- * Given a node, construct a good cpumask for its sched_domain to span.  It
- * should be one that prevents unnecessary balancing, but also spreads tasks
- * out optimally.
- */
-static cpumask_t sched_domain_node_span(int node)
-{
-        int i;
-        cpumask_t span, nodemask;
-        DECLARE_BITMAP(used_nodes, MAX_NUMNODES);
-
-        cpus_clear(span);
-        bitmap_zero(used_nodes, MAX_NUMNODES);
-
-        nodemask = node_to_cpumask(node);
-        cpus_or(span, span, nodemask);
-        set_bit(node, used_nodes);
-
-        for (i = 1; i < SD_NODES_PER_DOMAIN; i++) {
-                int next_node = find_next_best_node(node, used_nodes);
-                nodemask = node_to_cpumask(next_node);
-                cpus_or(span, span, nodemask);
-        }
-
-        return span;
-}
-#endif
-
-/*
- * At the moment, CONFIG_SCHED_SMT is never defined, but leave it in so we
- * can switch it on easily if needed.
- */
-#ifdef CONFIG_SCHED_SMT
-static DEFINE_PER_CPU(struct sched_domain, cpu_domains);
-static struct sched_group sched_group_cpus[NR_CPUS];
-static int cpu_to_cpu_group(int cpu)
-{
-        return cpu;
-}
-#endif
-
-static DEFINE_PER_CPU(struct sched_domain, phys_domains);
-static struct sched_group sched_group_phys[NR_CPUS];
-static int cpu_to_phys_group(int cpu)
-{
-#ifdef CONFIG_SCHED_SMT
-        return first_cpu(cpu_sibling_map[cpu]);
-#else
-        return cpu;
-#endif
-}
-
-#ifdef CONFIG_NUMA
-/*
- * The init_sched_build_groups can't handle what we want to do with node
- * groups, so roll our own. Now each node has its own list of groups which
- * gets dynamically allocated.
- */
-static DEFINE_PER_CPU(struct sched_domain, node_domains);
-static struct sched_group *sched_group_nodes[MAX_NUMNODES];
-
-static DEFINE_PER_CPU(struct sched_domain, allnodes_domains);
-static struct sched_group sched_group_allnodes[MAX_NUMNODES];
-
-static int cpu_to_allnodes_group(int cpu)
-{
-        return cpu_to_node(cpu);
-}
-#endif
-
-/*
- * Build sched domains for a given set of cpus and attach the sched domains
- * to the individual cpus
- */
-void build_sched_domains(const cpumask_t *cpu_map)
-{
-        int i;
-
-        /*
-         * Set up domains for cpus specified by the cpu_map.
-         */
-        for_each_cpu_mask(i, *cpu_map) {
-                int group;
-                struct sched_domain *sd = NULL, *p;
-                cpumask_t nodemask = node_to_cpumask(cpu_to_node(i));
-
-                cpus_and(nodemask, nodemask, *cpu_map);
-
-#ifdef CONFIG_NUMA
-                if (num_online_cpus()
-                                > SD_NODES_PER_DOMAIN*cpus_weight(nodemask)) {
-                        sd = &per_cpu(allnodes_domains, i);
-                        *sd = SD_ALLNODES_INIT;
-                        sd->span = *cpu_map;
-                        group = cpu_to_allnodes_group(i);
-                        sd->groups = &sched_group_allnodes[group];
-                        p = sd;
-                } else
-                        p = NULL;
-
-                sd = &per_cpu(node_domains, i);
-                *sd = SD_NODE_INIT;
-                sd->span = sched_domain_node_span(cpu_to_node(i));
-                sd->parent = p;
-                cpus_and(sd->span, sd->span, *cpu_map);
-#endif
-
-                p = sd;
-                sd = &per_cpu(phys_domains, i);
-                group = cpu_to_phys_group(i);
-                *sd = SD_CPU_INIT;
-                sd->span = nodemask;
-                sd->parent = p;
-                sd->groups = &sched_group_phys[group];
-
-#ifdef CONFIG_SCHED_SMT
-                p = sd;
-                sd = &per_cpu(cpu_domains, i);
-                group = cpu_to_cpu_group(i);
-                *sd = SD_SIBLING_INIT;
-                sd->span = cpu_sibling_map[i];
-                cpus_and(sd->span, sd->span, *cpu_map);
-                sd->parent = p;
-                sd->groups = &sched_group_cpus[group];
-#endif
-        }
-
-#ifdef CONFIG_SCHED_SMT
-        /* Set up CPU (sibling) groups */
-        for_each_cpu_mask(i, *cpu_map) {
-                cpumask_t this_sibling_map = cpu_sibling_map[i];
-                cpus_and(this_sibling_map, this_sibling_map, *cpu_map);
-                if (i != first_cpu(this_sibling_map))
-                        continue;
-
-                init_sched_build_groups(sched_group_cpus, this_sibling_map,
-                                                &cpu_to_cpu_group);
-        }
-#endif
-
-        /* Set up physical groups */
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                cpumask_t nodemask = node_to_cpumask(i);
-
-                cpus_and(nodemask, nodemask, *cpu_map);
-                if (cpus_empty(nodemask))
-                        continue;
-
-                init_sched_build_groups(sched_group_phys, nodemask,
-                                                &cpu_to_phys_group);
-        }
-
-#ifdef CONFIG_NUMA
-        init_sched_build_groups(sched_group_allnodes, *cpu_map,
-                                &cpu_to_allnodes_group);
-
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                /* Set up node groups */
-                struct sched_group *sg, *prev;
-                cpumask_t nodemask = node_to_cpumask(i);
-                cpumask_t domainspan;
-                cpumask_t covered = CPU_MASK_NONE;
-                int j;
-
-                cpus_and(nodemask, nodemask, *cpu_map);
-                if (cpus_empty(nodemask))
-                        continue;
-
-                domainspan = sched_domain_node_span(i);
-                cpus_and(domainspan, domainspan, *cpu_map);
-
-                sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL);
-                sched_group_nodes[i] = sg;
-                for_each_cpu_mask(j, nodemask) {
-                        struct sched_domain *sd;
-                        sd = &per_cpu(node_domains, j);
-                        sd->groups = sg;
-                        if (sd->groups == NULL) {
-                                /* Turn off balancing if we have no groups */
-                                sd->flags = 0;
-                        }
-                }
-                if (!sg) {
-                        printk(KERN_WARNING
-                        "Can not alloc domain group for node %d\n", i);
-                        continue;
-                }
-                sg->cpu_power = 0;
-                sg->cpumask = nodemask;
-                cpus_or(covered, covered, nodemask);
-                prev = sg;
-
-                for (j = 0; j < MAX_NUMNODES; j++) {
-                        cpumask_t tmp, notcovered;
-                        int n = (i + j) % MAX_NUMNODES;
-
-                        cpus_complement(notcovered, covered);
-                        cpus_and(tmp, notcovered, *cpu_map);
-                        cpus_and(tmp, tmp, domainspan);
-                        if (cpus_empty(tmp))
-                                break;
-
-                        nodemask = node_to_cpumask(n);
-                        cpus_and(tmp, tmp, nodemask);
-                        if (cpus_empty(tmp))
-                                continue;
-
-                        sg = kmalloc(sizeof(struct sched_group), GFP_KERNEL);
-                        if (!sg) {
-                                printk(KERN_WARNING
-                                "Can not alloc domain group for node %d\n", j);
-                                break;
-                        }
-                        sg->cpu_power = 0;
-                        sg->cpumask = tmp;
-                        cpus_or(covered, covered, tmp);
-                        prev->next = sg;
-                        prev = sg;
-                }
-                prev->next = sched_group_nodes[i];
-        }
-#endif
-
-        /* Calculate CPU power for physical packages and nodes */
-        for_each_cpu_mask(i, *cpu_map) {
-                int power;
-                struct sched_domain *sd;
-#ifdef CONFIG_SCHED_SMT
-                sd = &per_cpu(cpu_domains, i);
-                power = SCHED_LOAD_SCALE;
-                sd->groups->cpu_power = power;
-#endif
-
-                sd = &per_cpu(phys_domains, i);
-                power = SCHED_LOAD_SCALE + SCHED_LOAD_SCALE *
-                                (cpus_weight(sd->groups->cpumask)-1) / 10;
-                sd->groups->cpu_power = power;
-
-#ifdef CONFIG_NUMA
-                sd = &per_cpu(allnodes_domains, i);
-                if (sd->groups) {
-                        power = SCHED_LOAD_SCALE + SCHED_LOAD_SCALE *
-                                (cpus_weight(sd->groups->cpumask)-1) / 10;
-                        sd->groups->cpu_power = power;
-                }
-#endif
-        }
-
-#ifdef CONFIG_NUMA
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                struct sched_group *sg = sched_group_nodes[i];
-                int j;
-
-                if (sg == NULL)
-                        continue;
-next_sg:
-                for_each_cpu_mask(j, sg->cpumask) {
-                        struct sched_domain *sd;
-                        int power;
-
-                        sd = &per_cpu(phys_domains, j);
-                        if (j != first_cpu(sd->groups->cpumask)) {
-                                /*
-                                 * Only add "power" once for each
-                                 * physical package.
-                                 */
-                                continue;
-                        }
-                        power = SCHED_LOAD_SCALE + SCHED_LOAD_SCALE *
-                                (cpus_weight(sd->groups->cpumask)-1) / 10;
-
-                        sg->cpu_power += power;
-                }
-                sg = sg->next;
-                if (sg != sched_group_nodes[i])
-                        goto next_sg;
-        }
-#endif
-
-        /* Attach the domains */
-        for_each_cpu_mask(i, *cpu_map) {
-                struct sched_domain *sd;
-#ifdef CONFIG_SCHED_SMT
-                sd = &per_cpu(cpu_domains, i);
-#else
-                sd = &per_cpu(phys_domains, i);
-#endif
-                cpu_attach_domain(sd, i);
-        }
-}
-/*
- * Set up scheduler domains and groups.  Callers must hold the hotplug lock.
- */
-void arch_init_sched_domains(const cpumask_t *cpu_map)
-{
-        cpumask_t cpu_default_map;
-
-        /*
-         * Setup mask for cpus without special case scheduling requirements.
-         * For now this just excludes isolated cpus, but could be used to
-         * exclude other special cases in the future.
-         */
-        cpus_andnot(cpu_default_map, *cpu_map, cpu_isolated_map);
-
-        build_sched_domains(&cpu_default_map);
-}
-
-void arch_destroy_sched_domains(const cpumask_t *cpu_map)
-{
-#ifdef CONFIG_NUMA
-        int i;
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                cpumask_t nodemask = node_to_cpumask(i);
-                struct sched_group *oldsg, *sg = sched_group_nodes[i];
-
-                cpus_and(nodemask, nodemask, *cpu_map);
-                if (cpus_empty(nodemask))
-                        continue;
-
-                if (sg == NULL)
-                        continue;
-                sg = sg->next;
-next_sg:
-                oldsg = sg;
-                sg = sg->next;
-                kfree(oldsg);
-                if (oldsg != sched_group_nodes[i])
-                        goto next_sg;
-                sched_group_nodes[i] = NULL;
-        }
-#endif
-}
-
diff --git a/arch/ia64/kernel/entry.S b/arch/ia64/kernel/entry.S
index 9be53e1ea404..ba0b6a1f429f 100644
--- a/arch/ia64/kernel/entry.S
+++ b/arch/ia64/kernel/entry.S
@@ -37,7 +37,7 @@
 #include <asm/cache.h>
 #include <asm/errno.h>
 #include <asm/kregs.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/percpu.h>
 #include <asm/processor.h>
@@ -204,9 +204,6 @@ GLOBAL_ENTRY(ia64_switch_to)
 (p6)    br.cond.dpnt .map
         ;;
 .done:
-(p6)    ssm psr.ic                      // if we had to map, reenable the psr.ic bit FIRST!!!
-        ;;
-(p6)    srlz.d
         ld8 sp=[r21]                    // load kernel stack pointer of new task
         mov IA64_KR(CURRENT)=in0        // update "current" application register
         mov r8=r13                      // return pointer to previously running task
@@ -234,6 +231,9 @@ GLOBAL_ENTRY(ia64_switch_to)
         mov IA64_KR(CURRENT_STACK)=r26  // remember last page we mapped...
         ;;
         itr.d dtr[r25]=r23              // wire in new mapping...
+        ssm psr.ic                      // reenable the psr.ic bit
+        ;;
+        srlz.d
         br.cond.sptk .done
 END(ia64_switch_to)
 
@@ -470,6 +470,29 @@ ENTRY(load_switch_stack)
         br.cond.sptk.many b7
 END(load_switch_stack)
 
+GLOBAL_ENTRY(prefetch_stack)
+        add r14 = -IA64_SWITCH_STACK_SIZE, sp
+        add r15 = IA64_TASK_THREAD_KSP_OFFSET, in0
+        ;;
+        ld8 r16 = [r15]                         // load next's stack pointer
+        lfetch.fault.excl [r14], 128
+        ;;
+        lfetch.fault.excl [r14], 128
+        lfetch.fault [r16], 128
+        ;;
+        lfetch.fault.excl [r14], 128
+        lfetch.fault [r16], 128
+        ;;
+        lfetch.fault.excl [r14], 128
+        lfetch.fault [r16], 128
+        ;;
+        lfetch.fault.excl [r14], 128
+        lfetch.fault [r16], 128
+        ;;
+        lfetch.fault [r16], 128
+        br.ret.sptk.many rp
+END(prefetch_switch_stack)
+
 GLOBAL_ENTRY(execve)
         mov r15=__NR_execve                     // put syscall number in place
         break __BREAK_SYSCALL
diff --git a/arch/ia64/kernel/fsys.S b/arch/ia64/kernel/fsys.S
index 7d7684a369d3..2ddbac6f4999 100644
--- a/arch/ia64/kernel/fsys.S
+++ b/arch/ia64/kernel/fsys.S
@@ -14,7 +14,7 @@
 
 #include <asm/asmmacro.h>
 #include <asm/errno.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/percpu.h>
 #include <asm/thread_info.h>
 #include <asm/sal.h>
diff --git a/arch/ia64/kernel/gate.S b/arch/ia64/kernel/gate.S
index 86948ce63e43..86064ca98952 100644
--- a/arch/ia64/kernel/gate.S
+++ b/arch/ia64/kernel/gate.S
@@ -10,7 +10,7 @@
 
 #include <asm/asmmacro.h>
 #include <asm/errno.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/sigcontext.h>
 #include <asm/system.h>
 #include <asm/unistd.h>
diff --git a/arch/ia64/kernel/head.S b/arch/ia64/kernel/head.S
index 8d3a9291b47f..bfe65b2e8621 100644
--- a/arch/ia64/kernel/head.S
+++ b/arch/ia64/kernel/head.S
@@ -25,7 +25,7 @@
 #include <asm/fpu.h>
 #include <asm/kregs.h>
 #include <asm/mmu_context.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pal.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index 7936b62f7a2e..574084f343fa 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -561,7 +561,7 @@ static inline int vector_is_shared (int vector)
         return (iosapic_intr_info[vector].count > 1);
 }
 
-static void
+static int
 register_intr (unsigned int gsi, int vector, unsigned char delivery,
                unsigned long polarity, unsigned long trigger)
 {
@@ -576,7 +576,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
         index = find_iosapic(gsi);
         if (index < 0) {
                 printk(KERN_WARNING "%s: No IOSAPIC for GSI %u\n", __FUNCTION__, gsi);
-                return;
+                return -ENODEV;
         }
 
         iosapic_address = iosapic_lists[index].addr;
@@ -587,7 +587,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
                 rte = iosapic_alloc_rte();
                 if (!rte) {
                         printk(KERN_WARNING "%s: cannot allocate memory\n", __FUNCTION__);
-                        return;
+                        return -ENOMEM;
                 }
 
                 rte_index = gsi - gsi_base;
@@ -603,7 +603,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
                 struct iosapic_intr_info *info = &iosapic_intr_info[vector];
                 if (info->trigger != trigger || info->polarity != polarity) {
                         printk (KERN_WARNING "%s: cannot override the interrupt\n", __FUNCTION__);
-                        return;
+                        return -EINVAL;
                 }
         }
 
@@ -623,6 +623,7 @@ register_intr (unsigned int gsi, int vector, unsigned char delivery,
                                __FUNCTION__, vector, idesc->handler->typename, irq_type->typename);
                 idesc->handler = irq_type;
         }
+        return 0;
 }
 
 static unsigned int
@@ -710,7 +711,7 @@ int
 iosapic_register_intr (unsigned int gsi,
                        unsigned long polarity, unsigned long trigger)
 {
-        int vector, mask = 1;
+        int vector, mask = 1, err;
         unsigned int dest;
         unsigned long flags;
         struct iosapic_rte_info *rte;
@@ -737,8 +738,8 @@ again:
         vector = assign_irq_vector(AUTO_ASSIGN);
         if (vector < 0) {
                 vector = iosapic_find_sharable_vector(trigger, polarity);
-                if (vector < 0)
-                        panic("%s: out of interrupt vectors!\n", __FUNCTION__);
+                if (vector < 0)
+                        return -ENOSPC;
         }
 
         spin_lock_irqsave(&irq_descp(vector)->lock, flags);
@@ -753,8 +754,13 @@ again:
                 }
 
                 dest = get_target_cpu(gsi, vector);
-                register_intr(gsi, vector, IOSAPIC_LOWEST_PRIORITY,
+                err = register_intr(gsi, vector, IOSAPIC_LOWEST_PRIORITY,
                               polarity, trigger);
+                if (err < 0) {
+                        spin_unlock(&iosapic_lock);
+                        spin_unlock_irqrestore(&irq_descp(vector)->lock, flags);
+                        return err;
+                }
 
                 /*
                  * If the vector is shared and already unmasked for
@@ -776,7 +782,6 @@ again:
         return vector;
 }
 
-#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 void
 iosapic_unregister_intr (unsigned int gsi)
 {
@@ -859,7 +864,6 @@ iosapic_unregister_intr (unsigned int gsi)
         spin_unlock(&iosapic_lock);
         spin_unlock_irqrestore(&idesc->lock, flags);
 }
-#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
 
 /*
  * ACPI calls this when it finds an entry for a platform interrupt.
diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c
index 28f2aadc38d0..205d98028261 100644
--- a/arch/ia64/kernel/irq.c
+++ b/arch/ia64/kernel/irq.c
@@ -91,23 +91,8 @@ skip:
 }
 
 #ifdef CONFIG_SMP
-/*
- * This is updated when the user sets irq affinity via /proc
- */
-static cpumask_t __cacheline_aligned pending_irq_cpumask[NR_IRQS];
-static unsigned long pending_irq_redir[BITS_TO_LONGS(NR_IRQS)];
-
 static char irq_redir [NR_IRQS]; // = { [0 ... NR_IRQS-1] = 1 };
 
-/*
- * Arch specific routine for deferred write to iosapic rte to reprogram
- * intr destination.
- */
-void proc_set_irq_affinity(unsigned int irq, cpumask_t mask_val)
-{
-        pending_irq_cpumask[irq] = mask_val;
-}
-
 void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
 {
         cpumask_t mask = CPU_MASK_NONE;
@@ -116,32 +101,10 @@ void set_irq_affinity_info (unsigned int irq, int hwid, int redir)
 
         if (irq < NR_IRQS) {
                 irq_affinity[irq] = mask;
+                set_irq_info(irq, mask);
                 irq_redir[irq] = (char) (redir & 0xff);
         }
 }
-
-
-void move_irq(int irq)
-{
-        /* note - we hold desc->lock */
-        cpumask_t tmp;
-        irq_desc_t *desc = irq_descp(irq);
-        int redir = test_bit(irq, pending_irq_redir);
-
-        if (unlikely(!desc->handler->set_affinity))
-                return;
-
-        if (!cpus_empty(pending_irq_cpumask[irq])) {
-                cpus_and(tmp, pending_irq_cpumask[irq], cpu_online_map);
-                if (unlikely(!cpus_empty(tmp))) {
-                        desc->handler->set_affinity(irq | (redir ? IA64_IRQ_REDIRECTED : 0),
-                                                    pending_irq_cpumask[irq]);
-                }
-                cpus_clear(pending_irq_cpumask[irq]);
-        }
-}
-
-
 #endif /* CONFIG_SMP */
 
 #ifdef CONFIG_HOTPLUG_CPU
diff --git a/arch/ia64/kernel/ivt.S b/arch/ia64/kernel/ivt.S
index 3bb3a13c4047..3ba8384cb43d 100644
--- a/arch/ia64/kernel/ivt.S
+++ b/arch/ia64/kernel/ivt.S
@@ -44,7 +44,7 @@
 #include <asm/break.h>
 #include <asm/ia32.h>
 #include <asm/kregs.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/ptrace.h>
diff --git a/arch/ia64/kernel/jprobes.S b/arch/ia64/kernel/jprobes.S
index b7fa3ccd2b0f..2323377e3695 100644
--- a/arch/ia64/kernel/jprobes.S
+++ b/arch/ia64/kernel/jprobes.S
@@ -49,6 +49,7 @@
         /*
          * void jprobe_break(void)
          */
+        .section .kprobes.text, "ax"
 ENTRY(jprobe_break)
         break.m 0x80300
 END(jprobe_break)
diff --git a/arch/ia64/kernel/kprobes.c b/arch/ia64/kernel/kprobes.c
index 884f5cd27d8a..471086b808a4 100644
--- a/arch/ia64/kernel/kprobes.c
+++ b/arch/ia64/kernel/kprobes.c
@@ -87,12 +87,25 @@ static enum instruction_type bundle_encoding[32][3] = {
  * is IP relative instruction and update the kprobe
  * inst flag accordingly
  */
-static void update_kprobe_inst_flag(uint template, uint  slot, uint major_opcode,
-        unsigned long kprobe_inst, struct kprobe *p)
+static void __kprobes update_kprobe_inst_flag(uint template, uint  slot,
+                                              uint major_opcode,
+                                              unsigned long kprobe_inst,
+                                              struct kprobe *p)
 {
         p->ainsn.inst_flag = 0;
         p->ainsn.target_br_reg = 0;
 
+        /* Check for Break instruction
+         * Bits 37:40 Major opcode to be zero
+         * Bits 27:32 X6 to be zero
+         * Bits 32:35 X3 to be zero
+         */
+        if ((!major_opcode) && (!((kprobe_inst >> 27) & 0x1FF)) ) {
+                /* is a break instruction */
+                p->ainsn.inst_flag |= INST_FLAG_BREAK_INST;
+                return;
+        }
+
         if (bundle_encoding[template][slot] == B) {
                 switch (major_opcode) {
                   case INDIRECT_CALL_OPCODE:
@@ -126,8 +139,10 @@ static void update_kprobe_inst_flag(uint template, uint  slot, uint major_opcode
  * Returns 0 if supported
  * Returns -EINVAL if unsupported
  */
-static int unsupported_inst(uint template, uint  slot, uint major_opcode,
-        unsigned long kprobe_inst, struct kprobe *p)
+static int __kprobes unsupported_inst(uint template, uint  slot,
+                                      uint major_opcode,
+                                      unsigned long kprobe_inst,
+                                      struct kprobe *p)
 {
         unsigned long addr = (unsigned long)p->addr;
 
@@ -168,8 +183,9 @@ static int unsupported_inst(uint template, uint  slot, uint major_opcode,
  * on which we are inserting kprobe is cmp instruction
  * with ctype as unc.
  */
-static uint is_cmp_ctype_unc_inst(uint template, uint slot, uint major_opcode,
-unsigned long kprobe_inst)
+static uint __kprobes is_cmp_ctype_unc_inst(uint template, uint slot,
+                                            uint major_opcode,
+                                            unsigned long kprobe_inst)
 {
         cmp_inst_t cmp_inst;
         uint ctype_unc = 0;
@@ -201,8 +217,10 @@ out:
  * In this function we override the bundle with
  * the break instruction at the given slot.
  */
-static void prepare_break_inst(uint template, uint  slot, uint major_opcode,
-        unsigned long kprobe_inst, struct kprobe *p)
+static void __kprobes prepare_break_inst(uint template, uint  slot,
+                                         uint major_opcode,
+                                         unsigned long kprobe_inst,
+                                         struct kprobe *p)
 {
         unsigned long break_inst = BREAK_INST;
         bundle_t *bundle = &p->ainsn.insn.bundle;
@@ -271,7 +289,8 @@ static inline int in_ivt_functions(unsigned long addr)
                 && addr < (unsigned long)__end_ivt_text);
 }
 
-static int valid_kprobe_addr(int template, int slot, unsigned long addr)
+static int __kprobes valid_kprobe_addr(int template, int slot,
+                                       unsigned long addr)
 {
         if ((slot > 2) || ((bundle_encoding[template][1] == L) && slot > 1)) {
                 printk(KERN_WARNING "Attempting to insert unaligned kprobe "
@@ -323,7 +342,7 @@ static void kretprobe_trampoline(void)
  *    - cleanup by marking the instance as unused
  *    - long jump back to the original return address
  */
-int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head;
@@ -381,7 +400,8 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+                                      struct pt_regs *regs)
 {
         struct kretprobe_instance *ri;
 
@@ -399,7 +419,7 @@ void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
         }
 }
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         unsigned long addr = (unsigned long) p->addr;
         unsigned long *kprobe_addr = (unsigned long *)(addr & ~0xFULL);
@@ -430,7 +450,7 @@ int arch_prepare_kprobe(struct kprobe *p)
         return 0;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         unsigned long addr = (unsigned long)p->addr;
         unsigned long arm_addr = addr & ~0xFULL;
@@ -439,7 +459,7 @@ void arch_arm_kprobe(struct kprobe *p)
         flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         unsigned long addr = (unsigned long)p->addr;
         unsigned long arm_addr = addr & ~0xFULL;
@@ -449,7 +469,7 @@ void arch_disarm_kprobe(struct kprobe *p)
         flush_icache_range(arm_addr, arm_addr + sizeof(bundle_t));
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
 }
 
@@ -461,7 +481,7 @@ void arch_remove_kprobe(struct kprobe *p)
  * to original stack address, handle the case where we need to fixup the
  * relative IP address and/or fixup branch register.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         unsigned long bundle_addr = ((unsigned long) (&p->opcode.bundle)) & ~0xFULL;
         unsigned long resume_addr = (unsigned long)p->addr & ~0xFULL;
@@ -528,13 +548,16 @@ turn_ss_off:
         ia64_psr(regs)->ss = 0;
 }
 
-static void prepare_ss(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes prepare_ss(struct kprobe *p, struct pt_regs *regs)
 {
         unsigned long bundle_addr = (unsigned long) &p->opcode.bundle;
         unsigned long slot = (unsigned long)p->addr & 0xf;
 
-        /* Update instruction pointer (IIP) and slot number (IPSR.ri) */
-        regs->cr_iip = bundle_addr & ~0xFULL;
+        /* single step inline if break instruction */
+        if (p->ainsn.inst_flag == INST_FLAG_BREAK_INST)
+                regs->cr_iip = (unsigned long)p->addr & ~0xFULL;
+        else
+                regs->cr_iip = bundle_addr & ~0xFULL;
 
         if (slot > 2)
                 slot = 0;
@@ -545,7 +568,39 @@ static void prepare_ss(struct kprobe *p, struct pt_regs *regs)
         ia64_psr(regs)->ss = 1;
 }
 
-static int pre_kprobes_handler(struct die_args *args)
+static int __kprobes is_ia64_break_inst(struct pt_regs *regs)
+{
+        unsigned int slot = ia64_psr(regs)->ri;
+        unsigned int template, major_opcode;
+        unsigned long kprobe_inst;
+        unsigned long *kprobe_addr = (unsigned long *)regs->cr_iip;
+        bundle_t bundle;
+
+        memcpy(&bundle, kprobe_addr, sizeof(bundle_t));
+        template = bundle.quad0.template;
+
+        /* Move to slot 2, if bundle is MLX type and kprobe slot is 1 */
+        if (slot == 1 && bundle_encoding[template][1] == L)
+                slot++;
+
+        /* Get Kprobe probe instruction at given slot*/
+        get_kprobe_inst(&bundle, slot, &kprobe_inst, &major_opcode);
+
+        /* For break instruction,
+         * Bits 37:40 Major opcode to be zero
+         * Bits 27:32 X6 to be zero
+         * Bits 32:35 X3 to be zero
+         */
+        if (major_opcode || ((kprobe_inst >> 27) & 0x1FF) ) {
+                /* Not a break instruction */
+                return 0;
+        }
+
+        /* Is a break instruction */
+        return 1;
+}
+
+static int __kprobes pre_kprobes_handler(struct die_args *args)
 {
         struct kprobe *p;
         int ret = 0;
@@ -558,7 +613,9 @@ static int pre_kprobes_handler(struct die_args *args)
         if (kprobe_running()) {
                 p = get_kprobe(addr);
                 if (p) {
-                        if (kprobe_status == KPROBE_HIT_SS) {
+                        if ( (kprobe_status == KPROBE_HIT_SS) &&
+                             (p->ainsn.inst_flag == INST_FLAG_BREAK_INST)) {
+                                ia64_psr(regs)->ss = 0;
                                 unlock_kprobes();
                                 goto no_kprobe;
                         }
@@ -592,6 +649,19 @@ static int pre_kprobes_handler(struct die_args *args)
         p = get_kprobe(addr);
         if (!p) {
                 unlock_kprobes();
+                if (!is_ia64_break_inst(regs)) {
+                        /*
+                         * The breakpoint instruction was removed right
+                         * after we hit it.  Another cpu has removed
+                         * either a probepoint or a debugger breakpoint
+                         * at this address.  In either case, no further
+                         * handling of this interrupt is appropriate.
+                         */
+                        ret = 1;
+
+                }
+
+                /* Not one of our break, let kernel handle it */
                 goto no_kprobe;
         }
 
@@ -616,7 +686,7 @@ no_kprobe:
         return ret;
 }
 
-static int post_kprobes_handler(struct pt_regs *regs)
+static int __kprobes post_kprobes_handler(struct pt_regs *regs)
 {
         if (!kprobe_running())
                 return 0;
@@ -641,7 +711,7 @@ out:
         return 1;
 }
 
-static int kprobes_fault_handler(struct pt_regs *regs, int trapnr)
+static int __kprobes kprobes_fault_handler(struct pt_regs *regs, int trapnr)
 {
         if (!kprobe_running())
                 return 0;
@@ -659,8 +729,8 @@ static int kprobes_fault_handler(struct pt_regs *regs, int trapnr)
         return 0;
 }
 
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         switch(val) {
@@ -681,7 +751,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         return NOTIFY_DONE;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
         unsigned long addr = ((struct fnptr *)(jp->entry))->ip;
@@ -703,7 +773,7 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         *regs = jprobe_saved_regs;
         return 1;
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 4ebbf3974381..8d484204a3ff 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -491,12 +491,7 @@ init_handler_platform (pal_min_state_area_t *ms,
         unw_init_from_interruption(&info, current, pt, sw);
         ia64_do_show_stack(&info, NULL);
 
-#ifdef CONFIG_SMP
-        /* read_trylock() would be handy... */
-        if (!tasklist_lock.write_lock)
-                read_lock(&tasklist_lock);
-#endif
-        {
+        if (read_trylock(&tasklist_lock)) {
                 struct task_struct *g, *t;
                 do_each_thread (g, t) {
                         if (t == current)
@@ -506,10 +501,6 @@ init_handler_platform (pal_min_state_area_t *ms,
                         show_stack(t, NULL);
                 } while_each_thread (g, t);
         }
-#ifdef CONFIG_SMP
-        if (!tasklist_lock.write_lock)
-                read_unlock(&tasklist_lock);
-#endif
 
         printk("\nINIT dump complete.  Please reboot now.\n");
         while (1);                      /* hang city if no debugger */
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index f1201ac8a116..1650353e3f77 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -38,6 +38,7 @@
 #include <linux/pagemap.h>
 #include <linux/mount.h>
 #include <linux/bitops.h>
+#include <linux/rcupdate.h>
 
 #include <asm/errno.h>
 #include <asm/intrinsics.h>
@@ -496,7 +497,7 @@ typedef struct {
 static pfm_stats_t              pfm_stats[NR_CPUS];
 static pfm_session_t            pfm_sessions;   /* global sessions information */
 
-static spinlock_t pfm_alt_install_check = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pfm_alt_install_check);
 static pfm_intr_handler_desc_t  *pfm_alt_intr_handler;
 
 static struct proc_dir_entry    *perfmon_dir;
@@ -2217,15 +2218,17 @@ static void
 pfm_free_fd(int fd, struct file *file)
 {
         struct files_struct *files = current->files;
+        struct fdtable *fdt = files_fdtable(files);
 
         /* 
          * there ie no fd_uninstall(), so we do it here
          */
         spin_lock(&files->file_lock);
-        files->fd[fd] = NULL;
+        rcu_assign_pointer(fdt->fd[fd], NULL);
         spin_unlock(&files->file_lock);
 
-        if (file) put_filp(file);
+        if (file)
+                put_filp(file);
         put_unused_fd(fd);
 }
 
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 84f89da7c640..1f5c26dbe705 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -384,7 +384,7 @@ setup_arch (char **cmdline_p)
         if (early_console_setup(*cmdline_p) == 0)
                 mark_bsp_online();
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /* Initialize the ACPI boot-time table parser */
         acpi_table_init();
 # ifdef CONFIG_ACPI_NUMA
@@ -420,7 +420,7 @@ setup_arch (char **cmdline_p)
 
         cpu_init();     /* initialize the bootstrap CPU */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         acpi_boot_init();
 #endif
 
diff --git a/arch/ia64/kernel/topology.c b/arch/ia64/kernel/topology.c
index 92ff46ad21e2..706b7734e191 100644
--- a/arch/ia64/kernel/topology.c
+++ b/arch/ia64/kernel/topology.c
@@ -36,7 +36,7 @@ int arch_register_cpu(int num)
         parent = &sysfs_nodes[cpu_to_node(num)];
 #endif /* CONFIG_NUMA */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /*
          * If CPEI cannot be re-targetted, and this is
          * CPEI target, then dont create the control file
diff --git a/arch/ia64/kernel/traps.c b/arch/ia64/kernel/traps.c
index 4440c8343fa4..f970359e7edf 100644
--- a/arch/ia64/kernel/traps.c
+++ b/arch/ia64/kernel/traps.c
@@ -15,6 +15,7 @@
 #include <linux/vt_kern.h>              /* For unblank_screen() */
 #include <linux/module.h>       /* for EXPORT_SYMBOL */
 #include <linux/hardirq.h>
+#include <linux/kprobes.h>
 
 #include <asm/fpswa.h>
 #include <asm/ia32.h>
@@ -122,7 +123,7 @@ die_if_kernel (char *str, struct pt_regs *regs, long err)
 }
 
 void
-ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
+__kprobes ia64_bad_break (unsigned long break_num, struct pt_regs *regs)
 {
         siginfo_t siginfo;
         int sig, code;
@@ -444,7 +445,7 @@ ia64_illegal_op_fault (unsigned long ec, long arg1, long arg2, long arg3,
         return rv;
 }
 
-void
+void __kprobes
 ia64_fault (unsigned long vector, unsigned long isr, unsigned long ifa,
             unsigned long iim, unsigned long itir, long arg5, long arg6,
             long arg7, struct pt_regs regs)
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index a676e79e0681..30d8564e9603 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -48,6 +48,7 @@ SECTIONS
         *(.text)
         SCHED_TEXT
         LOCK_TEXT
+        KPROBES_TEXT
         *(.gnu.linkonce.t*)
     }
   .text2 : AT(ADDR(.text2) - LOAD_OFFSET)
diff --git a/arch/ia64/lib/flush.S b/arch/ia64/lib/flush.S
index 3e2cfa2c6d39..2a0d27f2f21b 100644
--- a/arch/ia64/lib/flush.S
+++ b/arch/ia64/lib/flush.S
@@ -20,6 +20,7 @@
          *
          *      Note: "in0" and "in1" are preserved for debugging purposes.
          */
+        .section .kprobes.text,"ax"
 GLOBAL_ENTRY(flush_icache_range)
 
         .prologue
diff --git a/arch/ia64/lib/memcpy_mck.S b/arch/ia64/lib/memcpy_mck.S
index 6f308e62c137..46c9331e7ab5 100644
--- a/arch/ia64/lib/memcpy_mck.S
+++ b/arch/ia64/lib/memcpy_mck.S
@@ -625,8 +625,11 @@ EK(.ex_handler,  (p17)	st8	[dst1]=r39,8);						\
         clrrrb
         ;;
         alloc   saved_pfs_stack=ar.pfs,3,3,3,0
+        cmp.lt  p8,p0=A,r0
         sub     B = dst0, saved_in0     // how many byte copied so far
         ;;
+(p8)    mov     A = 0;                  // A shouldn't be negative, cap it
+        ;;
         sub     C = A, B
         sub     D = saved_in2, A
         ;;
diff --git a/arch/ia64/mm/fault.c b/arch/ia64/mm/fault.c
index ff62551eb3a1..3c32af910d60 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -9,6 +9,7 @@
 #include <linux/mm.h>
 #include <linux/smp_lock.h>
 #include <linux/interrupt.h>
+#include <linux/kprobes.h>
 
 #include <asm/pgtable.h>
 #include <asm/processor.h>
@@ -76,7 +77,7 @@ mapped_kernel_page_is_present (unsigned long address)
         return pte_present(pte);
 }
 
-void
+void __kprobes
 ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *regs)
 {
         int signal = SIGSEGV, code = SEGV_MAPERR;
@@ -229,9 +230,6 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
                 return;
         }
 
-        if (ia64_done_with_exception(regs))
-                return;
-
         /*
          * Since we have no vma's for region 5, we might get here even if the address is
          * valid, due to the VHPT walker inserting a non present translation that becomes
@@ -242,6 +240,9 @@ ia64_do_page_fault (unsigned long address, unsigned long isr, struct pt_regs *re
         if (REGION_NUMBER(address) == 5 && mapped_kernel_page_is_present(address))
                 return;
 
+        if (ia64_done_with_exception(regs))
+                return;
+
         /*
          * Oops. The kernel tried to access some bad page. We'll have to terminate things
          * with extreme prejudice.
diff --git a/arch/ia64/pci/pci.c b/arch/ia64/pci/pci.c
index 9977c122e9fa..9b5de589b82f 100644
--- a/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@ -498,13 +498,11 @@ pcibios_enable_device (struct pci_dev *dev, int mask)
         return acpi_pci_irq_enable(dev);
 }
 
-#ifdef CONFIG_ACPI_DEALLOCATE_IRQ
 void
 pcibios_disable_device (struct pci_dev *dev)
 {
         acpi_pci_irq_disable(dev);
 }
-#endif /* CONFIG_ACPI_DEALLOCATE_IRQ */
 
 void
 pcibios_align_resource (void *data, struct resource *res,
diff --git a/arch/ia64/sn/kernel/io_init.c b/arch/ia64/sn/kernel/io_init.c
index 4564ed0b5ff3..906622d9f933 100644
--- a/arch/ia64/sn/kernel/io_init.c
+++ b/arch/ia64/sn/kernel/io_init.c
@@ -431,7 +431,7 @@ void sn_bus_store_sysdata(struct pci_dev *dev)
 {
         struct sysdata_el *element;
 
-        element = kcalloc(1, sizeof(struct sysdata_el), GFP_KERNEL);
+        element = kzalloc(sizeof(struct sysdata_el), GFP_KERNEL);
         if (!element) {
                 dev_dbg(dev, "%s: out of memory!\n", __FUNCTION__);
                 return;
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 9fc74631ba8a..01d18b7b5bb3 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -23,7 +23,7 @@ static void force_interrupt(int irq);
 static void register_intr_pda(struct sn_irq_info *sn_irq_info);
 static void unregister_intr_pda(struct sn_irq_info *sn_irq_info);
 
-extern int sn_force_interrupt_flag;
+int sn_force_interrupt_flag = 1;
 extern int sn_ioif_inited;
 static struct list_head **sn_irq_lh;
 static spinlock_t sn_irq_info_lock = SPIN_LOCK_UNLOCKED; /* non-IRQ lock */
diff --git a/arch/ia64/sn/kernel/setup.c b/arch/ia64/sn/kernel/setup.c
index a594aca959e6..14908ad7db8c 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -56,7 +56,7 @@
 
 DEFINE_PER_CPU(struct pda_s, pda_percpu);
 
-#define MAX_PHYS_MEMORY         (1UL << 49)     /* 1 TB */
+#define MAX_PHYS_MEMORY         (1UL << IA64_MAX_PHYS_BITS)     /* Max physical address supported */
 
 lboard_t *root_lboard[MAX_COMPACT_NODES];
 
diff --git a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
index 51bf82720d99..a06719d752a0 100644
--- a/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
+++ b/arch/ia64/sn/kernel/sn2/sn_proc_fs.c
@@ -52,7 +52,7 @@ static int licenseID_open(struct inode *inode, struct file *file)
  * the bridge chip.  The hardware will then send an interrupt message if the
  * interrupt line is active.  This mimics a level sensitive interrupt.
  */
-int sn_force_interrupt_flag = 1;
+extern int sn_force_interrupt_flag;
 
 static int sn_force_interrupt_show(struct seq_file *s, void *p)
 {
diff --git a/arch/ia64/sn/kernel/tiocx.c b/arch/ia64/sn/kernel/tiocx.c
index 254fe15c064b..b45db5133f55 100644
--- a/arch/ia64/sn/kernel/tiocx.c
+++ b/arch/ia64/sn/kernel/tiocx.c
@@ -191,7 +191,7 @@ cx_device_register(nasid_t nasid, int part_num, int mfg_num,
 {
         struct cx_dev *cx_dev;
 
-        cx_dev = kcalloc(1, sizeof(struct cx_dev), GFP_KERNEL);
+        cx_dev = kzalloc(sizeof(struct cx_dev), GFP_KERNEL);
         DBG("cx_dev= 0x%p\n", cx_dev);
         if (cx_dev == NULL)
                 return -ENOMEM;
diff --git a/arch/ia64/sn/kernel/xpc_main.c b/arch/ia64/sn/kernel/xpc_main.c
index bb1d5cf30440..ed7c21586e98 100644
--- a/arch/ia64/sn/kernel/xpc_main.c
+++ b/arch/ia64/sn/kernel/xpc_main.c
@@ -885,6 +885,10 @@ xpc_init(void)
         pid_t pid;
 
 
+        if (!ia64_platform_is("sn2")) {
+                return -ENODEV;
+        }
+
         /*
          * xpc_remote_copy_buffer is used as a temporary buffer for bte_copy'ng
          * both a partition's reserved page and its XPC variables. Its size was
diff --git a/arch/ia64/sn/kernel/xpnet.c b/arch/ia64/sn/kernel/xpnet.c
index 78c13d676fa6..e5c6d3c0a8e9 100644
--- a/arch/ia64/sn/kernel/xpnet.c
+++ b/arch/ia64/sn/kernel/xpnet.c
@@ -130,7 +130,7 @@ struct net_device *xpnet_device;
  */
 static u64 xpnet_broadcast_partitions;
 /* protect above */
-static spinlock_t xpnet_broadcast_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(xpnet_broadcast_lock);
 
 /*
  * Since the Block Transfer Engine (BTE) is being used for the transfer
@@ -636,6 +636,10 @@ xpnet_init(void)
         int result = -ENOMEM;
 
 
+        if (!ia64_platform_is("sn2")) {
+                return -ENODEV;
+        }
+
         dev_info(xpnet, "registering network device %s\n", XPNET_DEVICE_NAME);
 
         /*
diff --git a/arch/ia64/sn/pci/tioca_provider.c b/arch/ia64/sn/pci/tioca_provider.c
index ea09c12f0258..19bced34d5f1 100644
--- a/arch/ia64/sn/pci/tioca_provider.c
+++ b/arch/ia64/sn/pci/tioca_provider.c
@@ -148,7 +148,7 @@ tioca_gart_init(struct tioca_kernel *tioca_kern)
         tioca_kern->ca_pcigart_entries =
             tioca_kern->ca_pciap_size / tioca_kern->ca_ap_pagesize;
         tioca_kern->ca_pcigart_pagemap =
-            kcalloc(1, tioca_kern->ca_pcigart_entries / 8, GFP_KERNEL);
+            kzalloc(tioca_kern->ca_pcigart_entries / 8, GFP_KERNEL);
         if (!tioca_kern->ca_pcigart_pagemap) {
                 free_pages((unsigned long)tioca_kern->ca_gart,
                            get_order(tioca_kern->ca_gart_size));
@@ -392,7 +392,7 @@ tioca_dma_mapped(struct pci_dev *pdev, uint64_t paddr, size_t req_size)
          * allocate a map struct
          */
 
-        ca_dmamap = kcalloc(1, sizeof(struct tioca_dmamap), GFP_ATOMIC);
+        ca_dmamap = kzalloc(sizeof(struct tioca_dmamap), GFP_ATOMIC);
         if (!ca_dmamap)
                 goto map_return;
 
@@ -600,7 +600,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
          * Allocate kernel bus soft and copy from prom.
          */
 
-        tioca_common = kcalloc(1, sizeof(struct tioca_common), GFP_KERNEL);
+        tioca_common = kzalloc(sizeof(struct tioca_common), GFP_KERNEL);
         if (!tioca_common)
                 return NULL;
 
@@ -609,7 +609,7 @@ tioca_bus_fixup(struct pcibus_bussoft *prom_bussoft, struct pci_controller *cont
 
         /* init kernel-private area */
 
-        tioca_kern = kcalloc(1, sizeof(struct tioca_kernel), GFP_KERNEL);
+        tioca_kern = kzalloc(sizeof(struct tioca_kernel), GFP_KERNEL);
         if (!tioca_kern) {
                 kfree(tioca_common);
                 return NULL;
diff --git a/arch/m32r/Kconfig b/arch/m32r/Kconfig
index 7622d4ec5f08..1ef3987ebc6a 100644
--- a/arch/m32r/Kconfig
+++ b/arch/m32r/Kconfig
@@ -242,8 +242,8 @@ config SMP
           Y to "Enhanced Real Time Clock Support", below. The "Advanced Power
           Management" code will be disabled if you say Y here.
 
-          See also the <file:Documentation/smp.tex>,
-          <file:Documentation/smp.txt> and the SMP-HOWTO available at
+          See also the <file:Documentation/smp.txt>,
+          and the SMP-HOWTO available at
           <http://www.linuxdoc.org/docs.html#howto>.
 
           If you don't know what to do here, say N.
diff --git a/arch/m32r/kernel/asm-offsets.c b/arch/m32r/kernel/asm-offsets.c
new file mode 100644
index 000000000000..9e263112a6e2
--- /dev/null
+++ b/arch/m32r/kernel/asm-offsets.c
@@ -0,0 +1 @@
+/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
diff --git a/arch/m32r/kernel/smp.c b/arch/m32r/kernel/smp.c
index 48b187f2d2b3..a4576ac7e870 100644
--- a/arch/m32r/kernel/smp.c
+++ b/arch/m32r/kernel/smp.c
@@ -892,7 +892,6 @@ unsigned long send_IPI_mask_phys(cpumask_t physid_mask, int ipi_num,
         int try)
 {
         spinlock_t *ipilock;
-        unsigned long flags = 0;
         volatile unsigned long *ipicr_addr;
         unsigned long ipicr_val;
         unsigned long my_physid_mask;
@@ -916,50 +915,27 @@ unsigned long send_IPI_mask_phys(cpumask_t physid_mask, int ipi_num,
          * write IPICRi (send IPIi)
          * unlock ipi_lock[i]
          */
+        spin_lock(ipilock);
         __asm__ __volatile__ (
-                ";; LOCK ipi_lock[i]            \n\t"
+                ";; CHECK IPICRi == 0           \n\t"
                 ".fillinsn                      \n"
                 "1:                             \n\t"
-                "mvfc   %1, psw                 \n\t"
-                "clrpsw #0x40 -> nop            \n\t"
-                DCACHE_CLEAR("r4", "r5", "%2")
-                "lock   r4, @%2                 \n\t"
-                "addi   r4, #-1                 \n\t"
-                "unlock r4, @%2                 \n\t"
-                "mvtc   %1, psw                 \n\t"
-                "bnez   r4, 2f                  \n\t"
-                LOCK_SECTION_START(".balign 4 \n\t")
-                ".fillinsn                      \n"
-                "2:                             \n\t"
-                "ld     r4, @%2                 \n\t"
-                "blez   r4, 2b                  \n\t"
+                "ld     %0, @%1                 \n\t"
+                "and    %0, %4                  \n\t"
+                "beqz   %0, 2f                  \n\t"
+                "bnez   %3, 3f                  \n\t"
                 "bra    1b                      \n\t"
-                LOCK_SECTION_END
-                ";; CHECK IPICRi == 0           \n\t"
-                ".fillinsn                      \n"
-                "3:                             \n\t"
-                "ld     %0, @%3                 \n\t"
-                "and    %0, %6                  \n\t"
-                "beqz   %0, 4f                  \n\t"
-                "bnez   %5, 5f                  \n\t"
-                "bra    3b                      \n\t"
                 ";; WRITE IPICRi (send IPIi)    \n\t"
                 ".fillinsn                      \n"
-                "4:                             \n\t"
-                "st     %4, @%3                 \n\t"
-                ";; UNLOCK ipi_lock[i]          \n\t"
+                "2:                             \n\t"
+                "st     %2, @%1                 \n\t"
                 ".fillinsn                      \n"
-                "5:                             \n\t"
-                "ldi    r4, #1                  \n\t"
-                "st     r4, @%2                 \n\t"
+                "3:                             \n\t"
                 : "=&r"(ipicr_val)
-                : "r"(flags), "r"(&ipilock->slock), "r"(ipicr_addr),
-                  "r"(mask), "r"(try), "r"(my_physid_mask)
-                : "memory", "r4"
-#ifdef CONFIG_CHIP_M32700_TS1
-                , "r5"
-#endif  /* CONFIG_CHIP_M32700_TS1 */
+                : "r"(ipicr_addr), "r"(mask), "r"(try), "r"(my_physid_mask)
+                : "memory"
         );
+        spin_unlock(ipilock);
 
         return ipicr_val;
 }
diff --git a/arch/m32r/kernel/time.c b/arch/m32r/kernel/time.c
index 8a2b77bc5749..539c562cd54d 100644
--- a/arch/m32r/kernel/time.c
+++ b/arch/m32r/kernel/time.c
@@ -171,10 +171,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
 
@@ -221,7 +218,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * called as close as possible to 500 ms before the new second starts.
          */
         write_seqlock(&xtime_lock);
-        if ((time_status & STA_UNSYNC) == 0
+        if (ntp_synced()
                 && xtime.tv_sec > last_rtc_update + 660
                 && (xtime.tv_nsec / 1000) >= 500000 - ((unsigned)TICK_SIZE) / 2
                 && (xtime.tv_nsec / 1000) <= 500000 + ((unsigned)TICK_SIZE) / 2)
diff --git a/arch/m68k/Kconfig b/arch/m68k/Kconfig
index 178c4a3fbb72..ba960bbc8e6d 100644
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -25,6 +25,11 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        depends on Q40 || (BROKEN && SUN3X)
+        default y
+
 mainmenu "Linux/68k Kernel Configuration"
 
 source "init/Kconfig"
diff --git a/arch/m68k/Makefile b/arch/m68k/Makefile
index 466e7407afc7..34d826d10f1b 100644
--- a/arch/m68k/Makefile
+++ b/arch/m68k/Makefile
@@ -113,14 +113,5 @@ else
         bzip2 -1c vmlinux >vmlinux.bz2
 endif
 
-prepare: include/asm-$(ARCH)/offsets.h
-CLEAN_FILES += include/asm-$(ARCH)/offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
 archclean:
         rm -f vmlinux.gz vmlinux.bz2
diff --git a/arch/m68k/amiga/amisound.c b/arch/m68k/amiga/amisound.c
index cb5d93630467..bd5d134e9f12 100644
--- a/arch/m68k/amiga/amisound.c
+++ b/arch/m68k/amiga/amisound.c
@@ -63,7 +63,7 @@ void __init amiga_init_sound(void)
 }
 
 static void nosound( unsigned long ignored );
-static struct timer_list sound_timer = TIMER_INITIALIZER(nosound, 0, 0);
+static DEFINE_TIMER(sound_timer, nosound, 0, 0);
 
 void amiga_mksound( unsigned int hz, unsigned int ticks )
 {
diff --git a/arch/m68k/bvme6000/rtc.c b/arch/m68k/bvme6000/rtc.c
index c6b2a410bf9a..eb63ca6ed94c 100644
--- a/arch/m68k/bvme6000/rtc.c
+++ b/arch/m68k/bvme6000/rtc.c
@@ -14,6 +14,7 @@
 #include <linux/fcntl.h>
 #include <linux/init.h>
 #include <linux/poll.h>
+#include <linux/module.h>
 #include <linux/mc146818rtc.h>  /* For struct rtc_time and ioctls, etc */
 #include <linux/smp_lock.h>
 #include <asm/bvme6000hw.h>
@@ -171,7 +172,7 @@ static struct miscdevice rtc_dev = {
         .fops =         &rtc_fops
 };
 
-int __init rtc_DP8570A_init(void)
+static int __init rtc_DP8570A_init(void)
 {
         if (!MACH_IS_BVME6000)
                 return -ENODEV;
@@ -179,4 +180,4 @@ int __init rtc_DP8570A_init(void)
         printk(KERN_INFO "DP8570A Real Time Clock Driver v%s\n", RTC_VERSION);
         return misc_register(&rtc_dev);
 }
-
+module_init(rtc_DP8570A_init);
diff --git a/arch/m68k/fpsp040/skeleton.S b/arch/m68k/fpsp040/skeleton.S
index dbc1255a5e99..9571a21d6ad4 100644
--- a/arch/m68k/fpsp040/skeleton.S
+++ b/arch/m68k/fpsp040/skeleton.S
@@ -40,7 +40,7 @@
 
 #include <linux/linkage.h>
 #include <asm/entry.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 |SKELETON       idnt    2,1 | Motorola 040 Floating Point Software Package
 
diff --git a/arch/m68k/ifpsp060/iskeleton.S b/arch/m68k/ifpsp060/iskeleton.S
index 803a6ecdda81..4ba2c74da93d 100644
--- a/arch/m68k/ifpsp060/iskeleton.S
+++ b/arch/m68k/ifpsp060/iskeleton.S
@@ -36,7 +36,7 @@
 
 #include <linux/linkage.h>
 #include <asm/entry.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 
 |################################
diff --git a/arch/m68k/kernel/entry.S b/arch/m68k/kernel/entry.S
index e964015a31dc..23ca60a45552 100644
--- a/arch/m68k/kernel/entry.S
+++ b/arch/m68k/kernel/entry.S
@@ -42,7 +42,7 @@
 #include <asm/traps.h>
 #include <asm/unistd.h>
 
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 .globl system_call, buserr, trap
 .globl resume, ret_from_exception
diff --git a/arch/m68k/kernel/head.S b/arch/m68k/kernel/head.S
index 7cd6de17c20d..d4336d846df1 100644
--- a/arch/m68k/kernel/head.S
+++ b/arch/m68k/kernel/head.S
@@ -263,7 +263,7 @@
 #include <asm/entry.h>
 #include <asm/pgtable.h>
 #include <asm/page.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #ifdef CONFIG_MAC
 
diff --git a/arch/m68k/kernel/time.c b/arch/m68k/kernel/time.c
index e47e19588525..4ec95e3cb874 100644
--- a/arch/m68k/kernel/time.c
+++ b/arch/m68k/kernel/time.c
@@ -166,10 +166,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/m68k/mac/macboing.c b/arch/m68k/mac/macboing.c
index 44c5cd2ad6a8..8f0640847ad2 100644
--- a/arch/m68k/mac/macboing.c
+++ b/arch/m68k/mac/macboing.c
@@ -56,8 +56,7 @@ static void ( *mac_special_bell )( unsigned int, unsigned int, unsigned int );
 /*
  * our timer to start/continue/stop the bell
  */
-static struct timer_list mac_sound_timer =
-                TIMER_INITIALIZER(mac_nosound, 0, 0);
+static DEFINE_TIMER(mac_sound_timer, mac_nosound, 0, 0);
 
 /*
  * Sort of initialize the sound chip (called from mac_mksound on the first
diff --git a/arch/m68k/math-emu/fp_emu.h b/arch/m68k/math-emu/fp_emu.h
index 1d6edc975d89..c1ecfef7886a 100644
--- a/arch/m68k/math-emu/fp_emu.h
+++ b/arch/m68k/math-emu/fp_emu.h
@@ -39,7 +39,7 @@
 #define _FP_EMU_H
 
 #ifdef __ASSEMBLY__
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #endif
 #include <asm/math-emu.h>
 
diff --git a/arch/m68k/mvme16x/rtc.c b/arch/m68k/mvme16x/rtc.c
index 8a2425069088..7977eae50af2 100644
--- a/arch/m68k/mvme16x/rtc.c
+++ b/arch/m68k/mvme16x/rtc.c
@@ -161,7 +161,7 @@ static struct miscdevice rtc_dev=
         .fops =         &rtc_fops
 };
 
-int __init rtc_MK48T08_init(void)
+static int __init rtc_MK48T08_init(void)
 {
         if (!MACH_IS_MVME16x)
                 return -ENODEV;
@@ -169,4 +169,4 @@ int __init rtc_MK48T08_init(void)
         printk(KERN_INFO "MK48T08 Real Time Clock Driver v%s\n", RTC_VERSION);
         return misc_register(&rtc_dev);
 }
-
+module_init(rtc_MK48T08_init);
diff --git a/arch/m68knommu/Makefile b/arch/m68knommu/Makefile
index 7ce5e55b2401..b8fdf191b8f6 100644
--- a/arch/m68knommu/Makefile
+++ b/arch/m68knommu/Makefile
@@ -102,21 +102,11 @@ CFLAGS += -DUTS_SYSNAME=\"uClinux\"
 
 head-y := arch/m68knommu/platform/$(cpuclass-y)/head.o
 
-CLEAN_FILES := include/asm-$(ARCH)/asm-offsets.h \
-               arch/$(ARCH)/kernel/asm-offsets.s
-
 core-y  += arch/m68knommu/kernel/ \
            arch/m68knommu/mm/ \
            $(CLASSDIR) \
            arch/m68knommu/platform/$(PLATFORM)/
 libs-y  += arch/m68knommu/lib/
 
-prepare: include/asm-$(ARCH)/asm-offsets.h
-
 archclean:
         $(Q)$(MAKE) $(clean)=arch/m68knommu/boot
-
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
-                                   include/asm include/linux/version.h \
-                                   include/config/MARKER
-        $(call filechk,gen-asm-offsets)
diff --git a/arch/m68knommu/kernel/time.c b/arch/m68knommu/kernel/time.c
index 5c3ca671627c..b17c1ecba966 100644
--- a/arch/m68knommu/kernel/time.c
+++ b/arch/m68knommu/kernel/time.c
@@ -68,7 +68,7 @@ static irqreturn_t timer_interrupt(int irq, void *dummy, struct pt_regs * regs)
          * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec  / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -178,10 +178,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/m68knommu/platform/523x/Makefile b/arch/m68knommu/platform/523x/Makefile
new file mode 100644
index 000000000000..c1578b016160
--- /dev/null
+++ b/arch/m68knommu/platform/523x/Makefile
@@ -0,0 +1,19 @@
+#
+# Makefile for the m68knommu linux kernel.
+#
+
+#
+# If you want to play with the HW breakpoints then you will
+# need to add define this,  which will give you a stack backtrace
+# on the console port whenever a DBG interrupt occurs.  You have to
+# set up you HW breakpoints to trigger a DBG interrupt:
+#
+# EXTRA_CFLAGS += -DTRAP_DBG_INTERRUPT
+# EXTRA_AFLAGS += -DTRAP_DBG_INTERRUPT
+#
+
+ifdef CONFIG_FULLDEBUG
+AFLAGS += -DDEBUGGER_COMPATIBLE_CACHE=1
+endif
+
+obj-y := config.o
diff --git a/arch/m68knommu/platform/5272/config.c b/arch/m68knommu/platform/5272/config.c
index 5cb28690f89a..cf36e7d007b9 100644
--- a/arch/m68knommu/platform/5272/config.c
+++ b/arch/m68knommu/platform/5272/config.c
@@ -104,11 +104,11 @@ int mcf_timerirqpending(int timer)
 
 void config_BSP(char *commandp, int size)
 {
-#if 0
-        volatile unsigned long  *pivrp;
+#if defined (CONFIG_MOD5272)
+        volatile unsigned char  *pivrp;
 
         /* Set base of device vectors to be 64 */
-        pivrp = (volatile unsigned long *) (MCF_MBAR + MCFSIM_PIVR);
+        pivrp = (volatile unsigned char *) (MCF_MBAR + MCFSIM_PIVR);
         *pivrp = 0x40;
 #endif
 
diff --git a/arch/m68knommu/platform/5307/Makefile b/arch/m68knommu/platform/5307/Makefile
index 84b6b70641e1..6fe5a2b8fb08 100644
--- a/arch/m68knommu/platform/5307/Makefile
+++ b/arch/m68knommu/platform/5307/Makefile
@@ -19,6 +19,7 @@ endif
 obj-$(CONFIG_COLDFIRE)  += entry.o vectors.o ints.o
 obj-$(CONFIG_M5206)     += timers.o
 obj-$(CONFIG_M5206e)    += timers.o
+obj-$(CONFIG_M523x)     += pit.o
 obj-$(CONFIG_M5249)     += timers.o
 obj-$(CONFIG_M527x)     += pit.o
 obj-$(CONFIG_M5272)     += timers.o
diff --git a/arch/m68knommu/platform/68328/config.c b/arch/m68knommu/platform/68328/config.c
index fd7c93f86481..bcfa5d7fe1e2 100644
--- a/arch/m68knommu/platform/68328/config.c
+++ b/arch/m68knommu/platform/68328/config.c
@@ -1,5 +1,7 @@
+/***************************************************************************/
+
 /*
- *  linux/arch/$(ARCH)/platform/$(PLATFORM)/config.c
+ *  linux/arch/m68knommu/platform/68328/config.c
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne
@@ -11,6 +13,8 @@
  * VZ Support/Fixes             Evan Stawnyczy <e@lineo.ca>
  */
 
+/***************************************************************************/
+
 #include <asm/dbg.h>
 #include <stdarg.h>
 #include <linux/config.h>
@@ -29,76 +33,16 @@
 #include <asm/machdep.h>
 #include <asm/MC68328.h>
 
+/***************************************************************************/
 
-void BSP_sched_init(irqreturn_t (*timer_routine)(int, void *, struct pt_regs *))
-{
-
-#ifdef CONFIG_XCOPILOT_BUGS
-  /*
-   * The only thing I know is that CLK32 is not available on Xcopilot
-   * I have little idea about what frequency SYSCLK has on Xcopilot. 
-   * The values for prescaler and compare registers were simply 
-   * taken from the original source
-   */
-
-  /* Restart mode, Enable int, SYSCLK, Enable timer */
-  TCTL2 = TCTL_OM | TCTL_IRQEN | TCTL_CLKSOURCE_SYSCLK | TCTL_TEN;
-  /* Set prescaler */
-  TPRER2 = 2;
-  /* Set compare register */
-  TCMP2 = 0xd7e4;
-#else
-  /* Restart mode, Enable int, 32KHz, Enable timer */
-  TCTL2 = TCTL_OM | TCTL_IRQEN | TCTL_CLKSOURCE_32KHZ | TCTL_TEN;
-  /* Set prescaler (Divide 32KHz by 32)*/
-  TPRER2 = 31;
-  /* Set compare register  32Khz / 32 / 10 = 100 */
-  TCMP2 = 10;
-#endif
-                                                                    
-  request_irq(TMR2_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL);
-}
-
-void BSP_tick(void)
-{
-  /* Reset Timer2 */
-  TSTAT2 &= 0;
-}
+void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *));
+void m68328_timer_tick(void);
+unsigned long m68328_timer_gettimeoffset(void);
+void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
 
-unsigned long BSP_gettimeoffset (void)
-{
-  return 0;
-}
+/***************************************************************************/
 
-void BSP_gettod (int *yearp, int *monp, int *dayp,
-                   int *hourp, int *minp, int *secp)
-{
-}
-
-int BSP_hwclk(int op, struct hwclk_time *t)
-{
-  if (!op) {
-    /* read */
-  } else {
-    /* write */
-  }
-  return 0;
-}
-
-int BSP_set_clock_mmss (unsigned long nowtime)
-{
-#if 0
-  short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
-
-  tod->second1 = real_seconds / 10;
-  tod->second2 = real_seconds % 10;
-  tod->minute1 = real_minutes / 10;
-  tod->minute2 = real_minutes % 10;
-#endif
-  return 0;
-}
-
-void BSP_reset (void)
+void m68328_reset (void)
 {
   local_irq_disable();
   asm volatile ("moveal #0x10c00000, %a0;\n\t"
@@ -108,18 +52,22 @@ void BSP_reset (void)
                 "jmp (%a0);");
 }
 
+/***************************************************************************/
+
 void config_BSP(char *command, int len)
 {
   printk(KERN_INFO "\n68328 support D. Jeff Dionne <jeff@uclinux.org>\n");
   printk(KERN_INFO "68328 support Kenneth Albanowski <kjahds@kjshds.com>\n");
   printk(KERN_INFO "68328/Pilot support Bernhard Kuhn <kuhn@lpr.e-technik.tu-muenchen.de>\n");
 
-  mach_sched_init      = BSP_sched_init;
-  mach_tick            = BSP_tick;
-  mach_gettimeoffset   = BSP_gettimeoffset;
-  mach_gettod          = BSP_gettod;
+  mach_sched_init      = m68328_timer_init;
+  mach_tick            = m68328_timer_tick;
+  mach_gettimeoffset   = m68328_timer_gettimeoffset;
+  mach_gettod          = m68328_timer_gettod;
   mach_hwclk           = NULL;
   mach_set_clock_mmss  = NULL;
-  mach_reset           = BSP_reset;
+  mach_reset           = m68328_reset;
   *command = '\0';
 }
+
+/***************************************************************************/
diff --git a/arch/m68knommu/platform/68328/timers.c b/arch/m68knommu/platform/68328/timers.c
new file mode 100644
index 000000000000..68c2cd6b0030
--- /dev/null
+++ b/arch/m68knommu/platform/68328/timers.c
@@ -0,0 +1,106 @@
+/***************************************************************************/
+
+/*
+ *  linux/arch/m68knommu/platform/68328/timers.c
+ *
+ *  Copyright (C) 1993 Hamish Macdonald
+ *  Copyright (C) 1999 D. Jeff Dionne
+ *  Copyright (C) 2001 Georges Menie, Ken Desmet
+ *
+ * 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.
+ */
+
+/***************************************************************************/
+
+#include <linux/config.h>
+#include <linux/types.h>
+#include <linux/kernel.h>
+#include <linux/mm.h>
+#include <asm/setup.h>
+#include <asm/system.h>
+#include <asm/pgtable.h>
+#include <asm/irq.h>
+#include <asm/machdep.h>
+#include <asm/MC68VZ328.h>
+
+/***************************************************************************/
+
+#if defined(CONFIG_DRAGEN2)
+/* with a 33.16 MHz clock, this will give usec resolution to the time functions */
+#define CLOCK_SOURCE    TCTL_CLKSOURCE_SYSCLK
+#define CLOCK_PRE       7
+#define TICKS_PER_JIFFY 41450
+
+#elif defined(CONFIG_XCOPILOT_BUGS)
+/*
+ * The only thing I know is that CLK32 is not available on Xcopilot
+ * I have little idea about what frequency SYSCLK has on Xcopilot.
+ * The values for prescaler and compare registers were simply
+ * taken from the original source
+ */
+#define CLOCK_SOURCE    TCTL_CLKSOURCE_SYSCLK
+#define CLOCK_PRE       2
+#define TICKS_PER_JIFFY 0xd7e4
+
+#else
+/* default to using the 32Khz clock */
+#define CLOCK_SOURCE    TCTL_CLKSOURCE_32KHZ
+#define CLOCK_PRE       31
+#define TICKS_PER_JIFFY 10
+#endif
+
+/***************************************************************************/
+
+void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *))
+{
+        /* disable timer 1 */
+        TCTL = 0;
+
+        /* set ISR */
+        if (request_irq(TMR_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL)) 
+                panic("Unable to attach timer interrupt\n");
+
+        /* Restart mode, Enable int, Set clock source */
+        TCTL = TCTL_OM | TCTL_IRQEN | CLOCK_SOURCE;
+        TPRER = CLOCK_PRE;
+        TCMP = TICKS_PER_JIFFY;
+
+        /* Enable timer 1 */
+        TCTL |= TCTL_TEN;
+}
+
+/***************************************************************************/
+
+void m68328_timer_tick(void)
+{
+        /* Reset Timer1 */
+        TSTAT &= 0;
+}
+/***************************************************************************/
+
+unsigned long m68328_timer_gettimeoffset(void)
+{
+        unsigned long ticks = TCN, offset = 0;
+
+        /* check for pending interrupt */
+        if (ticks < (TICKS_PER_JIFFY >> 1) && (ISR & (1 << TMR_IRQ_NUM)))
+                offset = 1000000 / HZ;
+        ticks = (ticks * 1000000 / HZ) / TICKS_PER_JIFFY;
+        return ticks + offset;
+}
+
+/***************************************************************************/
+
+void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec)
+{
+        long now = RTCTIME;
+
+        *year = *mon = *day = 1;
+        *hour = (now >> 24) % 24;
+        *min = (now >> 16) % 60;
+        *sec = now % 60;
+}
+
+/***************************************************************************/
diff --git a/arch/m68knommu/platform/68EZ328/config.c b/arch/m68knommu/platform/68EZ328/config.c
index c21971971ff5..d8d56e5de310 100644
--- a/arch/m68knommu/platform/68EZ328/config.c
+++ b/arch/m68knommu/platform/68EZ328/config.c
@@ -1,5 +1,7 @@
+/***************************************************************************/
+
 /*
- *  linux/arch/$(ARCH)/platform/$(PLATFORM)/config.c
+ *  linux/arch/m68knommu/platform/68EZ328/config.c
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne
@@ -9,6 +11,8 @@
  * for more details.
  */
 
+/***************************************************************************/
+
 #include <stdarg.h>
 #include <linux/config.h>
 #include <linux/types.h>
@@ -20,68 +24,22 @@
 #include <asm/setup.h>
 #include <asm/system.h>
 #include <asm/pgtable.h>
-#include <asm/irq.h>
 #include <asm/machdep.h>
 #include <asm/MC68EZ328.h>
 #ifdef CONFIG_UCSIMM
 #include <asm/bootstd.h>
 #endif
-#ifdef CONFIG_PILOT
-#include "PalmV/romfs.h"
-#endif
-
-void BSP_sched_init(void (*timer_routine)(int, void *, struct pt_regs *))
-{
-  /* Restart mode, Enable int, 32KHz, Enable timer */
-  TCTL = TCTL_OM | TCTL_IRQEN | TCTL_CLKSOURCE_32KHZ | TCTL_TEN;
-  /* Set prescaler (Divide 32KHz by 32)*/
-  TPRER = 31;
-  /* Set compare register  32Khz / 32 / 10 = 100 */
-  TCMP = 10;                                                              
-
-  request_irq(TMR_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL);
-}
-
-void BSP_tick(void)
-{
-        /* Reset Timer1 */
-        TSTAT &= 0;
-}
-
-unsigned long BSP_gettimeoffset (void)
-{
-  return 0;
-}
 
-void BSP_gettod (int *yearp, int *monp, int *dayp,
-                   int *hourp, int *minp, int *secp)
-{
-}
+/***************************************************************************/
 
-int BSP_hwclk(int op, struct hwclk_time *t)
-{
-  if (!op) {
-    /* read */
-  } else {
-    /* write */
-  }
-  return 0;
-}
+void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *));
+void m68328_timer_tick(void);
+unsigned long m68328_timer_gettimeoffset(void);
+void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
 
-int BSP_set_clock_mmss (unsigned long nowtime)
-{
-#if 0
-  short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
+/***************************************************************************/
 
-  tod->second1 = real_seconds / 10;
-  tod->second2 = real_seconds % 10;
-  tod->minute1 = real_minutes / 10;
-  tod->minute2 = real_minutes % 10;
-#endif
-  return 0;
-}
-
-void BSP_reset (void)
+void m68ez328_reset(void)
 {
   local_irq_disable();
   asm volatile ("
@@ -93,6 +51,8 @@ void BSP_reset (void)
     ");
 }
 
+/***************************************************************************/
+
 unsigned char *cs8900a_hwaddr;
 static int errno;
 
@@ -119,11 +79,13 @@ void config_BSP(char *command, int len)
   else command[0] = 0;
 #endif
  
-  mach_sched_init      = BSP_sched_init;
-  mach_tick            = BSP_tick;
-  mach_gettimeoffset   = BSP_gettimeoffset;
-  mach_gettod          = BSP_gettod;
+  mach_sched_init      = m68328_timer_init;
+  mach_tick            = m68328_timer_tick;
+  mach_gettimeoffset   = m68328_timer_gettimeoffset;
+  mach_gettod          = m68328_timer_gettod;
   mach_hwclk           = NULL;
   mach_set_clock_mmss  = NULL;
-  mach_reset           = BSP_reset;
+  mach_reset           = m68ez328_reset;
 }
+
+/***************************************************************************/
diff --git a/arch/m68knommu/platform/68VZ328/de2/config.c b/arch/m68knommu/platform/68VZ328/config.c
index d0586197f113..d926524cdf82 100644
--- a/arch/m68knommu/platform/68VZ328/de2/config.c
+++ b/arch/m68knommu/platform/68VZ328/config.c
@@ -1,5 +1,7 @@
+/***************************************************************************/
+
 /*
- *  linux/arch/m68knommu/platform/MC68VZ328/de2/config.c
+ *  linux/arch/m68knommu/platform/68VZ328/config.c
  *
  *  Copyright (C) 1993 Hamish Macdonald
  *  Copyright (C) 1999 D. Jeff Dionne
@@ -10,6 +12,8 @@
  * for more details.
  */
 
+/***************************************************************************/
+
 #include <linux/config.h>
 #include <linux/types.h>
 #include <linux/kernel.h>
@@ -25,66 +29,25 @@
 #include <asm/irq.h>
 #include <asm/machdep.h>
 #include <asm/MC68VZ328.h>
+#include <asm/bootstd.h>
 
 #ifdef CONFIG_INIT_LCD
-#include "screen.h"
+#include "bootlogo.h"
 #endif
 
-/* with a 33.16 MHz clock, this will give usec resolution to the time functions */
-#define CLOCK_SOURCE TCTL_CLKSOURCE_SYSCLK
-#define CLOCK_PRE 7
-#define TICKS_PER_JIFFY 41450
-
-static void
-dragen2_sched_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *))
-{
-        /* disable timer 1 */
-        TCTL = 0;
-
-        /* set ISR */
-        if (request_irq(TMR_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL)) 
-                panic("Unable to attach timer interrupt\n");
-
-        /* Restart mode, Enable int, Set clock source */
-        TCTL = TCTL_OM | TCTL_IRQEN | CLOCK_SOURCE;
-        TPRER = CLOCK_PRE;
-        TCMP = TICKS_PER_JIFFY;
-
-        /* Enable timer 1 */
-        TCTL |= TCTL_TEN;
-}
-
-static void dragen2_tick(void)
-{
-        /* Reset Timer1 */
-        TSTAT &= 0;
-}
-
-static unsigned long dragen2_gettimeoffset(void)
-{
-        unsigned long ticks = TCN, offset = 0;
-
-        /* check for pending interrupt */
-        if (ticks < (TICKS_PER_JIFFY >> 1) && (ISR & (1 << TMR_IRQ_NUM)))
-                offset = 1000000 / HZ;
-
-        ticks = (ticks * 1000000 / HZ) / TICKS_PER_JIFFY;
+/***************************************************************************/
 
-        return ticks + offset;
-}
+void m68328_timer_init(irqreturn_t (*timer_routine) (int, void *, struct pt_regs *));
+void m68328_timer_tick(void);
+unsigned long m68328_timer_gettimeoffset(void);
+void m68328_timer_gettod(int *year, int *mon, int *day, int *hour, int *min, int *sec);
 
-static void dragen2_gettod(int *year, int *mon, int *day, int *hour,
-                                                   int *min, int *sec)
-{
-        long now = RTCTIME;
+/***************************************************************************/
+/*                        Init Drangon Engine hardware                     */
+/***************************************************************************/
+#if defined(CONFIG_DRAGEN2)
 
-        *year = *mon = *day = 1;
-        *hour = (now >> 24) % 24;
-        *min = (now >> 16) % 60;
-        *sec = now % 60;
-}
-
-static void dragen2_reset(void)
+static void m68vz328_reset(void)
 {
         local_irq_disable();
 
@@ -103,7 +66,7 @@ static void dragen2_reset(void)
         );
 }
 
-static void init_hardware(void)
+static void init_hardware(char *command, int size)
 {
 #ifdef CONFIG_DIRECT_IO_ACCESS
         SCR = 0x10;                                     /* allow user access to internal registers */
@@ -170,6 +133,60 @@ static void init_hardware(void)
 #endif
 }
 
+/***************************************************************************/
+/*                      Init RT-Control uCdimm hardware                    */
+/***************************************************************************/
+#elif defined(CONFIG_UCDIMM)
+
+static void m68vz328_reset(void)
+{
+        local_irq_disable();
+        asm volatile ("
+                moveal #0x10c00000, %a0;
+                moveb #0, 0xFFFFF300;
+                moveal 0(%a0), %sp;
+                moveal 4(%a0), %a0;
+                jmp (%a0);
+        ");
+}
+
+unsigned char *cs8900a_hwaddr;
+static int errno;
+
+_bsc0(char *, getserialnum)
+_bsc1(unsigned char *, gethwaddr, int, a)
+_bsc1(char *, getbenv, char *, a)
+
+static void init_hardware(char *command, int size)
+{
+        char *p;
+
+        printk(KERN_INFO "uCdimm serial string [%s]\n", getserialnum());
+        p = cs8900a_hwaddr = gethwaddr(0);
+        printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
+                p[0], p[1], p[2], p[3], p[4], p[5]);
+        p = getbenv("APPEND");
+        if (p)
+                strcpy(p, command);
+        else
+                command[0] = 0;
+}
+
+/***************************************************************************/
+#else
+
+static void m68vz328_reset(void)
+{
+}
+
+static void init_hardware(char *command, int size)
+{
+}
+
+/***************************************************************************/
+#endif
+/***************************************************************************/
+
 void config_BSP(char *command, int size)
 {
         printk(KERN_INFO "68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
@@ -181,11 +198,13 @@ void config_BSP(char *command, int size)
         memset(command, 0, size);
 #endif
 
-        init_hardware();
+        init_hardware(command, size);
 
-        mach_sched_init = (void *)dragen2_sched_init;
-        mach_tick = dragen2_tick;
-        mach_gettimeoffset = dragen2_gettimeoffset;
-        mach_reset = dragen2_reset;
-        mach_gettod = dragen2_gettod;
+        mach_sched_init = (void *) m68328_timer_init;
+        mach_tick = m68328_timer_tick;
+        mach_gettimeoffset = m68328_timer_gettimeoffset;
+        mach_gettod = m68328_timer_gettod;
+        mach_reset = m68vz328_reset;
 }
+
+/***************************************************************************/
diff --git a/arch/m68knommu/platform/68VZ328/ucdimm/config.c b/arch/m68knommu/platform/68VZ328/ucdimm/config.c
deleted file mode 100644
index 2deadaffd81e..000000000000
--- a/arch/m68knommu/platform/68VZ328/ucdimm/config.c
+++ /dev/null
@@ -1,117 +0,0 @@
-/*
- *  linux/arch/m68knommu/platform/68VZ328/ucdimm/config.c
- *
- *  Copyright (C) 1993 Hamish Macdonald
- *  Copyright (C) 1999 D. Jeff Dionne
- *
- * 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.
- */
-
-#include <stdarg.h>
-#include <linux/config.h>
-#include <linux/types.h>
-#include <linux/kernel.h>
-#include <linux/mm.h>
-#include <linux/tty.h>
-#include <linux/console.h>
-
-#include <asm/setup.h>
-#include <asm/system.h>
-#include <asm/pgtable.h>
-#include <asm/irq.h>
-#include <asm/machdep.h>
-#include <asm/MC68VZ328.h>
-#include <asm/bootstd.h>
-
-void BSP_sched_init(void (*timer_routine)(int, void *, struct pt_regs *))
-{
-        /* Restart mode, Enable int, 32KHz, Enable timer */
-        TCTL = TCTL_OM | TCTL_IRQEN | TCTL_CLKSOURCE_32KHZ | TCTL_TEN;
-        /* Set prescaler (Divide 32KHz by 32)*/
-        TPRER = 31;
-        /* Set compare register  32Khz / 32 / 10 = 100 */
-        TCMP = 10;                                                              
-
-        request_irq(TMR_IRQ_NUM, timer_routine, IRQ_FLG_LOCK, "timer", NULL);
-}
-
-void BSP_tick(void)
-{
-        /* Reset Timer1 */
-        TSTAT &= 0;
-}
-
-unsigned long BSP_gettimeoffset (void)
-{
-        return 0;
-}
-
-void BSP_gettod (int *yearp, int *monp, int *dayp,
-                   int *hourp, int *minp, int *secp)
-{
-}
-
-int BSP_hwclk(int op, struct hwclk_time *t)
-{
-        if (!op) {
-                /* read */
-        } else {
-                /* write */
-        }
-        return 0;
-}
-
-int BSP_set_clock_mmss (unsigned long nowtime)
-{
-#if 0
-        short real_seconds = nowtime % 60, real_minutes = (nowtime / 60) % 60;
-
-        tod->second1 = real_seconds / 10;
-        tod->second2 = real_seconds % 10;
-        tod->minute1 = real_minutes / 10;
-        tod->minute2 = real_minutes % 10;
-#endif
-        return 0;
-}
-
-void BSP_reset (void)
-{
-        local_irq_disable();
-        asm volatile ("
-                moveal #0x10c00000, %a0;
-                moveb #0, 0xFFFFF300;
-                moveal 0(%a0), %sp;
-                moveal 4(%a0), %a0;
-                jmp (%a0);
-        ");
-}
-
-unsigned char *cs8900a_hwaddr;
-static int errno;
-
-_bsc0(char *, getserialnum)
-_bsc1(unsigned char *, gethwaddr, int, a)
-_bsc1(char *, getbenv, char *, a)
-
-void config_BSP(char *command, int len)
-{
-        unsigned char *p;
-
-        printk(KERN_INFO "\n68VZ328 DragonBallVZ support (c) 2001 Lineo, Inc.\n");
-
-        printk(KERN_INFO "uCdimm serial string [%s]\n",getserialnum());
-        p = cs8900a_hwaddr = gethwaddr(0);
-        printk(KERN_INFO "uCdimm hwaddr %.2x:%.2x:%.2x:%.2x:%.2x:%.2x\n",
-                p[0], p[1], p[2], p[3], p[4], p[5]);
-        p = getbenv("APPEND");
-        if (p) strcpy(p,command);
-        else command[0] = 0;
- 
-        mach_sched_init      = BSP_sched_init;
-        mach_tick            = BSP_tick;
-        mach_gettimeoffset   = BSP_gettimeoffset;
-        mach_gettod          = BSP_gettod;
-        mach_reset           = BSP_reset;
-}
diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index d79fba0aa8bf..0eb71ac303af 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -4,6 +4,11 @@ config MIPS
         # Horrible source of confusion.  Die, die, die ...
         select EMBEDDED
 
+# shouldn't it be per-subarchitecture?
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 mainmenu "Linux/MIPS Kernel Configuration"
 
 source "init/Kconfig"
@@ -149,6 +154,13 @@ config TANBAC_TB0226
           The TANBAC Mbase(TB0226) is a MIPS-based platform manufactured by TANBAC.
           Please refer to <http://www.tanbac.co.jp/> about Mbase.
 
+config TANBAC_TB0287
+        bool "Support for TANBAC Mini-ITX DIMM base(TB0287)"
+        depends on TANBAC_TB022X
+        help
+          The TANBAC Mini-ITX DIMM base(TB0287) is a MIPS-based platform manufactured by TANBAC.
+          Please refer to <http://www.tanbac.co.jp/> about Mini-ITX DIMM base.
+
 config VICTOR_MPC30X
         bool "Support for Victor MP-C303/304"
         depends on MACH_VR41XX
diff --git a/arch/mips/Makefile b/arch/mips/Makefile
index b0fdaee8d8d9..346e803f153b 100644
--- a/arch/mips/Makefile
+++ b/arch/mips/Makefile
@@ -720,38 +720,7 @@ archclean:
         @$(MAKE) $(clean)=arch/mips/boot
         @$(MAKE) $(clean)=arch/mips/lasat
 
-# Generate <asm/offset.h
-#
-# The default rule is suffering from funny problems on MIPS so we using our
-# own ...
-#
-# ---------------------------------------------------------------------------
-
-define filechk_gen-asm-offset.h
-        (set -e; \
-         echo "#ifndef _ASM_OFFSET_H"; \
-         echo "#define _ASM_OFFSET_H"; \
-         echo "/*"; \
-         echo " * DO NOT MODIFY."; \
-         echo " *"; \
-         echo " * This file was generated by arch/$(ARCH)/Makefile"; \
-         echo " *"; \
-         echo " */"; \
-         echo ""; \
-         sed -ne "/^@@@/s///p"; \
-         echo "#endif /* _ASM_OFFSET_H */" )
-endef
-
-prepare: include/asm-$(ARCH)/offset.h
-
-arch/$(ARCH)/kernel/offset.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/offset.s
-        $(call filechk,gen-asm-offset.h)
-
-CLEAN_FILES += include/asm-$(ARCH)/offset.h.tmp \
-               include/asm-$(ARCH)/offset.h \
-               vmlinux.32 \
+
+CLEAN_FILES += vmlinux.32 \
                vmlinux.64 \
                vmlinux.ecoff
diff --git a/arch/mips/configs/tb0287_defconfig b/arch/mips/configs/tb0287_defconfig
new file mode 100644
index 000000000000..17b9f2f65ba0
--- /dev/null
+++ b/arch/mips/configs/tb0287_defconfig
@@ -0,0 +1,1041 @@
+#
+# Automatically generated make config: don't edit
+# Linux kernel version: 2.6.13-mm1
+# Thu Sep  1 22:58:34 2005
+#
+CONFIG_MIPS=y
+
+#
+# Code maturity level options
+#
+CONFIG_EXPERIMENTAL=y
+CONFIG_CLEAN_COMPILE=y
+CONFIG_BROKEN_ON_SMP=y
+CONFIG_INIT_ENV_ARG_LIMIT=32
+
+#
+# General setup
+#
+CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
+CONFIG_SWAP=y
+CONFIG_SYSVIPC=y
+# CONFIG_POSIX_MQUEUE is not set
+# CONFIG_BSD_PROCESS_ACCT is not set
+CONFIG_SYSCTL=y
+# CONFIG_AUDIT is not set
+# CONFIG_HOTPLUG is not set
+CONFIG_KOBJECT_UEVENT=y
+# CONFIG_IKCONFIG is not set
+CONFIG_INITRAMFS_SOURCE=""
+CONFIG_EMBEDDED=y
+CONFIG_KALLSYMS=y
+# CONFIG_KALLSYMS_EXTRA_PASS is not set
+CONFIG_PRINTK=y
+CONFIG_BUG=y
+CONFIG_BASE_FULL=y
+CONFIG_FUTEX=y
+CONFIG_EPOLL=y
+# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
+CONFIG_SHMEM=y
+CONFIG_CC_ALIGN_FUNCTIONS=0
+CONFIG_CC_ALIGN_LABELS=0
+CONFIG_CC_ALIGN_LOOPS=0
+CONFIG_CC_ALIGN_JUMPS=0
+# CONFIG_TINY_SHMEM is not set
+CONFIG_BASE_SMALL=0
+
+#
+# Loadable module support
+#
+CONFIG_MODULES=y
+CONFIG_MODULE_UNLOAD=y
+# CONFIG_MODULE_FORCE_UNLOAD is not set
+CONFIG_OBSOLETE_MODPARM=y
+CONFIG_MODVERSIONS=y
+CONFIG_MODULE_SRCVERSION_ALL=y
+CONFIG_KMOD=y
+CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
+CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
+CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
+
+#
+# Kernel type
+#
+CONFIG_32BIT=y
+# CONFIG_64BIT is not set
+
+#
+# Machine selection
+#
+# CONFIG_MACH_JAZZ is not set
+CONFIG_MACH_VR41XX=y
+# CONFIG_NEC_CMBVR4133 is not set
+# CONFIG_CASIO_E55 is not set
+# CONFIG_IBM_WORKPAD is not set
+CONFIG_TANBAC_TB022X=y
+# CONFIG_TANBAC_TB0226 is not set
+CONFIG_TANBAC_TB0287=y
+# CONFIG_VICTOR_MPC30X is not set
+# CONFIG_ZAO_CAPCELLA is not set
+CONFIG_PCI_VR41XX=y
+# CONFIG_VRC4173 is not set
+# CONFIG_TOSHIBA_JMR3927 is not set
+# CONFIG_MIPS_COBALT is not set
+# CONFIG_MACH_DECSTATION is not set
+# CONFIG_MIPS_EV64120 is not set
+# CONFIG_MIPS_EV96100 is not set
+# CONFIG_MIPS_IVR is not set
+# CONFIG_LASAT is not set
+# CONFIG_MIPS_ITE8172 is not set
+# CONFIG_MIPS_ATLAS is not set
+# CONFIG_MIPS_MALTA is not set
+# CONFIG_MIPS_SEAD is not set
+# CONFIG_MOMENCO_OCELOT is not set
+# CONFIG_MOMENCO_OCELOT_G is not set
+# CONFIG_MOMENCO_OCELOT_C is not set
+# CONFIG_MOMENCO_OCELOT_3 is not set
+# CONFIG_MOMENCO_JAGUAR_ATX is not set
+# CONFIG_PMC_YOSEMITE is not set
+# CONFIG_DDB5074 is not set
+# CONFIG_DDB5476 is not set
+# CONFIG_DDB5477 is not set
+# CONFIG_QEMU is not set
+# CONFIG_SGI_IP22 is not set
+# CONFIG_SGI_IP27 is not set
+# CONFIG_SGI_IP32 is not set
+# CONFIG_SOC_AU1X00 is not set
+# CONFIG_SIBYTE_SB1xxx_SOC is not set
+# CONFIG_SNI_RM200_PCI is not set
+# CONFIG_TOSHIBA_RBTX4927 is not set
+CONFIG_RWSEM_GENERIC_SPINLOCK=y
+CONFIG_GENERIC_CALIBRATE_DELAY=y
+CONFIG_HAVE_DEC_LOCK=y
+CONFIG_DMA_NONCOHERENT=y
+CONFIG_DMA_NEED_PCI_MAP_STATE=y
+CONFIG_CPU_LITTLE_ENDIAN=y
+CONFIG_IRQ_CPU=y
+CONFIG_MIPS_L1_CACHE_SHIFT=5
+
+#
+# CPU selection
+#
+# CONFIG_CPU_MIPS32 is not set
+# CONFIG_CPU_MIPS64 is not set
+# CONFIG_CPU_R3000 is not set
+# CONFIG_CPU_TX39XX is not set
+CONFIG_CPU_VR41XX=y
+# CONFIG_CPU_R4300 is not set
+# CONFIG_CPU_R4X00 is not set
+# CONFIG_CPU_TX49XX is not set
+# CONFIG_CPU_R5000 is not set
+# CONFIG_CPU_R5432 is not set
+# CONFIG_CPU_R6000 is not set
+# CONFIG_CPU_NEVADA is not set
+# CONFIG_CPU_R8000 is not set
+# CONFIG_CPU_R10000 is not set
+# CONFIG_CPU_RM7000 is not set
+# CONFIG_CPU_RM9000 is not set
+# CONFIG_CPU_SB1 is not set
+CONFIG_PAGE_SIZE_4KB=y
+# CONFIG_PAGE_SIZE_8KB is not set
+# CONFIG_PAGE_SIZE_16KB is not set
+# CONFIG_PAGE_SIZE_64KB is not set
+# CONFIG_CPU_ADVANCED is not set
+CONFIG_CPU_HAS_SYNC=y
+CONFIG_ARCH_FLATMEM_ENABLE=y
+CONFIG_SELECT_MEMORY_MODEL=y
+CONFIG_FLATMEM_MANUAL=y
+# CONFIG_DISCONTIGMEM_MANUAL is not set
+# CONFIG_SPARSEMEM_MANUAL is not set
+CONFIG_FLATMEM=y
+CONFIG_FLAT_NODE_MEM_MAP=y
+# CONFIG_SPARSEMEM_STATIC is not set
+# CONFIG_PREEMPT is not set
+
+#
+# Bus options (PCI, PCMCIA, EISA, ISA, TC)
+#
+CONFIG_HW_HAS_PCI=y
+CONFIG_PCI=y
+# CONFIG_PCI_LEGACY_PROC is not set
+CONFIG_MMU=y
+
+#
+# PCCARD (PCMCIA/CardBus) support
+#
+# CONFIG_PCCARD is not set
+
+#
+# PCI Hotplug Support
+#
+# CONFIG_HOTPLUG_PCI is not set
+
+#
+# Executable file formats
+#
+CONFIG_BINFMT_ELF=y
+# CONFIG_BINFMT_MISC is not set
+CONFIG_TRAD_SIGNALS=y
+
+#
+# Networking
+#
+CONFIG_NET=y
+
+#
+# Networking options
+#
+CONFIG_PACKET=y
+# CONFIG_PACKET_MMAP is not set
+CONFIG_UNIX=y
+CONFIG_XFRM=y
+CONFIG_XFRM_USER=m
+# CONFIG_NET_KEY is not set
+CONFIG_INET=y
+CONFIG_IP_MULTICAST=y
+CONFIG_IP_ADVANCED_ROUTER=y
+CONFIG_ASK_IP_FIB_HASH=y
+# CONFIG_IP_FIB_TRIE is not set
+CONFIG_IP_FIB_HASH=y
+CONFIG_IP_MULTIPLE_TABLES=y
+CONFIG_IP_ROUTE_MULTIPATH=y
+# CONFIG_IP_ROUTE_MULTIPATH_CACHED is not set
+CONFIG_IP_ROUTE_VERBOSE=y
+CONFIG_IP_PNP=y
+# CONFIG_IP_PNP_DHCP is not set
+CONFIG_IP_PNP_BOOTP=y
+# CONFIG_IP_PNP_RARP is not set
+CONFIG_NET_IPIP=m
+CONFIG_NET_IPGRE=m
+# CONFIG_NET_IPGRE_BROADCAST is not set
+# CONFIG_IP_MROUTE is not set
+# CONFIG_ARPD is not set
+CONFIG_SYN_COOKIES=y
+# CONFIG_INET_AH is not set
+# CONFIG_INET_ESP is not set
+# CONFIG_INET_IPCOMP is not set
+CONFIG_INET_TUNNEL=m
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
+CONFIG_TCP_CONG_ADVANCED=y
+
+#
+# TCP congestion control
+#
+CONFIG_TCP_CONG_BIC=y
+CONFIG_TCP_CONG_WESTWOOD=m
+CONFIG_TCP_CONG_HTCP=m
+# CONFIG_TCP_CONG_HSTCP is not set
+# CONFIG_TCP_CONG_HYBLA is not set
+# CONFIG_TCP_CONG_VEGAS is not set
+# CONFIG_TCP_CONG_SCALABLE is not set
+# CONFIG_IPV6 is not set
+# CONFIG_NETFILTER is not set
+
+#
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
+# SCTP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_SCTP is not set
+# CONFIG_ATM is not set
+# CONFIG_BRIDGE is not set
+# CONFIG_VLAN_8021Q is not set
+# CONFIG_DECNET is not set
+# CONFIG_LLC2 is not set
+# CONFIG_IPX is not set
+# CONFIG_ATALK is not set
+# CONFIG_X25 is not set
+# CONFIG_LAPB is not set
+# CONFIG_NET_DIVERT is not set
+# CONFIG_ECONET is not set
+# CONFIG_WAN_ROUTER is not set
+# CONFIG_NET_SCHED is not set
+# CONFIG_NET_CLS_ROUTE is not set
+
+#
+# Network testing
+#
+# CONFIG_NET_PKTGEN is not set
+# CONFIG_NETFILTER_NETLINK is not set
+# CONFIG_HAMRADIO is not set
+# CONFIG_IRDA is not set
+# CONFIG_BT is not set
+# CONFIG_IEEE80211 is not set
+
+#
+# Device Drivers
+#
+
+#
+# Generic Driver Options
+#
+CONFIG_STANDALONE=y
+CONFIG_PREVENT_FIRMWARE_BUILD=y
+# CONFIG_FW_LOADER is not set
+
+#
+# Memory Technology Devices (MTD)
+#
+# CONFIG_MTD is not set
+
+#
+# Parallel port support
+#
+# CONFIG_PARPORT is not set
+
+#
+# Plug and Play support
+#
+
+#
+# Block devices
+#
+# CONFIG_BLK_DEV_FD is not set
+# CONFIG_BLK_CPQ_DA is not set
+# CONFIG_BLK_CPQ_CISS_DA is not set
+# CONFIG_BLK_DEV_DAC960 is not set
+# CONFIG_BLK_DEV_UMEM is not set
+# CONFIG_BLK_DEV_COW_COMMON is not set
+CONFIG_BLK_DEV_LOOP=m
+# CONFIG_BLK_DEV_CRYPTOLOOP is not set
+CONFIG_BLK_DEV_NBD=m
+# CONFIG_BLK_DEV_SX8 is not set
+# CONFIG_BLK_DEV_UB is not set
+CONFIG_BLK_DEV_RAM=y
+CONFIG_BLK_DEV_RAM_COUNT=16
+CONFIG_BLK_DEV_RAM_SIZE=4096
+# CONFIG_BLK_DEV_INITRD is not set
+# CONFIG_LBD is not set
+# CONFIG_CDROM_PKTCDVD is not set
+
+#
+# IO Schedulers
+#
+CONFIG_IOSCHED_NOOP=y
+CONFIG_IOSCHED_AS=y
+CONFIG_IOSCHED_DEADLINE=y
+CONFIG_IOSCHED_CFQ=y
+# CONFIG_ATA_OVER_ETH is not set
+
+#
+# ATA/ATAPI/MFM/RLL support
+#
+CONFIG_IDE=y
+CONFIG_BLK_DEV_IDE=y
+
+#
+# Please see Documentation/ide.txt for help/info on IDE drives
+#
+# CONFIG_BLK_DEV_IDE_SATA is not set
+CONFIG_BLK_DEV_IDEDISK=y
+# CONFIG_IDEDISK_MULTI_MODE is not set
+# CONFIG_BLK_DEV_IDECD is not set
+# CONFIG_BLK_DEV_IDETAPE is not set
+# CONFIG_BLK_DEV_IDEFLOPPY is not set
+# CONFIG_BLK_DEV_IDESCSI is not set
+# CONFIG_IDE_TASK_IOCTL is not set
+
+#
+# IDE chipset support/bugfixes
+#
+CONFIG_IDE_GENERIC=y
+CONFIG_BLK_DEV_IDEPCI=y
+# CONFIG_IDEPCI_SHARE_IRQ is not set
+# CONFIG_BLK_DEV_OFFBOARD is not set
+# CONFIG_BLK_DEV_GENERIC is not set
+# CONFIG_BLK_DEV_OPTI621 is not set
+CONFIG_BLK_DEV_IDEDMA_PCI=y
+# CONFIG_BLK_DEV_IDEDMA_FORCED is not set
+# CONFIG_IDEDMA_PCI_AUTO is not set
+# CONFIG_BLK_DEV_AEC62XX is not set
+# CONFIG_BLK_DEV_ALI15X3 is not set
+# CONFIG_BLK_DEV_AMD74XX is not set
+# CONFIG_BLK_DEV_CMD64X is not set
+# CONFIG_BLK_DEV_TRIFLEX is not set
+# CONFIG_BLK_DEV_CY82C693 is not set
+# CONFIG_BLK_DEV_CS5520 is not set
+# CONFIG_BLK_DEV_CS5530 is not set
+# CONFIG_BLK_DEV_HPT34X is not set
+# CONFIG_BLK_DEV_HPT366 is not set
+# CONFIG_BLK_DEV_SC1200 is not set
+# CONFIG_BLK_DEV_PIIX is not set
+# CONFIG_BLK_DEV_IT821X is not set
+# CONFIG_BLK_DEV_NS87415 is not set
+# CONFIG_BLK_DEV_PDC202XX_OLD is not set
+# CONFIG_BLK_DEV_PDC202XX_NEW is not set
+# CONFIG_BLK_DEV_SVWKS is not set
+CONFIG_BLK_DEV_SIIMAGE=y
+# CONFIG_BLK_DEV_SLC90E66 is not set
+# CONFIG_BLK_DEV_TRM290 is not set
+# CONFIG_BLK_DEV_VIA82CXXX is not set
+# CONFIG_IDE_ARM is not set
+CONFIG_BLK_DEV_IDEDMA=y
+# CONFIG_IDEDMA_IVB is not set
+# CONFIG_IDEDMA_AUTO is not set
+# CONFIG_BLK_DEV_HD is not set
+
+#
+# SCSI device support
+#
+# CONFIG_RAID_ATTRS is not set
+CONFIG_SCSI=y
+CONFIG_SCSI_PROC_FS=y
+
+#
+# SCSI support type (disk, tape, CD-ROM)
+#
+CONFIG_BLK_DEV_SD=y
+# CONFIG_CHR_DEV_ST is not set
+# CONFIG_CHR_DEV_OSST is not set
+# CONFIG_BLK_DEV_SR is not set
+# CONFIG_CHR_DEV_SG is not set
+# CONFIG_CHR_DEV_SCH is not set
+
+#
+# Some SCSI devices (e.g. CD jukebox) support multiple LUNs
+#
+# CONFIG_SCSI_MULTI_LUN is not set
+# CONFIG_SCSI_CONSTANTS is not set
+# CONFIG_SCSI_LOGGING is not set
+
+#
+# SCSI Transport Attributes
+#
+# CONFIG_SCSI_SPI_ATTRS is not set
+# CONFIG_SCSI_FC_ATTRS is not set
+# CONFIG_SCSI_ISCSI_ATTRS is not set
+
+#
+# SCSI low-level drivers
+#
+# CONFIG_BLK_DEV_3W_XXXX_RAID is not set
+# CONFIG_SCSI_3W_9XXX is not set
+# CONFIG_SCSI_ARCMSR is not set
+# CONFIG_SCSI_ACARD is not set
+# CONFIG_SCSI_AACRAID is not set
+# CONFIG_SCSI_AIC7XXX is not set
+# CONFIG_SCSI_AIC7XXX_OLD is not set
+# CONFIG_SCSI_AIC79XX is not set
+# CONFIG_SCSI_DPT_I2O is not set
+# CONFIG_MEGARAID_NEWGEN is not set
+# CONFIG_MEGARAID_LEGACY is not set
+# CONFIG_SCSI_SATA is not set
+# CONFIG_SCSI_BUSLOGIC is not set
+# CONFIG_SCSI_DMX3191D is not set
+# CONFIG_SCSI_EATA is not set
+# CONFIG_SCSI_FUTURE_DOMAIN is not set
+# CONFIG_SCSI_GDTH is not set
+# CONFIG_SCSI_IPS is not set
+# CONFIG_SCSI_INITIO is not set
+# CONFIG_SCSI_INIA100 is not set
+# CONFIG_SCSI_SYM53C8XX_2 is not set
+# CONFIG_SCSI_IPR is not set
+# CONFIG_SCSI_QLOGIC_FC is not set
+# CONFIG_SCSI_QLOGIC_1280 is not set
+CONFIG_SCSI_QLA2XXX=y
+# CONFIG_SCSI_QLA21XX is not set
+# CONFIG_SCSI_QLA22XX is not set
+# CONFIG_SCSI_QLA2300 is not set
+# CONFIG_SCSI_QLA2322 is not set
+# CONFIG_SCSI_QLA6312 is not set
+# CONFIG_SCSI_QLA24XX is not set
+# CONFIG_SCSI_LPFC is not set
+# CONFIG_SCSI_DC395x is not set
+# CONFIG_SCSI_DC390T is not set
+# CONFIG_SCSI_NSP32 is not set
+# CONFIG_SCSI_DEBUG is not set
+
+#
+# Multi-device support (RAID and LVM)
+#
+# CONFIG_MD is not set
+
+#
+# Fusion MPT device support
+#
+# CONFIG_FUSION is not set
+# CONFIG_FUSION_SPI is not set
+# CONFIG_FUSION_FC is not set
+
+#
+# IEEE 1394 (FireWire) support
+#
+CONFIG_IEEE1394=m
+
+#
+# Subsystem Options
+#
+# CONFIG_IEEE1394_VERBOSEDEBUG is not set
+# CONFIG_IEEE1394_OUI_DB is not set
+CONFIG_IEEE1394_EXTRA_CONFIG_ROMS=y
+CONFIG_IEEE1394_CONFIG_ROM_IP1394=y
+# CONFIG_IEEE1394_EXPORT_FULL_API is not set
+
+#
+# Device Drivers
+#
+
+#
+# Texas Instruments PCILynx requires I2C
+#
+CONFIG_IEEE1394_OHCI1394=m
+
+#
+# Protocol Drivers
+#
+CONFIG_IEEE1394_VIDEO1394=m
+CONFIG_IEEE1394_SBP2=m
+# CONFIG_IEEE1394_SBP2_PHYS_DMA is not set
+CONFIG_IEEE1394_ETH1394=m
+CONFIG_IEEE1394_DV1394=m
+CONFIG_IEEE1394_RAWIO=m
+CONFIG_IEEE1394_CMP=m
+CONFIG_IEEE1394_AMDTP=m
+
+#
+# I2O device support
+#
+# CONFIG_I2O is not set
+
+#
+# Network device support
+#
+CONFIG_NETDEVICES=y
+CONFIG_DUMMY=m
+# CONFIG_BONDING is not set
+# CONFIG_EQUALIZER is not set
+# CONFIG_TUN is not set
+
+#
+# ARCnet devices
+#
+# CONFIG_ARCNET is not set
+
+#
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
+# Ethernet (10 or 100Mbit)
+#
+CONFIG_NET_ETHERNET=y
+CONFIG_MII=y
+# CONFIG_HAPPYMEAL is not set
+# CONFIG_SUNGEM is not set
+# CONFIG_NET_VENDOR_3COM is not set
+
+#
+# Tulip family network device support
+#
+# CONFIG_NET_TULIP is not set
+# CONFIG_HP100 is not set
+# CONFIG_NET_PCI is not set
+
+#
+# Ethernet (1000 Mbit)
+#
+# CONFIG_ACENIC is not set
+# CONFIG_DL2K is not set
+# CONFIG_E1000 is not set
+# CONFIG_NS83820 is not set
+# CONFIG_HAMACHI is not set
+# CONFIG_YELLOWFIN is not set
+CONFIG_R8169=y
+# CONFIG_R8169_NAPI is not set
+# CONFIG_SIS190 is not set
+# CONFIG_SKGE is not set
+# CONFIG_SKY2 is not set
+# CONFIG_SK98LIN is not set
+# CONFIG_TIGON3 is not set
+# CONFIG_BNX2 is not set
+
+#
+# Ethernet (10000 Mbit)
+#
+# CONFIG_CHELSIO_T1 is not set
+# CONFIG_IXGB is not set
+# CONFIG_S2IO is not set
+
+#
+# Token Ring devices
+#
+# CONFIG_TR is not set
+
+#
+# Wireless LAN (non-hamradio)
+#
+# CONFIG_NET_RADIO is not set
+
+#
+# Wan interfaces
+#
+# CONFIG_WAN is not set
+# CONFIG_FDDI is not set
+# CONFIG_HIPPI is not set
+# CONFIG_PPP is not set
+# CONFIG_SLIP is not set
+# CONFIG_NET_FC is not set
+# CONFIG_SHAPER is not set
+# CONFIG_NETCONSOLE is not set
+# CONFIG_KGDBOE is not set
+# CONFIG_NETPOLL is not set
+# CONFIG_NETPOLL_RX is not set
+# CONFIG_NETPOLL_TRAP is not set
+# CONFIG_NET_POLL_CONTROLLER is not set
+
+#
+# ISDN subsystem
+#
+# CONFIG_ISDN is not set
+
+#
+# Telephony Support
+#
+# CONFIG_PHONE is not set
+
+#
+# Input device support
+#
+CONFIG_INPUT=y
+
+#
+# Userland interfaces
+#
+# CONFIG_INPUT_MOUSEDEV is not set
+# CONFIG_INPUT_JOYDEV is not set
+# CONFIG_INPUT_TSDEV is not set
+# CONFIG_INPUT_EVDEV is not set
+# CONFIG_INPUT_EVBUG is not set
+
+#
+# Input Device Drivers
+#
+# CONFIG_INPUT_KEYBOARD is not set
+# CONFIG_INPUT_MOUSE is not set
+# CONFIG_INPUT_JOYSTICK is not set
+# CONFIG_INPUT_TOUCHSCREEN is not set
+# CONFIG_INPUT_MISC is not set
+
+#
+# Hardware I/O ports
+#
+# CONFIG_SERIO is not set
+# CONFIG_GAMEPORT is not set
+
+#
+# Character devices
+#
+CONFIG_VT=y
+CONFIG_VT_CONSOLE=y
+CONFIG_HW_CONSOLE=y
+# CONFIG_SERIAL_NONSTANDARD is not set
+
+#
+# Serial drivers
+#
+# CONFIG_SERIAL_8250 is not set
+
+#
+# Non-8250 serial port support
+#
+CONFIG_SERIAL_CORE=y
+CONFIG_SERIAL_CORE_CONSOLE=y
+CONFIG_SERIAL_VR41XX=y
+CONFIG_SERIAL_VR41XX_CONSOLE=y
+# CONFIG_SERIAL_JSM is not set
+CONFIG_UNIX98_PTYS=y
+CONFIG_LEGACY_PTYS=y
+CONFIG_LEGACY_PTY_COUNT=256
+
+#
+# IPMI
+#
+# CONFIG_IPMI_HANDLER is not set
+
+#
+# Watchdog Cards
+#
+# CONFIG_WATCHDOG is not set
+# CONFIG_RTC is not set
+# CONFIG_GEN_RTC is not set
+# CONFIG_RTC_VR41XX is not set
+# CONFIG_DTLK is not set
+# CONFIG_R3964 is not set
+# CONFIG_APPLICOM is not set
+# CONFIG_TANBAC_TB0219 is not set
+
+#
+# Ftape, the floppy tape device driver
+#
+# CONFIG_DRM is not set
+CONFIG_GPIO_VR41XX=y
+# CONFIG_RAW_DRIVER is not set
+
+#
+# TPM devices
+#
+# CONFIG_TCG_TPM is not set
+
+#
+# I2C support
+#
+# CONFIG_I2C is not set
+
+#
+# Dallas's 1-wire bus
+#
+# CONFIG_W1 is not set
+
+#
+# Hardware Monitoring support
+#
+# CONFIG_HWMON is not set
+# CONFIG_HWMON_VID is not set
+
+#
+# Misc devices
+#
+
+#
+# Multimedia Capabilities Port drivers
+#
+
+#
+# Multimedia devices
+#
+# CONFIG_VIDEO_DEV is not set
+
+#
+# Digital Video Broadcasting Devices
+#
+# CONFIG_DVB is not set
+
+#
+# Graphics support
+#
+# CONFIG_FB is not set
+
+#
+# Console display driver support
+#
+# CONFIG_VGA_CONSOLE is not set
+CONFIG_DUMMY_CONSOLE=y
+
+#
+# Speakup console speech
+#
+# CONFIG_SPEAKUP is not set
+
+#
+# Sound
+#
+# CONFIG_SOUND is not set
+
+#
+# USB support
+#
+CONFIG_USB_ARCH_HAS_HCD=y
+CONFIG_USB_ARCH_HAS_OHCI=y
+CONFIG_USB=m
+# CONFIG_USB_DEBUG is not set
+
+#
+# Miscellaneous USB options
+#
+# CONFIG_USB_DEVICEFS is not set
+# CONFIG_USB_BANDWIDTH is not set
+# CONFIG_USB_DYNAMIC_MINORS is not set
+# CONFIG_USB_OTG is not set
+
+#
+# USB Host Controller Drivers
+#
+CONFIG_USB_EHCI_HCD=m
+# CONFIG_USB_EHCI_SPLIT_ISO is not set
+# CONFIG_USB_EHCI_ROOT_HUB_TT is not set
+# CONFIG_USB_ISP116X_HCD is not set
+CONFIG_USB_OHCI_HCD=m
+# CONFIG_USB_OHCI_BIG_ENDIAN is not set
+CONFIG_USB_OHCI_LITTLE_ENDIAN=y
+# CONFIG_USB_UHCI_HCD is not set
+# CONFIG_USB_SL811_HCD is not set
+
+#
+# USB Device Class drivers
+#
+# CONFIG_USB_BLUETOOTH_TTY is not set
+# CONFIG_USB_ACM is not set
+# CONFIG_USB_PRINTER is not set
+
+#
+# NOTE: USB_STORAGE enables SCSI, and 'SCSI disk support' may also be needed; see USB_STORAGE Help for more information
+#
+CONFIG_USB_STORAGE=m
+# CONFIG_USB_STORAGE_DEBUG is not set
+# CONFIG_USB_STORAGE_DATAFAB is not set
+# CONFIG_USB_STORAGE_FREECOM is not set
+# CONFIG_USB_STORAGE_ISD200 is not set
+# CONFIG_USB_STORAGE_DPCM is not set
+# CONFIG_USB_STORAGE_USBAT is not set
+# CONFIG_USB_STORAGE_SDDR09 is not set
+# CONFIG_USB_STORAGE_SDDR55 is not set
+# CONFIG_USB_STORAGE_JUMPSHOT is not set
+
+#
+# USB Input Devices
+#
+CONFIG_USB_HID=m
+CONFIG_USB_HIDINPUT=y
+# CONFIG_HID_FF is not set
+# CONFIG_USB_HIDDEV is not set
+
+#
+# USB HID Boot Protocol drivers
+#
+# CONFIG_USB_KBD is not set
+# CONFIG_USB_MOUSE is not set
+# CONFIG_USB_AIPTEK is not set
+# CONFIG_USB_WACOM is not set
+# CONFIG_USB_ACECAD is not set
+# CONFIG_USB_KBTAB is not set
+# CONFIG_USB_POWERMATE is not set
+# CONFIG_USB_MTOUCH is not set
+# CONFIG_USB_ITMTOUCH is not set
+# CONFIG_USB_EGALAX is not set
+# CONFIG_USB_YEALINK is not set
+# CONFIG_USB_XPAD is not set
+# CONFIG_USB_ATI_REMOTE is not set
+# CONFIG_USB_KEYSPAN_REMOTE is not set
+# CONFIG_USB_APPLETOUCH is not set
+
+#
+# USB Imaging devices
+#
+# CONFIG_USB_MDC800 is not set
+# CONFIG_USB_MICROTEK is not set
+
+#
+# USB Multimedia devices
+#
+# CONFIG_USB_DABUSB is not set
+
+#
+# Video4Linux support is needed for USB Multimedia device support
+#
+
+#
+# USB Network Adapters
+#
+# CONFIG_USB_CATC is not set
+# CONFIG_USB_KAWETH is not set
+# CONFIG_USB_PEGASUS is not set
+# CONFIG_USB_RTL8150 is not set
+# CONFIG_USB_USBNET is not set
+CONFIG_USB_MON=y
+
+#
+# USB port drivers
+#
+
+#
+# USB Serial Converter support
+#
+# CONFIG_USB_SERIAL is not set
+
+#
+# USB Miscellaneous drivers
+#
+# CONFIG_USB_EMI62 is not set
+# CONFIG_USB_EMI26 is not set
+# CONFIG_USB_AUERSWALD is not set
+# CONFIG_USB_RIO500 is not set
+# CONFIG_USB_LEGOTOWER is not set
+# CONFIG_USB_LCD is not set
+# CONFIG_USB_LED is not set
+# CONFIG_USB_CYTHERM is not set
+# CONFIG_USB_GOTEMP is not set
+# CONFIG_USB_PHIDGETKIT is not set
+# CONFIG_USB_PHIDGETSERVO is not set
+# CONFIG_USB_IDMOUSE is not set
+# CONFIG_USB_SISUSBVGA is not set
+# CONFIG_USB_LD is not set
+
+#
+# USB DSL modem support
+#
+
+#
+# USB Gadget Support
+#
+# CONFIG_USB_GADGET is not set
+
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
+#
+# SN Devices
+#
+
+#
+# Distributed Lock Manager
+#
+# CONFIG_DLM is not set
+
+#
+# File systems
+#
+CONFIG_EXT2_FS=y
+# CONFIG_EXT2_FS_XATTR is not set
+# CONFIG_EXT2_FS_XIP is not set
+# CONFIG_EXT3_FS is not set
+# CONFIG_REISER4_FS is not set
+# CONFIG_REISERFS_FS is not set
+# CONFIG_JFS_FS is not set
+# CONFIG_FS_POSIX_ACL is not set
+
+#
+# XFS support
+#
+CONFIG_XFS_FS=y
+# CONFIG_XFS_RT is not set
+CONFIG_XFS_QUOTA=y
+# CONFIG_XFS_SECURITY is not set
+CONFIG_XFS_POSIX_ACL=y
+# CONFIG_OCFS2_FS is not set
+# CONFIG_MINIX_FS is not set
+CONFIG_ROMFS_FS=m
+CONFIG_INOTIFY=y
+# CONFIG_QUOTA is not set
+CONFIG_QUOTACTL=y
+# CONFIG_DNOTIFY is not set
+# CONFIG_AUTOFS_FS is not set
+CONFIG_AUTOFS4_FS=y
+# CONFIG_FUSE_FS is not set
+
+#
+# CD-ROM/DVD Filesystems
+#
+# CONFIG_ISO9660_FS is not set
+# CONFIG_UDF_FS is not set
+
+#
+# DOS/FAT/NT Filesystems
+#
+# CONFIG_MSDOS_FS is not set
+# CONFIG_VFAT_FS is not set
+# CONFIG_NTFS_FS is not set
+
+#
+# Pseudo filesystems
+#
+CONFIG_PROC_FS=y
+CONFIG_PROC_KCORE=y
+CONFIG_SYSFS=y
+CONFIG_TMPFS=y
+# CONFIG_HUGETLB_PAGE is not set
+CONFIG_RAMFS=y
+# CONFIG_CONFIGFS_FS is not set
+# CONFIG_RELAYFS_FS is not set
+
+#
+# Miscellaneous filesystems
+#
+# CONFIG_ADFS_FS is not set
+# CONFIG_AFFS_FS is not set
+# CONFIG_ASFS_FS is not set
+# CONFIG_HFS_FS is not set
+# CONFIG_HFSPLUS_FS is not set
+# CONFIG_BEFS_FS is not set
+# CONFIG_BFS_FS is not set
+# CONFIG_EFS_FS is not set
+CONFIG_CRAMFS=m
+# CONFIG_VXFS_FS is not set
+# CONFIG_HPFS_FS is not set
+# CONFIG_QNX4FS_FS is not set
+# CONFIG_SYSV_FS is not set
+# CONFIG_UFS_FS is not set
+
+#
+# Network File Systems
+#
+CONFIG_NFS_FS=y
+CONFIG_NFS_V3=y
+# CONFIG_NFS_V3_ACL is not set
+# CONFIG_NFS_V4 is not set
+# CONFIG_NFS_DIRECTIO is not set
+# CONFIG_NFSD is not set
+CONFIG_ROOT_NFS=y
+CONFIG_LOCKD=y
+CONFIG_LOCKD_V4=y
+CONFIG_NFS_COMMON=y
+CONFIG_SUNRPC=y
+# CONFIG_RPCSEC_GSS_KRB5 is not set
+# CONFIG_RPCSEC_GSS_SPKM3 is not set
+# CONFIG_SMB_FS is not set
+# CONFIG_CIFS is not set
+# CONFIG_NCP_FS is not set
+# CONFIG_CODA_FS is not set
+# CONFIG_AFS_FS is not set
+# CONFIG_9P_FS is not set
+
+#
+# Partition Types
+#
+# CONFIG_PARTITION_ADVANCED is not set
+CONFIG_MSDOS_PARTITION=y
+
+#
+# Native Language Support
+#
+# CONFIG_NLS is not set
+
+#
+# Kernel hacking
+#
+# CONFIG_PRINTK_TIME is not set
+# CONFIG_DEBUG_KERNEL is not set
+CONFIG_LOG_BUF_SHIFT=14
+CONFIG_CROSSCOMPILE=y
+CONFIG_CMDLINE="mem=64M console=ttyVR0,115200 ip=any root=/dev/nfs"
+
+#
+# Security options
+#
+CONFIG_KEYS=y
+CONFIG_KEYS_DEBUG_PROC_KEYS=y
+# CONFIG_SECURITY is not set
+
+#
+# Cryptographic options
+#
+# CONFIG_CRYPTO is not set
+
+#
+# Hardware crypto devices
+#
+
+#
+# Library routines
+#
+# CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
+CONFIG_CRC32=y
+# CONFIG_LIBCRC32C is not set
+CONFIG_ZLIB_INFLATE=m
+CONFIG_GENERIC_HARDIRQS=y
+CONFIG_GENERIC_IRQ_PROBE=y
+CONFIG_ISA_DMA_API=y
diff --git a/arch/mips/kernel/genrtc.c b/arch/mips/kernel/genrtc.c
index 288bf51ad4ec..71416e7bbbaa 100644
--- a/arch/mips/kernel/genrtc.c
+++ b/arch/mips/kernel/genrtc.c
@@ -14,7 +14,7 @@
 #include <asm/rtc.h>
 #include <asm/time.h>
 
-static spinlock_t mips_rtc_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(mips_rtc_lock);
 
 unsigned int get_rtc_time(struct rtc_time *time)
 {
diff --git a/arch/mips/kernel/i8259.c b/arch/mips/kernel/i8259.c
index 7eec7568bfea..447759201d1d 100644
--- a/arch/mips/kernel/i8259.c
+++ b/arch/mips/kernel/i8259.c
@@ -31,7 +31,7 @@ void disable_8259A_irq(unsigned int irq);
  * moves to arch independent land
  */
 
-spinlock_t i8259A_lock = SPIN_LOCK_UNLOCKED;
+spinlock_t DEFINE_SPINLOCK(i8259A_lock);
 
 static void end_8259A_irq (unsigned int irq)
 {
diff --git a/arch/mips/kernel/irixioctl.c b/arch/mips/kernel/irixioctl.c
index 4cd3d38a22c2..3cdc22346f4c 100644
--- a/arch/mips/kernel/irixioctl.c
+++ b/arch/mips/kernel/irixioctl.c
@@ -14,6 +14,7 @@
 #include <linux/syscalls.h>
 #include <linux/tty.h>
 #include <linux/file.h>
+#include <linux/rcupdate.h>
 
 #include <asm/uaccess.h>
 #include <asm/ioctl.h>
@@ -33,7 +34,7 @@ static struct tty_struct *get_tty(int fd)
         struct file *filp;
         struct tty_struct *ttyp = NULL;
 
-        spin_lock(&current->files->file_lock);
+        rcu_read_lock();
         filp = fcheck(fd);
         if(filp && filp->private_data) {
                 ttyp = (struct tty_struct *) filp->private_data;
@@ -41,7 +42,7 @@ static struct tty_struct *get_tty(int fd)
                 if(ttyp->magic != TTY_MAGIC)
                         ttyp =NULL;
         }
-        spin_unlock(&current->files->file_lock);
+        rcu_read_unlock();
         return ttyp;
 }
 
diff --git a/arch/mips/kernel/irixsig.c b/arch/mips/kernel/irixsig.c
index 4c114ae21793..eff89322ba50 100644
--- a/arch/mips/kernel/irixsig.c
+++ b/arch/mips/kernel/irixsig.c
@@ -440,18 +440,6 @@ struct irix5_siginfo {
         } stuff;
 };
 
-static inline unsigned long timespectojiffies(struct timespec *value)
-{
-        unsigned long sec = (unsigned) value->tv_sec;
-        long nsec = value->tv_nsec;
-
-        if (sec > (LONG_MAX / HZ))
-                return LONG_MAX;
-        nsec += 1000000000L / HZ - 1;
-        nsec /= 1000000000L / HZ;
-        return HZ * sec + nsec;
-}
-
 asmlinkage int irix_sigpoll_sys(unsigned long *set, struct irix5_siginfo *info,
                                 struct timespec *tp)
 {
@@ -489,14 +477,13 @@ asmlinkage int irix_sigpoll_sys(unsigned long *set, struct irix5_siginfo *info,
                         error = -EINVAL;
                         goto out;
                 }
-                expire = timespectojiffies(tp)+(tp->tv_sec||tp->tv_nsec);
+                expire = timespec_to_jiffies(tp) + (tp->tv_sec||tp->tv_nsec);
         }
 
         while(1) {
                 long tmp = 0;
 
-                current->state = TASK_INTERRUPTIBLE;
-                expire = schedule_timeout(expire);
+                expire = schedule_timeout_interruptible(expire);
 
                 for (i=0; i<=4; i++)
                         tmp |= (current->pending.signal.sig[i] & kset.sig[i]);
diff --git a/arch/mips/kernel/linux32.c b/arch/mips/kernel/linux32.c
index 4613219dd73e..ece4564919d8 100644
--- a/arch/mips/kernel/linux32.c
+++ b/arch/mips/kernel/linux32.c
@@ -546,20 +546,20 @@ struct msgbuf32 { s32 mtype; char mtext[1]; };
 struct ipc_perm32
 {
         key_t             key;
-        compat_uid_t  uid;
-        compat_gid_t  gid;
-        compat_uid_t  cuid;
-        compat_gid_t  cgid;
+        __compat_uid_t  uid;
+        __compat_gid_t  gid;
+        __compat_uid_t  cuid;
+        __compat_gid_t  cgid;
         compat_mode_t   mode;
         unsigned short  seq;
 };
 
 struct ipc64_perm32 {
         key_t key;
-        compat_uid_t uid;
-        compat_gid_t gid;
-        compat_uid_t cuid;
-        compat_gid_t cgid;
+        __compat_uid_t uid;
+        __compat_gid_t gid;
+        __compat_uid_t cuid;
+        __compat_gid_t cgid;
         compat_mode_t   mode;
         unsigned short  seq;
         unsigned short __pad1;
diff --git a/arch/mips/kernel/r2300_fpu.S b/arch/mips/kernel/r2300_fpu.S
index f83c31f720c4..ac68e68339db 100644
--- a/arch/mips/kernel/r2300_fpu.S
+++ b/arch/mips/kernel/r2300_fpu.S
@@ -15,7 +15,7 @@
 #include <asm/errno.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(a,b)                                                 \
diff --git a/arch/mips/kernel/r2300_switch.S b/arch/mips/kernel/r2300_switch.S
index f10019640ee9..0d9c4a32a9c2 100644
--- a/arch/mips/kernel/r2300_switch.S
+++ b/arch/mips/kernel/r2300_switch.S
@@ -15,7 +15,7 @@
 #include <asm/cachectl.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/regdef.h>
 #include <asm/stackframe.h>
diff --git a/arch/mips/kernel/r4k_fpu.S b/arch/mips/kernel/r4k_fpu.S
index aba665bcb386..1a14c6b18829 100644
--- a/arch/mips/kernel/r4k_fpu.S
+++ b/arch/mips/kernel/r4k_fpu.S
@@ -17,7 +17,7 @@
 #include <asm/errno.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
         .macro  EX insn, reg, src
diff --git a/arch/mips/kernel/r4k_switch.S b/arch/mips/kernel/r4k_switch.S
index e02b7722ccb8..d2afbd19a9c8 100644
--- a/arch/mips/kernel/r4k_switch.S
+++ b/arch/mips/kernel/r4k_switch.S
@@ -15,7 +15,7 @@
 #include <asm/cachectl.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <asm/pgtable-bits.h>
 #include <asm/regdef.h>
diff --git a/arch/mips/kernel/r6000_fpu.S b/arch/mips/kernel/r6000_fpu.S
index d8d3b13fe57f..43cda53f5af6 100644
--- a/arch/mips/kernel/r6000_fpu.S
+++ b/arch/mips/kernel/r6000_fpu.S
@@ -13,7 +13,7 @@
 #include <asm/asm.h>
 #include <asm/fpregdef.h>
 #include <asm/mipsregs.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
         .set    noreorder
diff --git a/arch/mips/kernel/scall32-o32.S b/arch/mips/kernel/scall32-o32.S
index 344f2e29eb61..17b5030fb6ea 100644
--- a/arch/mips/kernel/scall32-o32.S
+++ b/arch/mips/kernel/scall32-o32.S
@@ -19,7 +19,7 @@
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
 #include <asm/war.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 
 /* Highest syscall used of any syscall flavour */
 #define MAX_SYSCALL_NO  __NR_O32_Linux + __NR_O32_Linux_syscalls
diff --git a/arch/mips/kernel/scall64-64.S b/arch/mips/kernel/scall64-64.S
index 32efb888160a..ffb22a2068bf 100644
--- a/arch/mips/kernel/scall64-64.S
+++ b/arch/mips/kernel/scall64-64.S
@@ -14,7 +14,7 @@
 #include <asm/mipsregs.h>
 #include <asm/regdef.h>
 #include <asm/stackframe.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/sysmips.h>
 #include <asm/thread_info.h>
 #include <asm/unistd.h>
diff --git a/arch/mips/kernel/syscall.c b/arch/mips/kernel/syscall.c
index ae2a1312d4ef..21e3e13a4b44 100644
--- a/arch/mips/kernel/syscall.c
+++ b/arch/mips/kernel/syscall.c
@@ -31,7 +31,7 @@
 #include <asm/cachectl.h>
 #include <asm/cacheflush.h>
 #include <asm/ipc.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/signal.h>
 #include <asm/sim.h>
 #include <asm/shmparam.h>
diff --git a/arch/mips/kernel/sysirix.c b/arch/mips/kernel/sysirix.c
index f3bf0e43b8bb..4de155699c4f 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -632,10 +632,7 @@ asmlinkage int irix_stime(int value)
         write_seqlock_irq(&xtime_lock);
         xtime.tv_sec = value;
         xtime.tv_nsec = 0;
-        time_adjust = 0;                        /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
 
         return 0;
@@ -1035,8 +1032,7 @@ bad:
 
 asmlinkage int irix_sginap(int ticks)
 {
-        current->state = TASK_INTERRUPTIBLE;
-        schedule_timeout(ticks);
+        schedule_timeout_interruptible(ticks);
         return 0;
 }
 
diff --git a/arch/mips/kernel/time.c b/arch/mips/kernel/time.c
index 648c82292ed6..0dd0df7a3b04 100644
--- a/arch/mips/kernel/time.c
+++ b/arch/mips/kernel/time.c
@@ -223,10 +223,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                        /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
@@ -442,7 +439,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * called as close as possible to 500 ms before the new second starts.
          */
         write_seqlock(&xtime_lock);
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
diff --git a/arch/mips/lib-32/memset.S b/arch/mips/lib-32/memset.S
index ad9ff4071ce9..1981485bd48b 100644
--- a/arch/mips/lib-32/memset.S
+++ b/arch/mips/lib-32/memset.S
@@ -7,7 +7,7 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                       \
diff --git a/arch/mips/lib-64/memset.S b/arch/mips/lib-64/memset.S
index 242f1976cfaf..e2c42c85113b 100644
--- a/arch/mips/lib-64/memset.S
+++ b/arch/mips/lib-64/memset.S
@@ -7,7 +7,7 @@
  * Copyright (C) 1999, 2000 Silicon Graphics, Inc.
  */
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                       \
diff --git a/arch/mips/lib/dec_and_lock.c b/arch/mips/lib/dec_and_lock.c
index e44e9579bd36..fd82c84a93b7 100644
--- a/arch/mips/lib/dec_and_lock.c
+++ b/arch/mips/lib/dec_and_lock.c
@@ -20,14 +20,7 @@
  * has a cmpxchg, and where atomic->value is an int holding
  * the value of the atomic (i.e. the high bits aren't used
  * for a lock or anything like that).
- *
- * N.B. ATOMIC_DEC_AND_LOCK gets defined in include/linux/spinlock.h
- * if spinlocks are empty and thus atomic_dec_and_lock is defined
- * to be atomic_dec_and_test - in that case we don't need it
- * defined here as well.
  */
-
-#ifndef ATOMIC_DEC_AND_LOCK
 int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 {
         int counter;
@@ -52,4 +45,3 @@ int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 }
 
 EXPORT_SYMBOL(_atomic_dec_and_lock);
-#endif /* ATOMIC_DEC_AND_LOCK */
diff --git a/arch/mips/lib/memcpy.S b/arch/mips/lib/memcpy.S
index 90ee8d43261f..a78865f76547 100644
--- a/arch/mips/lib/memcpy.S
+++ b/arch/mips/lib/memcpy.S
@@ -14,7 +14,7 @@
  */
 #include <linux/config.h>
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define dst a0
diff --git a/arch/mips/lib/strlen_user.S b/arch/mips/lib/strlen_user.S
index 07660e86c99d..eca558d83a37 100644
--- a/arch/mips/lib/strlen_user.S
+++ b/arch/mips/lib/strlen_user.S
@@ -7,7 +7,7 @@
  * Copyright (c) 1999 Silicon Graphics, Inc.
  */
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                       \
diff --git a/arch/mips/lib/strncpy_user.S b/arch/mips/lib/strncpy_user.S
index 14bed17c1648..d16c76fbfac7 100644
--- a/arch/mips/lib/strncpy_user.S
+++ b/arch/mips/lib/strncpy_user.S
@@ -7,7 +7,7 @@
  */
 #include <linux/errno.h>
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                       \
diff --git a/arch/mips/lib/strnlen_user.S b/arch/mips/lib/strnlen_user.S
index 6e7a8eed4de8..c0ea15194a0e 100644
--- a/arch/mips/lib/strnlen_user.S
+++ b/arch/mips/lib/strnlen_user.S
@@ -7,7 +7,7 @@
  * Copyright (c) 1999 Silicon Graphics, Inc.
  */
 #include <asm/asm.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/regdef.h>
 
 #define EX(insn,reg,addr,handler)                       \
diff --git a/arch/mips/pci/Makefile b/arch/mips/pci/Makefile
index c53e4cb359ba..83d81c9cdc2b 100644
--- a/arch/mips/pci/Makefile
+++ b/arch/mips/pci/Makefile
@@ -48,6 +48,7 @@ obj-$(CONFIG_SIBYTE_SB1250)	+= fixup-sb1250.o pci-sb1250.o
 obj-$(CONFIG_SNI_RM200_PCI)     += fixup-sni.o ops-sni.o
 obj-$(CONFIG_TANBAC_TB0219)     += fixup-tb0219.o
 obj-$(CONFIG_TANBAC_TB0226)     += fixup-tb0226.o
+obj-$(CONFIG_TANBAC_TB0287)     += fixup-tb0287.o
 obj-$(CONFIG_TOSHIBA_JMR3927)   += fixup-jmr3927.o pci-jmr3927.o
 obj-$(CONFIG_TOSHIBA_RBTX4927)  += fixup-rbtx4927.o ops-tx4927.o
 obj-$(CONFIG_VICTOR_MPC30X)     += fixup-mpc30x.o
diff --git a/arch/mips/pci/fixup-tb0287.c b/arch/mips/pci/fixup-tb0287.c
new file mode 100644
index 000000000000..8436d7f1fdb2
--- /dev/null
+++ b/arch/mips/pci/fixup-tb0287.c
@@ -0,0 +1,65 @@
+/*
+ *  fixup-tb0287.c, The TANBAC TB0287 specific PCI fixups.
+ *
+ *  Copyright (C) 2005  Yoichi Yuasa <yuasa@hh.iij4u.or.jp>
+ *
+ *  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.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#include <linux/init.h>
+#include <linux/pci.h>
+
+#include <asm/vr41xx/tb0287.h>
+
+int __init pcibios_map_irq(struct pci_dev *dev, u8 slot, u8 pin)
+{
+        unsigned char bus;
+        int irq = -1;
+
+        bus = dev->bus->number;
+        if (bus == 0) {
+                switch (slot) {
+                case 16:
+                        irq = TB0287_SM501_IRQ;
+                        break;
+                case 17:
+                        irq = TB0287_SIL680A_IRQ;
+                        break;
+                default:
+                        break;
+                }
+        } else if (bus == 1) {
+                switch (PCI_SLOT(dev->devfn)) {
+                case 0:
+                        irq = TB0287_PCI_SLOT_IRQ;
+                        break;
+                case 2:
+                case 3:
+                        irq = TB0287_RTL8110_IRQ;
+                        break;
+                default:
+                        break;
+                }
+        } else if (bus > 1) {
+                irq = TB0287_PCI_SLOT_IRQ;
+        }
+
+        return irq;
+}
+
+/* Do platform specific device initialization at pci_enable_device() time */
+int pcibios_plat_dev_init(struct pci_dev *dev)
+{
+        return 0;
+}
diff --git a/arch/mips/sgi-ip27/ip27-timer.c b/arch/mips/sgi-ip27/ip27-timer.c
index 8c1b96fffa76..cddf1cedf007 100644
--- a/arch/mips/sgi-ip27/ip27-timer.c
+++ b/arch/mips/sgi-ip27/ip27-timer.c
@@ -118,7 +118,7 @@ again:
          * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to when a second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
diff --git a/arch/parisc/Kconfig b/arch/parisc/Kconfig
index 1c2d87435233..0b07922a2ac6 100644
--- a/arch/parisc/Kconfig
+++ b/arch/parisc/Kconfig
@@ -49,6 +49,10 @@ config ISA_DMA_API
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index 0403d2fcb85e..3b339b1cce13 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -100,15 +100,7 @@ kernel_install: vmlinux
 
 install: kernel_install modules_install
 
-prepare: include/asm-parisc/offsets.h
-
-arch/parisc/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-parisc/offsets.h: arch/parisc/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES     += lifimage include/asm-parisc/offsets.h
+CLEAN_FILES     += lifimage
 MRPROPER_FILES  += palo.conf
 
 define archhelp
diff --git a/arch/parisc/hpux/gate.S b/arch/parisc/hpux/gate.S
index 2680a1c0fa77..aaaf3306c05a 100644
--- a/arch/parisc/hpux/gate.S
+++ b/arch/parisc/hpux/gate.S
@@ -9,7 +9,7 @@
  */
 
 #include <asm/assembly.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/errno.h>
 
diff --git a/arch/parisc/hpux/wrappers.S b/arch/parisc/hpux/wrappers.S
index 1aa936dfe147..0b0c3a66b1be 100644
--- a/arch/parisc/hpux/wrappers.S
+++ b/arch/parisc/hpux/wrappers.S
@@ -24,7 +24,7 @@
 #warning PA64 support needs more work...did first cut
 #endif
 
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/assembly.h>
 #include <asm/signal.h>
 
diff --git a/arch/parisc/kernel/entry.S b/arch/parisc/kernel/entry.S
index ee58d37dbb27..be0f07f2fa58 100644
--- a/arch/parisc/kernel/entry.S
+++ b/arch/parisc/kernel/entry.S
@@ -23,7 +23,7 @@
  */
 
 #include <linux/config.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 /* we have the following possibilities to act on an interruption:
  *  - handle in assembly and use shadowed registers only
diff --git a/arch/parisc/kernel/head.S b/arch/parisc/kernel/head.S
index ddf7e914f15e..28405edf8448 100644
--- a/arch/parisc/kernel/head.S
+++ b/arch/parisc/kernel/head.S
@@ -14,7 +14,7 @@
 
 #include <linux/autoconf.h>     /* for CONFIG_SMP */
 
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/psw.h>
 #include <asm/pdc.h>
         
diff --git a/arch/parisc/kernel/process.c b/arch/parisc/kernel/process.c
index 4fc04501d5e5..46b759385115 100644
--- a/arch/parisc/kernel/process.c
+++ b/arch/parisc/kernel/process.c
@@ -47,7 +47,7 @@
 #include <linux/kallsyms.h>
 
 #include <asm/io.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pdc.h>
 #include <asm/pdc_chassis.h>
 #include <asm/pgalloc.h>
diff --git a/arch/parisc/kernel/ptrace.c b/arch/parisc/kernel/ptrace.c
index c07db9dff7cd..f3428e5e86fb 100644
--- a/arch/parisc/kernel/ptrace.c
+++ b/arch/parisc/kernel/ptrace.c
@@ -23,7 +23,7 @@
 #include <asm/pgtable.h>
 #include <asm/system.h>
 #include <asm/processor.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 /* PSW bits we allow the debugger to modify */
 #define USER_PSW_BITS   (PSW_N | PSW_V | PSW_CB)
diff --git a/arch/parisc/kernel/signal.c b/arch/parisc/kernel/signal.c
index 55d71c15e1f7..0224651fd8f1 100644
--- a/arch/parisc/kernel/signal.c
+++ b/arch/parisc/kernel/signal.c
@@ -32,7 +32,7 @@
 #include <asm/uaccess.h>
 #include <asm/pgalloc.h>
 #include <asm/cacheflush.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #ifdef CONFIG_COMPAT
 #include <linux/compat.h>
diff --git a/arch/parisc/kernel/syscall.S b/arch/parisc/kernel/syscall.S
index 32ea701f4d20..8c7a7185cd3b 100644
--- a/arch/parisc/kernel/syscall.S
+++ b/arch/parisc/kernel/syscall.S
@@ -7,7 +7,7 @@
  * sorry about the wall, puffin..
  */
 
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/errno.h>
 #include <asm/psw.h>
diff --git a/arch/parisc/kernel/time.c b/arch/parisc/kernel/time.c
index 6cf7407344ba..7ff67f8e9f8c 100644
--- a/arch/parisc/kernel/time.c
+++ b/arch/parisc/kernel/time.c
@@ -188,10 +188,7 @@ do_settimeofday (struct timespec *tv)
                 set_normalized_timespec(&xtime, sec, nsec);
                 set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-                time_adjust = 0;                /* stop active adjtime() */
-                time_status |= STA_UNSYNC;
-                time_maxerror = NTP_PHASE_LIMIT;
-                time_esterror = NTP_PHASE_LIMIT;
+                ntp_clear();
         }
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
diff --git a/arch/parisc/lib/Makefile b/arch/parisc/lib/Makefile
index 7bf705676297..5f2e6904d14a 100644
--- a/arch/parisc/lib/Makefile
+++ b/arch/parisc/lib/Makefile
@@ -5,5 +5,3 @@
 lib-y   := lusercopy.o bitops.o checksum.o io.o memset.o fixup.o memcpy.o
 
 obj-y   := iomap.o
-
-lib-$(CONFIG_SMP) += debuglocks.o
diff --git a/arch/parisc/lib/bitops.c b/arch/parisc/lib/bitops.c
index 2de182f6fe8a..90f400b10282 100644
--- a/arch/parisc/lib/bitops.c
+++ b/arch/parisc/lib/bitops.c
@@ -13,8 +13,8 @@
 #include <asm/atomic.h>
 
 #ifdef CONFIG_SMP
-spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
-        [0 ... (ATOMIC_HASH_SIZE-1)]  = SPIN_LOCK_UNLOCKED
+raw_spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] __lock_aligned = {
+        [0 ... (ATOMIC_HASH_SIZE-1)]  = __RAW_SPIN_LOCK_UNLOCKED
 };
 #endif
 
diff --git a/arch/parisc/lib/debuglocks.c b/arch/parisc/lib/debuglocks.c
deleted file mode 100644
index 1b33fe6e5b7a..000000000000
--- a/arch/parisc/lib/debuglocks.c
+++ /dev/null
@@ -1,277 +0,0 @@
-/* 
- *    Debugging versions of SMP locking primitives.
- *
- *    Copyright (C) 2004 Thibaut VARENE <varenet@parisc-linux.org>
- *
- *    Some code stollen from alpha & sparc64 ;)
- *
- *    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.
- *
- *    This program is distributed in the hope that it will be useful,
- *    but WITHOUT ANY WARRANTY; without even the implied warranty of
- *    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *    GNU General Public License for more details.
- *
- *    You should have received a copy of the GNU General Public License
- *    along with this program; if not, write to the Free Software
- *    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- *    We use pdc_printf() throughout the file for all output messages, to avoid
- *    losing messages because of disabled interrupts. Since we're using these
- *    messages for debugging purposes, it makes sense not to send them to the
- *    linux console.
- */
-
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <linux/hardirq.h>      /* in_interrupt() */
-#include <asm/system.h>
-#include <asm/hardirq.h>        /* in_interrupt() */
-#include <asm/pdc.h>
-
-#undef INIT_STUCK
-#define INIT_STUCK 1L << 30
-
-#ifdef CONFIG_DEBUG_SPINLOCK
-
-
-void _dbg_spin_lock(spinlock_t * lock, const char *base_file, int line_no)
-{
-        volatile unsigned int *a;
-        long stuck = INIT_STUCK;
-        void *inline_pc = __builtin_return_address(0);
-        unsigned long started = jiffies;
-        int printed = 0;
-        int cpu = smp_processor_id();
-
-try_again:
-
-        /* Do the actual locking */
-        /* <T-Bone> ggg: we can't get stuck on the outter loop?
-         * <ggg> T-Bone: We can hit the outer loop
-         *      alot if multiple CPUs are constantly racing for a lock
-         *      and the backplane is NOT fair about which CPU sees
-         *      the update first. But it won't hang since every failed
-         *      attempt will drop us back into the inner loop and
-         *      decrement `stuck'.
-         * <ggg> K-class and some of the others are NOT fair in the HW
-         *      implementation so we could see false positives.
-         *      But fixing the lock contention is easier than
-         *      fixing the HW to be fair.
-         * <tausq> __ldcw() returns 1 if we get the lock; otherwise we
-         *      spin until the value of the lock changes, or we time out.
-         */
-        mb();
-        a = __ldcw_align(lock);
-        while (stuck && (__ldcw(a) == 0))
-                while ((*a == 0) && --stuck);
-        mb();
-
-        if (unlikely(stuck <= 0)) {
-                pdc_printf(
-                        "%s:%d: spin_lock(%s/%p) stuck in %s at %p(%d)"
-                        " owned by %s:%d in %s at %p(%d)\n",
-                        base_file, line_no, lock->module, lock,
-                        current->comm, inline_pc, cpu,
-                        lock->bfile, lock->bline, lock->task->comm,
-                        lock->previous, lock->oncpu);
-                stuck = INIT_STUCK;
-                printed = 1;
-                goto try_again;
-        }
-
-        /* Exiting.  Got the lock.  */
-        lock->oncpu = cpu;
-        lock->previous = inline_pc;
-        lock->task = current;
-        lock->bfile = (char *)base_file;
-        lock->bline = line_no;
-
-        if (unlikely(printed)) {
-                pdc_printf(
-                        "%s:%d: spin_lock grabbed in %s at %p(%d) %ld ticks\n",
-                        base_file, line_no, current->comm, inline_pc,
-                        cpu, jiffies - started);
-        }
-}
-
-void _dbg_spin_unlock(spinlock_t * lock, const char *base_file, int line_no)
-{
-        CHECK_LOCK(lock);
-        volatile unsigned int *a;
-        mb();
-        a = __ldcw_align(lock);
-        if (unlikely((*a != 0) && lock->babble)) {
-                lock->babble--;
-                pdc_printf(
-                        "%s:%d: spin_unlock(%s:%p) not locked\n",
-                        base_file, line_no, lock->module, lock);
-        }
-        *a = 1; 
-        mb();
-}
-
-int _dbg_spin_trylock(spinlock_t * lock, const char *base_file, int line_no)
-{
-        int ret;
-        volatile unsigned int *a;
-        mb();
-        a = __ldcw_align(lock);
-        ret = (__ldcw(a) != 0);
-        mb();
-        if (ret) {
-                lock->oncpu = smp_processor_id();
-                lock->previous = __builtin_return_address(0);
-                lock->task = current;
-        } else {
-                lock->bfile = (char *)base_file;
-                lock->bline = line_no;
-        }
-        return ret;
-}
-
-#endif /* CONFIG_DEBUG_SPINLOCK */
-
-#ifdef CONFIG_DEBUG_RWLOCK
-
-/* Interrupts trouble detailed explanation, thx Grant:
- *
- * o writer (wants to modify data) attempts to acquire the rwlock
- * o He gets the write lock.
- * o Interupts are still enabled, we take an interrupt with the
- *   write still holding the lock.
- * o interrupt handler tries to acquire the rwlock for read.
- * o deadlock since the writer can't release it at this point.
- * 
- * In general, any use of spinlocks that competes between "base"
- * level and interrupt level code will risk deadlock. Interrupts
- * need to be disabled in the base level routines to avoid it.
- * Or more precisely, only the IRQ the base level routine
- * is competing with for the lock.  But it's more efficient/faster
- * to just disable all interrupts on that CPU to guarantee
- * once it gets the lock it can release it quickly too.
- */
- 
-void _dbg_write_lock(rwlock_t *rw, const char *bfile, int bline)
-{
-        void *inline_pc = __builtin_return_address(0);
-        unsigned long started = jiffies;
-        long stuck = INIT_STUCK;
-        int printed = 0;
-        int cpu = smp_processor_id();
-        
-        if(unlikely(in_interrupt())) {  /* acquiring write lock in interrupt context, bad idea */
-                pdc_printf("write_lock caller: %s:%d, IRQs enabled,\n", bfile, bline);
-                BUG();
-        }
-
-        /* Note: if interrupts are disabled (which is most likely), the printk
-        will never show on the console. We might need a polling method to flush
-        the dmesg buffer anyhow. */
-        
-retry:
-        _raw_spin_lock(&rw->lock);
-
-        if(rw->counter != 0) {
-                /* this basically never happens */
-                _raw_spin_unlock(&rw->lock);
-                
-                stuck--;
-                if ((unlikely(stuck <= 0)) && (rw->counter < 0)) {
-                        pdc_printf(
-                                "%s:%d: write_lock stuck on writer"
-                                " in %s at %p(%d) %ld ticks\n",
-                                bfile, bline, current->comm, inline_pc,
-                                cpu, jiffies - started);
-                        stuck = INIT_STUCK;
-                        printed = 1;
-                }
-                else if (unlikely(stuck <= 0)) {
-                        pdc_printf(
-                                "%s:%d: write_lock stuck on reader"
-                                " in %s at %p(%d) %ld ticks\n",
-                                bfile, bline, current->comm, inline_pc,
-                                cpu, jiffies - started);
-                        stuck = INIT_STUCK;
-                        printed = 1;
-                }
-                
-                while(rw->counter != 0);
-
-                goto retry;
-        }
-
-        /* got it.  now leave without unlocking */
-        rw->counter = -1; /* remember we are locked */
-
-        if (unlikely(printed)) {
-                pdc_printf(
-                        "%s:%d: write_lock grabbed in %s at %p(%d) %ld ticks\n",
-                        bfile, bline, current->comm, inline_pc,
-                        cpu, jiffies - started);
-        }
-}
-
-int _dbg_write_trylock(rwlock_t *rw, const char *bfile, int bline)
-{
-#if 0
-        void *inline_pc = __builtin_return_address(0);
-        int cpu = smp_processor_id();
-#endif
-        
-        if(unlikely(in_interrupt())) {  /* acquiring write lock in interrupt context, bad idea */
-                pdc_printf("write_lock caller: %s:%d, IRQs enabled,\n", bfile, bline);
-                BUG();
-        }
-
-        /* Note: if interrupts are disabled (which is most likely), the printk
-        will never show on the console. We might need a polling method to flush
-        the dmesg buffer anyhow. */
-        
-        _raw_spin_lock(&rw->lock);
-
-        if(rw->counter != 0) {
-                /* this basically never happens */
-                _raw_spin_unlock(&rw->lock);
-                return 0;
-        }
-
-        /* got it.  now leave without unlocking */
-        rw->counter = -1; /* remember we are locked */
-#if 0
-        pdc_printf("%s:%d: try write_lock grabbed in %s at %p(%d)\n",
-                   bfile, bline, current->comm, inline_pc, cpu);
-#endif
-        return 1;
-}
-
-void _dbg_read_lock(rwlock_t * rw, const char *bfile, int bline)
-{
-#if 0
-        void *inline_pc = __builtin_return_address(0);
-        unsigned long started = jiffies;
-        int cpu = smp_processor_id();
-#endif
-        unsigned long flags;
-
-        local_irq_save(flags);
-        _raw_spin_lock(&rw->lock); 
-
-        rw->counter++;
-#if 0
-        pdc_printf(
-                "%s:%d: read_lock grabbed in %s at %p(%d) %ld ticks\n",
-                bfile, bline, current->comm, inline_pc,
-                cpu, jiffies - started);
-#endif
-        _raw_spin_unlock(&rw->lock);
-        local_irq_restore(flags);
-}
-
-#endif /* CONFIG_DEBUG_RWLOCK */
diff --git a/arch/parisc/lib/fixup.S b/arch/parisc/lib/fixup.S
index 134f0cd240f5..1b91612ed964 100644
--- a/arch/parisc/lib/fixup.S
+++ b/arch/parisc/lib/fixup.S
@@ -20,7 +20,7 @@
  * Fixup routines for kernel exception handling.
  */
 #include <linux/config.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/assembly.h>
 #include <asm/errno.h>
 
diff --git a/arch/ppc/8xx_io/cs4218_tdm.c b/arch/ppc/8xx_io/cs4218_tdm.c
index 89fe0ceeaa40..2ca9ec7ec3a7 100644
--- a/arch/ppc/8xx_io/cs4218_tdm.c
+++ b/arch/ppc/8xx_io/cs4218_tdm.c
@@ -1380,7 +1380,7 @@ static void cs_nosound(unsigned long xx)
         spin_unlock_irqrestore(&cs4218_lock, flags);
 }
 
-static struct timer_list beep_timer = TIMER_INITIALIZER(cs_nosound, 0, 0);
+static DEFINE_TIMER(beep_timer, cs_nosound, 0, 0);
 };
 
 static void cs_mksound(unsigned int hz, unsigned int ticks)
diff --git a/arch/ppc/Kconfig b/arch/ppc/Kconfig
index 36dee0ff5ca0..347ea284140b 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -47,6 +47,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 menu "Processor"
@@ -261,6 +265,15 @@ config PPC601_SYNC_FIX
 
           If in doubt, say Y here.
 
+config HOTPLUG_CPU
+        bool "Support for enabling/disabling CPUs"
+        depends on SMP && HOTPLUG && EXPERIMENTAL && PPC_PMAC
+        ---help---
+          Say Y here to be able to disable and re-enable individual
+          CPUs at runtime on SMP machines.
+
+          Say N if you are unsure.
+
 source arch/ppc/platforms/4xx/Kconfig
 source arch/ppc/platforms/85xx/Kconfig
 
@@ -495,11 +508,6 @@ config WINCEPT
           MPC821 PowerPC, introduced in 1998 and designed to be used in
           thin-client machines.  Say Y to support it directly.
 
-          Be aware that PCI buses can only function when SYS board is plugged
-          into the PIB (Platform IO Board) board from Freescale which provide
-          3 PCI slots.  The PIBs PCI initialization is the bootloader's
-          responsiblilty.
-
 endchoice
 
 choice
@@ -676,6 +684,11 @@ config MPC834x_SYS
         help
           This option enables support for the MPC 834x SYS evaluation board.
 
+          Be aware that PCI buses can only function when SYS board is plugged
+          into the PIB (Platform IO Board) board from Freescale which provide
+          3 PCI slots.  The PIBs PCI initialization is the bootloader's
+          responsiblilty.
+
 config EV64360
         bool "Marvell-EV64360BP"
         help
diff --git a/arch/ppc/Makefile b/arch/ppc/Makefile
index d1b6e6dcb504..6dd7b50e0669 100644
--- a/arch/ppc/Makefile
+++ b/arch/ppc/Makefile
@@ -21,13 +21,14 @@ CC		:= $(CC) -m32
 endif
 
 LDFLAGS_vmlinux := -Ttext $(KERNELLOAD) -Bstatic
-CPPFLAGS        += -Iarch/$(ARCH) -Iinclude3
+# The -Iarch/$(ARCH)/include is temporary while we are merging
+CPPFLAGS        += -Iarch/$(ARCH) -Iarch/$(ARCH)/include
 AFLAGS          += -Iarch/$(ARCH)
 CFLAGS          += -Iarch/$(ARCH) -msoft-float -pipe \
                 -ffixed-r2 -mmultiple
 CPP             = $(CC) -E $(CFLAGS)
 # Temporary hack until we have migrated to asm-powerpc
-LINUXINCLUDE    += -Iinclude3
+LINUXINCLUDE    += -Iarch/$(ARCH)/include
 
 CHECKFLAGS      += -D__powerpc__
 
@@ -103,21 +104,16 @@ endef
 
 archclean:
         $(Q)$(MAKE) $(clean)=arch/ppc/boot
-        $(Q)rm -rf include3
+        # Temporary hack until we have migrated to asm-powerpc
+        $(Q)rm -rf arch/$(ARCH)/include
 
-prepare: include/asm-$(ARCH)/offsets.h checkbin
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
+prepare: checkbin
 
 # Temporary hack until we have migrated to asm-powerpc
-include/asm: include3/asm
-include3/asm:
-        $(Q)if [ ! -d include3 ]; then mkdir -p include3; fi
-        $(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
+include/asm: arch/$(ARCH)/include/asm
+arch/$(ARCH)/include/asm:
+        $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
+        $(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
 
 # Use the file '.tmp_gas_check' for binutils tests, as gas won't output
 # to stdout and these checks are run even on install targets.
@@ -143,7 +139,5 @@ checkbin:
                 false ; \
         fi
 
-CLEAN_FILES +=  include/asm-$(ARCH)/offsets.h \
-                arch/$(ARCH)/kernel/asm-offsets.s \
-                $(TOUT)
+CLEAN_FILES += $(TOUT)
 
diff --git a/arch/ppc/boot/common/ns16550.c b/arch/ppc/boot/common/ns16550.c
index 9017c547a6f6..26818bbb6cff 100644
--- a/arch/ppc/boot/common/ns16550.c
+++ b/arch/ppc/boot/common/ns16550.c
@@ -23,7 +23,7 @@ static int shift;
 
 unsigned long serial_init(int chan, void *ignored)
 {
-        unsigned long com_port;
+        unsigned long com_port, base_baud;
         unsigned char lcr, dlm;
 
         /* We need to find out which type io we're expecting.  If it's
@@ -43,6 +43,8 @@ unsigned long serial_init(int chan, void *ignored)
 
         /* How far apart the registers are. */
         shift = rs_table[chan].iomem_reg_shift;
+        /* Base baud.. */
+        base_baud = rs_table[chan].baud_base;
         
         /* save the LCR */
         lcr = inb(com_port + (UART_LCR << shift));
@@ -62,9 +64,9 @@ unsigned long serial_init(int chan, void *ignored)
         else {
                 /* Input clock. */
                 outb(com_port + (UART_DLL << shift),
-                     (BASE_BAUD / SERIAL_BAUD) & 0xFF);
+                     (base_baud / SERIAL_BAUD) & 0xFF);
                 outb(com_port + (UART_DLM << shift),
-                     (BASE_BAUD / SERIAL_BAUD) >> 8);
+                     (base_baud / SERIAL_BAUD) >> 8);
                 /* 8 data, 1 stop, no parity */
                 outb(com_port + (UART_LCR << shift), 0x03);
                 /* RTS/DTR */
diff --git a/arch/ppc/boot/common/util.S b/arch/ppc/boot/common/util.S
index 47e641455bc5..c96c9f80521e 100644
--- a/arch/ppc/boot/common/util.S
+++ b/arch/ppc/boot/common/util.S
@@ -252,7 +252,7 @@ _GLOBAL(flush_instruction_cache)
 1:      dcbf    r0,r3                   # Flush the data cache
         icbi    r0,r3                   # Invalidate the instruction cache
         addi    r3,r3,0x10              # Increment by one cache line
-        cmplwi  cr0,r3,r4               # Are we at the end yet?
+        cmplw   cr0,r3,r4               # Are we at the end yet?
         blt     1b                      # No, keep flushing and invalidating
 #else
         /* Enable, invalidate and then disable the L1 icache/dcache. */
diff --git a/arch/ppc/kernel/Makefile b/arch/ppc/kernel/Makefile
index b1457a8a9c0f..1fb92f16acd6 100644
--- a/arch/ppc/kernel/Makefile
+++ b/arch/ppc/kernel/Makefile
@@ -15,8 +15,9 @@ extra-y				+= vmlinux.lds
 obj-y                           := entry.o traps.o irq.o idle.o time.o misc.o \
                                         process.o signal.o ptrace.o align.o \
                                         semaphore.o syscalls.o setup.o \
-                                        cputable.o ppc_htab.o perfmon.o
+                                        cputable.o ppc_htab.o
 obj-$(CONFIG_6xx)               += l2cr.o cpu_setup_6xx.o
+obj-$(CONFIG_E500)              += perfmon.o
 obj-$(CONFIG_SOFTWARE_SUSPEND)  += swsusp.o
 obj-$(CONFIG_POWER4)            += cpu_setup_power4.o
 obj-$(CONFIG_MODULES)           += module.o ppc_ksyms.o
diff --git a/arch/ppc/kernel/cpu_setup_6xx.S b/arch/ppc/kernel/cpu_setup_6xx.S
index bd037caa4055..ba396438ede3 100644
--- a/arch/ppc/kernel/cpu_setup_6xx.S
+++ b/arch/ppc/kernel/cpu_setup_6xx.S
@@ -12,10 +12,9 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <asm/ppc_asm.h>
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cache.h>
 
 _GLOBAL(__setup_cpu_601)
diff --git a/arch/ppc/kernel/cpu_setup_power4.S b/arch/ppc/kernel/cpu_setup_power4.S
index f2ea1a990f17..7e4fbb653724 100644
--- a/arch/ppc/kernel/cpu_setup_power4.S
+++ b/arch/ppc/kernel/cpu_setup_power4.S
@@ -14,8 +14,7 @@
 #include <asm/page.h>
 #include <asm/ppc_asm.h>
 #include <asm/cputable.h>
-#include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cache.h>
 
 _GLOBAL(__970_cpu_preinit)
diff --git a/arch/ppc/kernel/dma-mapping.c b/arch/ppc/kernel/dma-mapping.c
index e0c631cf96b0..b566d982806c 100644
--- a/arch/ppc/kernel/dma-mapping.c
+++ b/arch/ppc/kernel/dma-mapping.c
@@ -393,7 +393,7 @@ EXPORT_SYMBOL(__dma_sync);
  * __dma_sync_page() implementation for systems using highmem.
  * In this case, each page of a buffer must be kmapped/kunmapped
  * in order to have a virtual address for __dma_sync(). This must
- * not sleep so kmap_atmomic()/kunmap_atomic() are used.
+ * not sleep so kmap_atomic()/kunmap_atomic() are used.
  *
  * Note: yes, it is possible and correct to have a buffer extend
  * beyond the first page.
diff --git a/arch/ppc/kernel/entry.S b/arch/ppc/kernel/entry.S
index cb83045e2edf..03d4886869f3 100644
--- a/arch/ppc/kernel/entry.S
+++ b/arch/ppc/kernel/entry.S
@@ -29,7 +29,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 
 #undef SHOW_SYSCALLS
diff --git a/arch/ppc/kernel/fpu.S b/arch/ppc/kernel/fpu.S
index 6189b26f640f..665d7d34304c 100644
--- a/arch/ppc/kernel/fpu.S
+++ b/arch/ppc/kernel/fpu.S
@@ -18,7 +18,7 @@
 #include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 /*
  * This task wants to use the FPU now.
diff --git a/arch/ppc/kernel/head.S b/arch/ppc/kernel/head.S
index a931d773715f..1960fb8c259c 100644
--- a/arch/ppc/kernel/head.S
+++ b/arch/ppc/kernel/head.S
@@ -31,7 +31,7 @@
 #include <asm/cache.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #ifdef CONFIG_APUS
 #include <asm/amigappc.h>
@@ -1023,23 +1023,21 @@ __secondary_start_gemini:
         andc    r4,r4,r3
         mtspr   SPRN_HID0,r4
         sync
-        bl      gemini_prom_init
         b       __secondary_start
 #endif /* CONFIG_GEMINI */
-        .globl  __secondary_start_psurge
-__secondary_start_psurge:
-        li      r24,1                   /* cpu # */
-        b       __secondary_start_psurge99
-        .globl  __secondary_start_psurge2
-__secondary_start_psurge2:
-        li      r24,2                   /* cpu # */
-        b       __secondary_start_psurge99
-        .globl  __secondary_start_psurge3
-__secondary_start_psurge3:
-        li      r24,3                   /* cpu # */
-        b       __secondary_start_psurge99
-__secondary_start_psurge99:
-        /* we come in here with IR=0 and DR=1, and DBAT 0
+
+        .globl  __secondary_start_pmac_0
+__secondary_start_pmac_0:
+        /* NB the entries for cpus 0, 1, 2 must each occupy 8 bytes. */
+        li      r24,0
+        b       1f
+        li      r24,1
+        b       1f
+        li      r24,2
+        b       1f
+        li      r24,3
+1:
+        /* on powersurge, we come in here with IR=0 and DR=1, and DBAT 0
            set to map the 0xf0000000 - 0xffffffff region */
         mfmsr   r0
         rlwinm  r0,r0,0,28,26           /* clear DR (0x10) */
diff --git a/arch/ppc/kernel/head_44x.S b/arch/ppc/kernel/head_44x.S
index 9e68e32edb60..599245b0407e 100644
--- a/arch/ppc/kernel/head_44x.S
+++ b/arch/ppc/kernel/head_44x.S
@@ -40,7 +40,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include "head_booke.h"
 
 
diff --git a/arch/ppc/kernel/head_4xx.S b/arch/ppc/kernel/head_4xx.S
index 0a5e723d3be6..8562b807b37c 100644
--- a/arch/ppc/kernel/head_4xx.S
+++ b/arch/ppc/kernel/head_4xx.S
@@ -40,7 +40,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 /* As with the other PowerPC ports, it is expected that when code
  * execution begins here, the following registers contain valid, yet
@@ -453,6 +453,7 @@ label:
 #else
         CRITICAL_EXCEPTION(0x1020, WDTException, UnknownException)
 #endif
+#endif
 
 /* 0x1100 - Data TLB Miss Exception
  * As the name implies, translation is not in the MMU, so search the
diff --git a/arch/ppc/kernel/head_8xx.S b/arch/ppc/kernel/head_8xx.S
index eb18cadb3755..cb1a3a54a026 100644
--- a/arch/ppc/kernel/head_8xx.S
+++ b/arch/ppc/kernel/head_8xx.S
@@ -30,7 +30,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 /* Macro to make the code more readable. */
 #ifdef CONFIG_8xx_CPU6
diff --git a/arch/ppc/kernel/head_fsl_booke.S b/arch/ppc/kernel/head_fsl_booke.S
index 4028f4c7d978..8e52e8408316 100644
--- a/arch/ppc/kernel/head_fsl_booke.S
+++ b/arch/ppc/kernel/head_fsl_booke.S
@@ -41,7 +41,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include "head_booke.h"
 
 /* As with the other PowerPC ports, it is expected that when code
diff --git a/arch/ppc/kernel/idle.c b/arch/ppc/kernel/idle.c
index 53547b6de45b..fba29c876b62 100644
--- a/arch/ppc/kernel/idle.c
+++ b/arch/ppc/kernel/idle.c
@@ -22,6 +22,7 @@
 #include <linux/ptrace.h>
 #include <linux/slab.h>
 #include <linux/sysctl.h>
+#include <linux/cpu.h>
 
 #include <asm/pgtable.h>
 #include <asm/uaccess.h>
@@ -35,6 +36,7 @@
 void default_idle(void)
 {
         void (*powersave)(void);
+        int cpu = smp_processor_id();
 
         powersave = ppc_md.power_save;
 
@@ -44,7 +46,7 @@ void default_idle(void)
 #ifdef CONFIG_SMP
                 else {
                         set_thread_flag(TIF_POLLING_NRFLAG);
-                        while (!need_resched())
+                        while (!need_resched() && !cpu_is_offline(cpu))
                                 barrier();
                         clear_thread_flag(TIF_POLLING_NRFLAG);
                 }
@@ -52,6 +54,8 @@ void default_idle(void)
         }
         if (need_resched())
                 schedule();
+        if (cpu_is_offline(cpu) && system_state == SYSTEM_RUNNING)
+                cpu_die();
 }
 
 /*
diff --git a/arch/ppc/kernel/idle_6xx.S b/arch/ppc/kernel/idle_6xx.S
index 25d009c75f7b..1a2194cf6828 100644
--- a/arch/ppc/kernel/idle_6xx.S
+++ b/arch/ppc/kernel/idle_6xx.S
@@ -20,7 +20,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #undef DEBUG
 
diff --git a/arch/ppc/kernel/idle_power4.S b/arch/ppc/kernel/idle_power4.S
index 73a58ff03900..cc0d535365cd 100644
--- a/arch/ppc/kernel/idle_power4.S
+++ b/arch/ppc/kernel/idle_power4.S
@@ -20,7 +20,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #undef DEBUG
 
diff --git a/arch/ppc/kernel/misc.S b/arch/ppc/kernel/misc.S
index ce71b4a01585..90d917d2e856 100644
--- a/arch/ppc/kernel/misc.S
+++ b/arch/ppc/kernel/misc.S
@@ -23,7 +23,7 @@
 #include <asm/mmu.h>
 #include <asm/ppc_asm.h>
 #include <asm/thread_info.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
 
diff --git a/arch/ppc/kernel/pci.c b/arch/ppc/kernel/pci.c
index 7b3586a3bf30..854e45beb387 100644
--- a/arch/ppc/kernel/pci.c
+++ b/arch/ppc/kernel/pci.c
@@ -80,7 +80,6 @@ fixup_broken_pcnet32(struct pci_dev* dev)
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
                 dev->vendor = PCI_VENDOR_ID_AMD;
                 pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-                pci_name_device(dev);
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID,                     fixup_broken_pcnet32);
diff --git a/arch/ppc/kernel/smp.c b/arch/ppc/kernel/smp.c
index e70b587b9e51..726fe7ce1747 100644
--- a/arch/ppc/kernel/smp.c
+++ b/arch/ppc/kernel/smp.c
@@ -45,6 +45,7 @@ cpumask_t cpu_online_map;
 cpumask_t cpu_possible_map;
 int smp_hw_index[NR_CPUS];
 struct thread_info *secondary_ti;
+static struct task_struct *idle_tasks[NR_CPUS];
 
 EXPORT_SYMBOL(cpu_online_map);
 EXPORT_SYMBOL(cpu_possible_map);
@@ -286,7 +287,8 @@ static void __devinit smp_store_cpu_info(int id)
 
 void __init smp_prepare_cpus(unsigned int max_cpus)
 {
-        int num_cpus, i;
+        int num_cpus, i, cpu;
+        struct task_struct *p;
 
         /* Fixup boot cpu */
         smp_store_cpu_info(smp_processor_id());
@@ -308,6 +310,17 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
 
         if (smp_ops->space_timers)
                 smp_ops->space_timers(num_cpus);
+
+        for_each_cpu(cpu) {
+                if (cpu == smp_processor_id())
+                        continue;
+                /* create a process for the processor */
+                p = fork_idle(cpu);
+                if (IS_ERR(p))
+                        panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p));
+                p->thread_info->cpu = cpu;
+                idle_tasks[cpu] = p;
+        }
 }
 
 void __devinit smp_prepare_boot_cpu(void)
@@ -334,12 +347,17 @@ int __devinit start_secondary(void *unused)
         set_dec(tb_ticks_per_jiffy);
         cpu_callin_map[cpu] = 1;
 
-        printk("CPU %i done callin...\n", cpu);
+        printk("CPU %d done callin...\n", cpu);
         smp_ops->setup_cpu(cpu);
-        printk("CPU %i done setup...\n", cpu);
-        local_irq_enable();
+        printk("CPU %d done setup...\n", cpu);
         smp_ops->take_timebase();
-        printk("CPU %i done timebase take...\n", cpu);
+        printk("CPU %d done timebase take...\n", cpu);
+
+        spin_lock(&call_lock);
+        cpu_set(cpu, cpu_online_map);
+        spin_unlock(&call_lock);
+
+        local_irq_enable();
 
         cpu_idle();
         return 0;
@@ -347,17 +365,11 @@ int __devinit start_secondary(void *unused)
 
 int __cpu_up(unsigned int cpu)
 {
-        struct task_struct *p;
         char buf[32];
         int c;
 
-        /* create a process for the processor */
-        /* only regs.msr is actually used, and 0 is OK for it */
-        p = fork_idle(cpu);
-        if (IS_ERR(p))
-                panic("failed fork for CPU %u: %li", cpu, PTR_ERR(p));
-        secondary_ti = p->thread_info;
-        p->thread_info->cpu = cpu;
+        secondary_ti = idle_tasks[cpu]->thread_info;
+        mb();
 
         /*
          * There was a cache flush loop here to flush the cache
@@ -389,7 +401,11 @@ int __cpu_up(unsigned int cpu)
         printk("Processor %d found.\n", cpu);
 
         smp_ops->give_timebase();
-        cpu_set(cpu, cpu_online_map);
+
+        /* Wait until cpu puts itself in the online map */
+        while (!cpu_online(cpu))
+                cpu_relax();
+
         return 0;
 }
 
diff --git a/arch/ppc/kernel/swsusp.S b/arch/ppc/kernel/swsusp.S
index 55148bb88d39..69773cc1a85f 100644
--- a/arch/ppc/kernel/swsusp.S
+++ b/arch/ppc/kernel/swsusp.S
@@ -5,7 +5,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 
 /*
diff --git a/arch/ppc/kernel/syscalls.c b/arch/ppc/kernel/syscalls.c
index 124313ce3c09..127f040de9de 100644
--- a/arch/ppc/kernel/syscalls.c
+++ b/arch/ppc/kernel/syscalls.c
@@ -41,10 +41,6 @@
 #include <asm/ipc.h>
 #include <asm/semaphore.h>
 
-void
-check_bugs(void)
-{
-}
 
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
diff --git a/arch/ppc/kernel/time.c b/arch/ppc/kernel/time.c
index bf4ddca5e853..a3c5281a5d2d 100644
--- a/arch/ppc/kernel/time.c
+++ b/arch/ppc/kernel/time.c
@@ -169,7 +169,7 @@ void timer_interrupt(struct pt_regs * regs)
                  * We should have an rtc call that only sets the minutes and
                  * seconds like on Intel to avoid problems with non UTC clocks.
                  */
-                if ( ppc_md.set_rtc_time && (time_status & STA_UNSYNC) == 0 &&
+                if ( ppc_md.set_rtc_time && ntp_synced() &&
                      xtime.tv_sec - last_rtc_update >= 659 &&
                      abs((xtime.tv_nsec / 1000) - (1000000-1000000/HZ)) < 500000/HZ &&
                      jiffies - wall_jiffies == 1) {
@@ -271,10 +271,7 @@ int do_settimeofday(struct timespec *tv)
          */
         last_rtc_update = new_sec - 658;
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irqrestore(&xtime_lock, flags);
         clock_was_set();
         return 0;
diff --git a/arch/ppc/kernel/traps.c b/arch/ppc/kernel/traps.c
index d87423d1003a..961ede87be72 100644
--- a/arch/ppc/kernel/traps.c
+++ b/arch/ppc/kernel/traps.c
@@ -118,6 +118,28 @@ void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr)
         info.si_code = code;
         info.si_addr = (void __user *) addr;
         force_sig_info(signr, &info, current);
+
+        /*
+         * Init gets no signals that it doesn't have a handler for.
+         * That's all very well, but if it has caused a synchronous
+         * exception and we ignore the resulting signal, it will just
+         * generate the same exception over and over again and we get
+         * nowhere.  Better to kill it and let the kernel panic.
+         */
+        if (current->pid == 1) {
+                __sighandler_t handler;
+
+                spin_lock_irq(&current->sighand->siglock);
+                handler = current->sighand->action[signr-1].sa.sa_handler;
+                spin_unlock_irq(&current->sighand->siglock);
+                if (handler == SIG_DFL) {
+                        /* init has generated a synchronous exception
+                           and it doesn't have a handler for the signal */
+                        printk(KERN_CRIT "init has generated signal %d "
+                               "but has no handler for it\n", signr);
+                        do_exit(signr);
+                }
+        }
 }
 
 /*
@@ -849,10 +871,12 @@ void AltivecAssistException(struct pt_regs *regs)
 }
 #endif /* CONFIG_ALTIVEC */
 
+#ifdef CONFIG_E500
 void PerformanceMonitorException(struct pt_regs *regs)
 {
         perf_irq(regs);
 }
+#endif
 
 #ifdef CONFIG_FSL_BOOKE
 void CacheLockingException(struct pt_regs *regs, unsigned long address,
diff --git a/arch/ppc/lib/Makefile b/arch/ppc/lib/Makefile
index 1c380e67d435..f1e1fb4144f0 100644
--- a/arch/ppc/lib/Makefile
+++ b/arch/ppc/lib/Makefile
@@ -4,6 +4,5 @@
 
 obj-y                   := checksum.o string.o strcase.o dec_and_lock.o div64.o
 
-obj-$(CONFIG_SMP)       += locks.o
 obj-$(CONFIG_8xx)       += rheap.o
 obj-$(CONFIG_CPM2)      += rheap.o
diff --git a/arch/ppc/lib/dec_and_lock.c b/arch/ppc/lib/dec_and_lock.c
index 4ee888070d91..b18f0d9a00fc 100644
--- a/arch/ppc/lib/dec_and_lock.c
+++ b/arch/ppc/lib/dec_and_lock.c
@@ -11,14 +11,7 @@
  * has a cmpxchg, and where atomic->value is an int holding
  * the value of the atomic (i.e. the high bits aren't used
  * for a lock or anything like that).
- *
- * N.B. ATOMIC_DEC_AND_LOCK gets defined in include/linux/spinlock.h
- * if spinlocks are empty and thus atomic_dec_and_lock is defined
- * to be atomic_dec_and_test - in that case we don't need it
- * defined here as well.
  */
-
-#ifndef ATOMIC_DEC_AND_LOCK
 int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 {
         int counter;
@@ -43,4 +36,3 @@ int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 }
 
 EXPORT_SYMBOL(_atomic_dec_and_lock);
-#endif /* ATOMIC_DEC_AND_LOCK */
diff --git a/arch/ppc/mm/fault.c b/arch/ppc/mm/fault.c
index 57d9930843ac..ee5e9f25baf9 100644
--- a/arch/ppc/mm/fault.c
+++ b/arch/ppc/mm/fault.c
@@ -278,11 +278,7 @@ bad_area:
 
         /* User mode accesses cause a SIGSEGV */
         if (user_mode(regs)) {
-                info.si_signo = SIGSEGV;
-                info.si_errno = 0;
-                info.si_code = code;
-                info.si_addr = (void __user *) address;
-                force_sig_info(SIGSEGV, &info, current);
+                _exception(SIGSEGV, regs, code, address);
                 return 0;
         }
 
diff --git a/arch/ppc/mm/hashtable.S b/arch/ppc/mm/hashtable.S
index ab83132a7ed0..3ec87c91343e 100644
--- a/arch/ppc/mm/hashtable.S
+++ b/arch/ppc/mm/hashtable.S
@@ -30,7 +30,7 @@
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
 #include <asm/thread_info.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #ifdef CONFIG_SMP
         .comm   mmu_hash_lock,4
diff --git a/arch/ppc/platforms/4xx/ebony.c b/arch/ppc/platforms/4xx/ebony.c
index 0fd3442f5131..d6b2b1965dcb 100644
--- a/arch/ppc/platforms/4xx/ebony.c
+++ b/arch/ppc/platforms/4xx/ebony.c
@@ -91,15 +91,10 @@ ebony_calibrate_decr(void)
          * on Rev. C silicon then errata forces us to
          * use the internal clock.
          */
-        switch (PVR_REV(mfspr(SPRN_PVR))) {
-                case PVR_REV(PVR_440GP_RB):
-                        freq = EBONY_440GP_RB_SYSCLK;
-                        break;
-                case PVR_REV(PVR_440GP_RC1):
-                default:
-                        freq = EBONY_440GP_RC_SYSCLK;
-                        break;
-        }
+        if (strcmp(cur_cpu_spec[0]->cpu_name, "440GP Rev. B") == 0)
+                freq = EBONY_440GP_RB_SYSCLK;
+        else
+                freq = EBONY_440GP_RC_SYSCLK;
 
         ibm44x_calibrate_decr(freq);
 }
diff --git a/arch/ppc/platforms/hdpu.c b/arch/ppc/platforms/hdpu.c
index b659d7b3d747..ff3796860123 100644
--- a/arch/ppc/platforms/hdpu.c
+++ b/arch/ppc/platforms/hdpu.c
@@ -58,7 +58,7 @@ static void parse_bootinfo(unsigned long r3,
 static void hdpu_set_l1pe(void);
 static void hdpu_cpustate_set(unsigned char new_state);
 #ifdef CONFIG_SMP
-static spinlock_t timebase_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(timebase_lock);
 static unsigned int timebase_upper = 0, timebase_lower = 0;
 extern int smp_tb_synchronized;
 
diff --git a/arch/ppc/platforms/pmac_sleep.S b/arch/ppc/platforms/pmac_sleep.S
index 016a74649155..88419c77ac43 100644
--- a/arch/ppc/platforms/pmac_sleep.S
+++ b/arch/ppc/platforms/pmac_sleep.S
@@ -17,7 +17,7 @@
 #include <asm/cputable.h>
 #include <asm/cache.h>
 #include <asm/thread_info.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #define MAGIC   0x4c617273      /* 'Lars' */
 
@@ -161,6 +161,8 @@ _GLOBAL(low_sleep_handler)
         addi r3,r3,sleep_storage@l
         stw r5,0(r3)
 
+        .globl  low_cpu_die
+low_cpu_die:
         /* Flush & disable all caches */
         bl      flush_disable_caches
 
diff --git a/arch/ppc/platforms/pmac_smp.c b/arch/ppc/platforms/pmac_smp.c
index 8e049dab4e63..794a23994b82 100644
--- a/arch/ppc/platforms/pmac_smp.c
+++ b/arch/ppc/platforms/pmac_smp.c
@@ -33,6 +33,7 @@
 #include <linux/spinlock.h>
 #include <linux/errno.h>
 #include <linux/hardirq.h>
+#include <linux/cpu.h>
 
 #include <asm/ptrace.h>
 #include <asm/atomic.h>
@@ -55,9 +56,7 @@
  * Powersurge (old powermac SMP) support.
  */
 
-extern void __secondary_start_psurge(void);
-extern void __secondary_start_psurge2(void);    /* Temporary horrible hack */
-extern void __secondary_start_psurge3(void);    /* Temporary horrible hack */
+extern void __secondary_start_pmac_0(void);
 
 /* Addresses for powersurge registers */
 #define HAMMERHEAD_BASE         0xf8000000
@@ -119,7 +118,7 @@ static volatile int sec_tb_reset = 0;
 static unsigned int pri_tb_hi, pri_tb_lo;
 static unsigned int pri_tb_stamp;
 
-static void __init core99_init_caches(int cpu)
+static void __devinit core99_init_caches(int cpu)
 {
         if (!cpu_has_feature(CPU_FTR_L2CR))
                 return;
@@ -346,7 +345,7 @@ static int __init smp_psurge_probe(void)
 
 static void __init smp_psurge_kick_cpu(int nr)
 {
-        void (*start)(void) = __secondary_start_psurge;
+        unsigned long start = __pa(__secondary_start_pmac_0) + nr * 8;
         unsigned long a;
 
         /* may need to flush here if secondary bats aren't setup */
@@ -356,17 +355,7 @@ static void __init smp_psurge_kick_cpu(int nr)
 
         if (ppc_md.progress) ppc_md.progress("smp_psurge_kick_cpu", 0x353);
 
-        /* setup entry point of secondary processor */
-        switch (nr) {
-        case 2:
-                start = __secondary_start_psurge2;
-                break;
-        case 3:
-                start = __secondary_start_psurge3;
-                break;
-        }
-
-        out_be32(psurge_start, __pa(start));
+        out_be32(psurge_start, start);
         mb();
 
         psurge_set_ipi(nr);
@@ -500,14 +489,14 @@ static int __init smp_core99_probe(void)
         return ncpus;
 }
 
-static void __init smp_core99_kick_cpu(int nr)
+static void __devinit smp_core99_kick_cpu(int nr)
 {
         unsigned long save_vector, new_vector;
         unsigned long flags;
 
         volatile unsigned long *vector
                  = ((volatile unsigned long *)(KERNELBASE+0x100));
-        if (nr < 1 || nr > 3)
+        if (nr < 0 || nr > 3)
                 return;
         if (ppc_md.progress) ppc_md.progress("smp_core99_kick_cpu", 0x346);
 
@@ -518,19 +507,9 @@ static void __init smp_core99_kick_cpu(int nr)
         save_vector = *vector;
 
         /* Setup fake reset vector that does    
-         *   b __secondary_start_psurge - KERNELBASE
+         *   b __secondary_start_pmac_0 + nr*8 - KERNELBASE
          */
-        switch(nr) {
-                case 1:
-                        new_vector = (unsigned long)__secondary_start_psurge;
-                        break;
-                case 2:
-                        new_vector = (unsigned long)__secondary_start_psurge2;
-                        break;
-                case 3:
-                        new_vector = (unsigned long)__secondary_start_psurge3;
-                        break;
-        }
+        new_vector = (unsigned long) __secondary_start_pmac_0 + nr * 8;
         *vector = 0x48000002 + new_vector - KERNELBASE;
 
         /* flush data cache and inval instruction cache */
@@ -554,7 +533,7 @@ static void __init smp_core99_kick_cpu(int nr)
         if (ppc_md.progress) ppc_md.progress("smp_core99_kick_cpu done", 0x347);
 }
 
-static void __init smp_core99_setup_cpu(int cpu_nr)
+static void __devinit smp_core99_setup_cpu(int cpu_nr)
 {
         /* Setup L2/L3 */
         if (cpu_nr != 0)
@@ -668,3 +647,47 @@ struct smp_ops_t core99_smp_ops __pmacdata = {
         .give_timebase  = smp_core99_give_timebase,
         .take_timebase  = smp_core99_take_timebase,
 };
+
+#ifdef CONFIG_HOTPLUG_CPU
+
+int __cpu_disable(void)
+{
+        cpu_clear(smp_processor_id(), cpu_online_map);
+
+        /* XXX reset cpu affinity here */
+        openpic_set_priority(0xf);
+        asm volatile("mtdec %0" : : "r" (0x7fffffff));
+        mb();
+        udelay(20);
+        asm volatile("mtdec %0" : : "r" (0x7fffffff));
+        return 0;
+}
+
+extern void low_cpu_die(void) __attribute__((noreturn)); /* in pmac_sleep.S */
+static int cpu_dead[NR_CPUS];
+
+void cpu_die(void)
+{
+        local_irq_disable();
+        cpu_dead[smp_processor_id()] = 1;
+        mb();
+        low_cpu_die();
+}
+
+void __cpu_die(unsigned int cpu)
+{
+        int timeout;
+
+        timeout = 1000;
+        while (!cpu_dead[cpu]) {
+                if (--timeout == 0) {
+                        printk("CPU %u refused to die!\n", cpu);
+                        break;
+                }
+                msleep(1);
+        }
+        cpu_callin_map[cpu] = 0;
+        cpu_dead[cpu] = 0;
+}
+
+#endif
diff --git a/arch/ppc/syslib/cpc700_pic.c b/arch/ppc/syslib/cpc700_pic.c
index 774709807538..75fe8eb10693 100644
--- a/arch/ppc/syslib/cpc700_pic.c
+++ b/arch/ppc/syslib/cpc700_pic.c
@@ -90,14 +90,10 @@ cpc700_mask_and_ack_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type cpc700_pic = {
-        "CPC700 PIC",
-        NULL,
-        NULL,
-        cpc700_unmask_irq,
-        cpc700_mask_irq,
-        cpc700_mask_and_ack_irq,
-        NULL,
-        NULL
+        .typename = "CPC700 PIC",
+        .enable = cpc700_unmask_irq,
+        .disable = cpc700_mask_irq,
+        .ack = cpc700_mask_and_ack_irq,
 };
 
 __init static void
diff --git a/arch/ppc/syslib/i8259.c b/arch/ppc/syslib/i8259.c
index b9391e650141..5c7908c20e43 100644
--- a/arch/ppc/syslib/i8259.c
+++ b/arch/ppc/syslib/i8259.c
@@ -129,14 +129,11 @@ static void i8259_end_irq(unsigned int irq)
 }
 
 struct hw_interrupt_type i8259_pic = {
-        " i8259    ",
-        NULL,
-        NULL,
-        i8259_unmask_irq,
-        i8259_mask_irq,
-        i8259_mask_and_ack_irq,
-        i8259_end_irq,
-        NULL
+        .typename = " i8259    ",
+        .enable = i8259_unmask_irq,
+        .disable = i8259_mask_irq,
+        .ack = i8259_mask_and_ack_irq,
+        .end = i8259_end_irq,
 };
 
 static struct resource pic1_iores = {
diff --git a/arch/ppc/syslib/ibm440gx_common.c b/arch/ppc/syslib/ibm440gx_common.c
index d4776af6a3ca..0bb919859b8b 100644
--- a/arch/ppc/syslib/ibm440gx_common.c
+++ b/arch/ppc/syslib/ibm440gx_common.c
@@ -236,9 +236,10 @@ void __init ibm440gx_l2c_setup(struct ibm44x_clocks* p)
         /* Disable L2C on rev.A, rev.B and 800MHz version of rev.C,
            enable it on all other revisions
          */
-        u32 pvr = mfspr(SPRN_PVR);
-        if (pvr == PVR_440GX_RA || pvr == PVR_440GX_RB ||
-            (pvr == PVR_440GX_RC && p->cpu > 667000000))
+        if (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. A") == 0 ||
+                        strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. B") == 0
+                        || (strcmp(cur_cpu_spec[0]->cpu_name, "440GX Rev. C")
+                                == 0 && p->cpu > 667000000))
                 ibm440gx_l2c_disable();
         else
                 ibm440gx_l2c_enable();
diff --git a/arch/ppc/syslib/mpc10x_common.c b/arch/ppc/syslib/mpc10x_common.c
index 87065e2e4c5f..3e039706bdbc 100644
--- a/arch/ppc/syslib/mpc10x_common.c
+++ b/arch/ppc/syslib/mpc10x_common.c
@@ -140,12 +140,12 @@ struct platform_device ppc_sys_platform_devices[] = {
         },
         [MPC10X_UART0] = {
                 .name = "serial8250",
-                .id     = 0,
+                .id     = PLAT8250_DEV_PLATFORM,
                 .dev.platform_data = serial_plat_uart0,
         },
         [MPC10X_UART1] = {
                 .name = "serial8250",
-                .id     = 1,
+                .id     = PLAT8250_DEV_PLATFORM1,
                 .dev.platform_data = serial_plat_uart1,
         },
 
diff --git a/arch/ppc/syslib/mpc83xx_devices.c b/arch/ppc/syslib/mpc83xx_devices.c
index 5aaf0e58e1f9..95b3b8a7f0ba 100644
--- a/arch/ppc/syslib/mpc83xx_devices.c
+++ b/arch/ppc/syslib/mpc83xx_devices.c
@@ -165,7 +165,7 @@ struct platform_device ppc_sys_platform_devices[] = {
         },
         [MPC83xx_DUART] = {
                 .name = "serial8250",
-                .id     = 0,
+                .id     = PLAT8250_DEV_PLATFORM,
                 .dev.platform_data = serial_platform_data,
         },
         [MPC83xx_SEC2] = {
diff --git a/arch/ppc/syslib/mpc85xx_devices.c b/arch/ppc/syslib/mpc85xx_devices.c
index 8af322dd476a..bbc5ac0de878 100644
--- a/arch/ppc/syslib/mpc85xx_devices.c
+++ b/arch/ppc/syslib/mpc85xx_devices.c
@@ -282,7 +282,7 @@ struct platform_device ppc_sys_platform_devices[] = {
         },
         [MPC85xx_DUART] = {
                 .name = "serial8250",
-                .id     = 0,
+                .id     = PLAT8250_DEV_PLATFORM,
                 .dev.platform_data = serial_platform_data,
         },
         [MPC85xx_PERFMON] = {
diff --git a/arch/ppc/syslib/mv64x60.c b/arch/ppc/syslib/mv64x60.c
index 6262b11f366f..839f8872826f 100644
--- a/arch/ppc/syslib/mv64x60.c
+++ b/arch/ppc/syslib/mv64x60.c
@@ -31,7 +31,7 @@
 
 
 u8 mv64x60_pci_exclude_bridge = 1;
-spinlock_t      mv64x60_lock = SPIN_LOCK_UNLOCKED;
+DEFINE_SPINLOCK(mv64x60_lock);
 
 static phys_addr_t      mv64x60_bridge_pbase;
 static void             *mv64x60_bridge_vbase;
diff --git a/arch/ppc/syslib/ocp.c b/arch/ppc/syslib/ocp.c
index e5fd2ae503ea..9ccce438bd7a 100644
--- a/arch/ppc/syslib/ocp.c
+++ b/arch/ppc/syslib/ocp.c
@@ -165,7 +165,7 @@ ocp_device_remove(struct device *dev)
 }
 
 static int
-ocp_device_suspend(struct device *dev, u32 state)
+ocp_device_suspend(struct device *dev, pm_message_t state)
 {
         struct ocp_device *ocp_dev = to_ocp_dev(dev);
         struct ocp_driver *ocp_drv = to_ocp_drv(dev->driver);
diff --git a/arch/ppc/syslib/open_pic2.c b/arch/ppc/syslib/open_pic2.c
index 7e272c51a497..2e0ea92144f6 100644
--- a/arch/ppc/syslib/open_pic2.c
+++ b/arch/ppc/syslib/open_pic2.c
@@ -82,13 +82,11 @@ static void openpic2_end_irq(unsigned int irq_nr);
 static void openpic2_ack_irq(unsigned int irq_nr);
 
 struct hw_interrupt_type open_pic2 = {
-        " OpenPIC2 ",
-        NULL,
-        NULL,
-        openpic2_enable_irq,
-        openpic2_disable_irq,
-        openpic2_ack_irq,
-        openpic2_end_irq,
+        .typename = " OpenPIC2 ",
+        .enable = openpic2_enable_irq,
+        .disable = openpic2_disable_irq,
+        .ack = openpic2_ack_irq,
+        .end = openpic2_end_irq,
 };
 
 /*
diff --git a/arch/ppc/syslib/ppc403_pic.c b/arch/ppc/syslib/ppc403_pic.c
index 06cb0af2a58d..ce4d1deb86e9 100644
--- a/arch/ppc/syslib/ppc403_pic.c
+++ b/arch/ppc/syslib/ppc403_pic.c
@@ -34,13 +34,10 @@ static void ppc403_aic_disable(unsigned int irq);
 static void ppc403_aic_disable_and_ack(unsigned int irq);
 
 static struct hw_interrupt_type ppc403_aic = {
-        "403GC AIC",
-        NULL,
-        NULL,
-        ppc403_aic_enable,
-        ppc403_aic_disable,
-        ppc403_aic_disable_and_ack,
-        0
+        .typename = "403GC AIC",
+        .enable = ppc403_aic_enable,
+        .disable = ppc403_aic_disable,
+        .ack = ppc403_aic_disable_and_ack,
 };
 
 int
diff --git a/arch/ppc/syslib/qspan_pci.c b/arch/ppc/syslib/qspan_pci.c
index 57f4ed5e5ae1..0970b5d30391 100644
--- a/arch/ppc/syslib/qspan_pci.c
+++ b/arch/ppc/syslib/qspan_pci.c
@@ -94,7 +94,7 @@
 #define mk_config_type1(bus, dev, offset) \
         mk_config_addr(bus, dev, offset) | 1;
 
-static spinlock_t pcibios_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pcibios_lock);
 
 int qspan_pcibios_read_config_byte(unsigned char bus, unsigned char dev_fn,
                                   unsigned char offset, unsigned char *val)
diff --git a/arch/ppc/syslib/xilinx_pic.c b/arch/ppc/syslib/xilinx_pic.c
index e0bd66f0847a..2cbcad278cef 100644
--- a/arch/ppc/syslib/xilinx_pic.c
+++ b/arch/ppc/syslib/xilinx_pic.c
@@ -79,14 +79,11 @@ xilinx_intc_end(unsigned int irq)
 }
 
 static struct hw_interrupt_type xilinx_intc = {
-        "Xilinx Interrupt Controller",
-        NULL,
-        NULL,
-        xilinx_intc_enable,
-        xilinx_intc_disable,
-        xilinx_intc_disable_and_ack,
-        xilinx_intc_end,
-        0
+        .typename = "Xilinx Interrupt Controller",
+        .enable = xilinx_intc_enable,
+        .disable = xilinx_intc_disable,
+        .ack = xilinx_intc_disable_and_ack,
+        .end = xilinx_intc_end,
 };
 
 int
diff --git a/arch/ppc64/Kconfig b/arch/ppc64/Kconfig
index 13b262f10216..deca68ad644a 100644
--- a/arch/ppc64/Kconfig
+++ b/arch/ppc64/Kconfig
@@ -44,6 +44,10 @@ config SCHED_NO_NO_OMIT_FRAME_POINTER
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 # We optimistically allocate largepages from the VM, so make the limit
 # large enough (16MB). This badly named config option is actually
 # max order + 1
diff --git a/arch/ppc64/Makefile b/arch/ppc64/Makefile
index 6350cce82efb..17d2c1eac3b8 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -49,14 +49,14 @@ NM		:= $(NM) --synthetic
 
 endif
 
-CHECKFLAGS      += -m64 -D__powerpc__
+CHECKFLAGS      += -m64 -D__powerpc__ -D__powerpc64__
 
 LDFLAGS         := -m elf64ppc
 LDFLAGS_vmlinux := -Bstatic -e $(KERNELLOAD) -Ttext $(KERNELLOAD)
 CFLAGS          += -msoft-float -pipe -mminimal-toc -mtraceback=none \
                    -mcall-aixdesc
 # Temporary hack until we have migrated to asm-powerpc
-CPPFLAGS        += -Iinclude3
+CPPFLAGS        += -Iarch/$(ARCH)/include
 
 GCC_VERSION     := $(call cc-version)
 GCC_BROKEN_VEC  := $(shell if [ $(GCC_VERSION) -lt 0400 ] ; then echo "y"; fi ;)
@@ -89,11 +89,12 @@ drivers-$(CONFIG_OPROFILE)	+= arch/ppc64/oprofile/
 
 boot := arch/ppc64/boot
 
-boottarget-$(CONFIG_PPC_PSERIES) := zImage zImage.initrd
-boottarget-$(CONFIG_PPC_MAPLE) := zImage zImage.initrd
-boottarget-$(CONFIG_PPC_ISERIES) := vmlinux.sminitrd vmlinux.initrd vmlinux.sm
-boottarget-$(CONFIG_PPC_BPA) := zImage zImage.initrd
-$(boottarget-y): vmlinux
+boottargets-$(CONFIG_PPC_PSERIES) += zImage zImage.initrd
+boottargets-$(CONFIG_PPC_PMAC) += zImage.vmode zImage.initrd.vmode
+boottargets-$(CONFIG_PPC_MAPLE) += zImage zImage.initrd
+boottargets-$(CONFIG_PPC_ISERIES) += vmlinux.sminitrd vmlinux.initrd vmlinux.sm
+boottargets-$(CONFIG_PPC_BPA) += zImage zImage.initrd
+$(boottargets-y): vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $(boot)/$@
 
 bootimage-$(CONFIG_PPC_PSERIES) := $(boot)/zImage
@@ -114,27 +115,21 @@ all: $(KBUILD_IMAGE)
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
-        $(Q)rm -rf include3
+        # Temporary hack until we have migrated to asm-powerpc
+        $(Q)rm -rf arch/$(ARCH)/include
 
-prepare: include/asm-ppc64/offsets.h
-
-arch/ppc64/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-ppc64/offsets.h: arch/ppc64/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
 
 # Temporary hack until we have migrated to asm-powerpc
-include/asm: include3/asm
-include3/asm:
-        $(Q)if [ ! -d include3 ]; then mkdir -p include3; fi;
-        $(Q)ln -fsn $(srctree)/include/asm-powerpc include3/asm
+include/asm: arch/$(ARCH)/include/asm
+arch/$(ARCH)/include/asm:
+        $(Q)if [ ! -d arch/$(ARCH)/include ]; then mkdir -p arch/$(ARCH)/include; fi
+        $(Q)ln -fsn $(srctree)/include/asm-powerpc arch/$(ARCH)/include/asm
 
 define archhelp
-  echo  '* zImage       - Compressed kernel image (arch/$(ARCH)/boot/zImage)'
-  echo  '  zImage.initrd- Compressed kernel image with initrd attached,'
-  echo  '                  sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
-  echo  '                  (arch/$(ARCH)/boot/zImage.initrd)'
+  echo  '  zImage.vmode        - Compressed kernel image (arch/$(ARCH)/boot/zImage.vmode)'
+  echo  '  zImage.initrd.vmode - Compressed kernel image with initrd attached,'
+  echo  '                        sourced from arch/$(ARCH)/boot/ramdisk.image.gz'
+  echo  '                        (arch/$(ARCH)/boot/zImage.initrd.vmode)'
+  echo  '  zImage              - zImage for pSeries machines'
+  echo  '  zImage.initrd       - zImage with initrd for pSeries machines'
 endef
-
-CLEAN_FILES += include/asm-ppc64/offsets.h
diff --git a/arch/ppc64/boot/Makefile b/arch/ppc64/boot/Makefile
index 2c5f5e73d00c..33fdc8710891 100644
--- a/arch/ppc64/boot/Makefile
+++ b/arch/ppc64/boot/Makefile
@@ -37,6 +37,9 @@ quiet_cmd_bootcc = BOOTCC  $@
 quiet_cmd_bootas = BOOTAS  $@
       cmd_bootas = $(CROSS32CC) -Wp,-MD,$(depfile) $(BOOTAFLAGS) -c -o $@ $<
 
+quiet_cmd_bootld = BOOTLD  $@
+      cmd_bootld = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(2)
+
 $(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c
         $(call if_changed_dep,bootcc)
 $(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S
@@ -53,7 +56,7 @@ src-sec = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.c, $(section)))
 gz-sec  = $(foreach section, $(1), $(patsubst %,$(obj)/kernel-%.gz, $(section)))
 
 hostprogs-y             := addnote addRamDisk
-targets                 += zImage zImage.initrd imagesize.c \
+targets                 += zImage.vmode zImage.initrd.vmode zImage zImage.initrd imagesize.c \
                            $(patsubst $(obj)/%,%, $(call obj-sec, $(required) $(initrd))) \
                            $(patsubst $(obj)/%,%, $(call src-sec, $(required) $(initrd))) \
                            $(patsubst $(obj)/%,%, $(call gz-sec, $(required) $(initrd))) \
@@ -63,7 +66,7 @@ extra-y			:= initrd.o
 quiet_cmd_ramdisk = RAMDISK $@
       cmd_ramdisk = $(obj)/addRamDisk $(obj)/ramdisk.image.gz $< $@
 
-quiet_cmd_stripvm = STRIP $@
+quiet_cmd_stripvm = STRIP   $@
       cmd_stripvm = $(STRIP) -s $< -o $@
 
 vmlinux.strip: vmlinux FORCE
@@ -71,12 +74,20 @@ vmlinux.strip: vmlinux FORCE
 $(obj)/vmlinux.initrd: vmlinux.strip $(obj)/addRamDisk $(obj)/ramdisk.image.gz FORCE
         $(call if_changed,ramdisk)
 
-addsection = $(CROSS32OBJCOPY) $(1) \
-                --add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $(1)))=$(patsubst %.o,%.gz, $(1)) \
-                --set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $(1)))=$(OBJCOPYFLAGS)
+quiet_cmd_addsection = ADDSEC  $@
+      cmd_addsection = $(CROSS32OBJCOPY) $@ \
+                --add-section=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(patsubst %.o,%.gz, $@) \
+                --set-section-flags=.kernel:$(strip $(patsubst $(obj)/kernel-%.o,%, $@))=$(OBJCOPYFLAGS)
+
+quiet_cmd_imagesize = GENSIZE $@
+      cmd_imagesize = ls -l vmlinux.strip | \
+                awk '{printf "/* generated -- do not edit! */\n" "unsigned long vmlinux_filesize = %d;\n", $$5}' \
+                > $(obj)/imagesize.c && \
+                $(CROSS_COMPILE)nm -n vmlinux | tail -n 1 | \
+                awk '{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr($$1,8)}' >> $(obj)/imagesize.c
 
-quiet_cmd_addnote = ADDNOTE $@ 
-      cmd_addnote = $(CROSS32LD) $(BOOTLFLAGS) -o $@ $(obj-boot) && $(obj)/addnote $@
+quiet_cmd_addnote = ADDNOTE $@
+      cmd_addnote = $(obj)/addnote $@
 
 $(call gz-sec, $(required)): $(obj)/kernel-%.gz: % FORCE
         $(call if_changed,gzip)
@@ -85,28 +96,30 @@ $(obj)/kernel-initrd.gz: $(obj)/ramdisk.image.gz
         cp -f $(obj)/ramdisk.image.gz $@
 
 $(call src-sec, $(required) $(initrd)): $(obj)/kernel-%.c: $(obj)/kernel-%.gz FORCE
-        touch $@
+        @touch $@
 
 $(call obj-sec, $(required) $(initrd)): $(obj)/kernel-%.o: $(obj)/kernel-%.c FORCE
         $(call if_changed_dep,bootcc)
-        $(call addsection, $@)
+        $(call cmd,addsection)
+
+$(obj)/zImage.vmode: obj-boot += $(call obj-sec, $(required))
+$(obj)/zImage.vmode: $(call obj-sec, $(required)) $(obj-boot) FORCE
+        $(call cmd,bootld,$(obj-boot))
+
+$(obj)/zImage.initrd.vmode: obj-boot += $(call obj-sec, $(required) $(initrd))
+$(obj)/zImage.initrd.vmode: $(call obj-sec, $(required) $(initrd)) $(obj-boot) FORCE
+        $(call cmd,bootld,$(obj-boot))
 
-$(obj)/zImage: obj-boot += $(call obj-sec, $(required))
-$(obj)/zImage: $(call obj-sec, $(required)) $(obj-boot) $(obj)/addnote FORCE
+$(obj)/zImage: $(obj)/zImage.vmode $(obj)/addnote FORCE
+        @cp -f $< $@
         $(call if_changed,addnote)
 
-$(obj)/zImage.initrd: obj-boot += $(call obj-sec, $(required) $(initrd))
-$(obj)/zImage.initrd: $(call obj-sec, $(required) $(initrd)) $(obj-boot) $(obj)/addnote FORCE
+$(obj)/zImage.initrd: $(obj)/zImage.initrd.vmode $(obj)/addnote FORCE
+        @cp -f $< $@
         $(call if_changed,addnote)
 
 $(obj)/imagesize.c: vmlinux.strip
-        @echo Generating $@
-        ls -l vmlinux.strip | \
-        awk '{printf "/* generated -- do not edit! */\n" \
-                "unsigned long vmlinux_filesize = %d;\n", $$5}' > $(obj)/imagesize.c
-        $(CROSS_COMPILE)nm -n vmlinux | tail -n 1 | \
-        awk '{printf "unsigned long vmlinux_memsize = 0x%s;\n", substr($$1,8)}' \
-                >> $(obj)/imagesize.c
+        $(call cmd,imagesize)
 
 install: $(CONFIGURE) $(BOOTIMAGE)
         sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" "$(BOOTIMAGE)"
diff --git a/arch/ppc64/boot/main.c b/arch/ppc64/boot/main.c
index 99e68cfbe688..f7ec19a2d0b0 100644
--- a/arch/ppc64/boot/main.c
+++ b/arch/ppc64/boot/main.c
@@ -23,7 +23,8 @@ extern void flush_cache(void *, unsigned long);
 
 /* Value picked to match that used by yaboot */
 #define PROG_START      0x01400000
-#define RAM_END         (256<<20) // Fixme: use OF */
+#define RAM_END         (512<<20) // Fixme: use OF */
+#define ONE_MB          0x100000
 
 static char *avail_ram;
 static char *begin_avail, *end_avail;
@@ -32,6 +33,7 @@ static unsigned int heap_use;
 static unsigned int heap_max;
 
 extern char _start[];
+extern char _end[];
 extern char _vmlinux_start[];
 extern char _vmlinux_end[];
 extern char _initrd_start[];
@@ -58,13 +60,13 @@ typedef void (*kernel_entry_t)( unsigned long,
 
 #undef DEBUG
 
-static unsigned long claim_base = PROG_START;
+static unsigned long claim_base;
 
 static unsigned long try_claim(unsigned long size)
 {
         unsigned long addr = 0;
 
-        for(; claim_base < RAM_END; claim_base += 0x100000) {
+        for(; claim_base < RAM_END; claim_base += ONE_MB) {
 #ifdef DEBUG
                 printf("    trying: 0x%08lx\n\r", claim_base);
 #endif
@@ -95,7 +97,26 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
         if (getprop(chosen_handle, "stdin", &stdin, sizeof(stdin)) != 4)
                 exit();
 
-        printf("\n\rzImage starting: loaded at 0x%x\n\r", (unsigned)_start);
+        printf("\n\rzImage starting: loaded at 0x%lx\n\r", (unsigned long) _start);
+
+        /*
+         * The first available claim_base must be above the end of the
+         * the loaded kernel wrapper file (_start to _end includes the
+         * initrd image if it is present) and rounded up to a nice
+         * 1 MB boundary for good measure.
+         */
+
+        claim_base = _ALIGN_UP((unsigned long)_end, ONE_MB);
+
+#if defined(PROG_START)
+        /*
+         * Maintain a "magic" minimum address. This keeps some older
+         * firmware platforms running.
+         */
+
+        if (claim_base < PROG_START)
+                claim_base = PROG_START;
+#endif
 
         /*
          * Now we try to claim some memory for the kernel itself
@@ -105,7 +126,7 @@ void start(unsigned long a1, unsigned long a2, void *promptr)
          * size... In practice we add 1Mb, that is enough, but we should really
          * consider fixing the Makefile to put a _raw_ kernel in there !
          */
-        vmlinux_memsize += 0x100000;
+        vmlinux_memsize += ONE_MB;
         printf("Allocating 0x%lx bytes for kernel ...\n\r", vmlinux_memsize);
         vmlinux.addr = try_claim(vmlinux_memsize);
         if (vmlinux.addr == 0) {
diff --git a/arch/ppc64/kernel/bpa_iic.c b/arch/ppc64/kernel/bpa_iic.c
index c8f3dc3fad70..0aaa878e19d3 100644
--- a/arch/ppc64/kernel/bpa_iic.c
+++ b/arch/ppc64/kernel/bpa_iic.c
@@ -205,6 +205,18 @@ static struct iic_regs __iomem *find_iic(int cpu)
 }
 
 #ifdef CONFIG_SMP
+
+/* Use the highest interrupt priorities for IPI */
+static inline int iic_ipi_to_irq(int ipi)
+{
+        return IIC_IPI_OFFSET + IIC_NUM_IPIS - 1 - ipi;
+}
+
+static inline int iic_irq_to_ipi(int irq)
+{
+        return IIC_NUM_IPIS - 1 - (irq - IIC_IPI_OFFSET);
+}
+
 void iic_setup_cpu(void)
 {
         out_be64(&__get_cpu_var(iic).regs->prio, 0xff);
@@ -212,18 +224,20 @@ void iic_setup_cpu(void)
 
 void iic_cause_IPI(int cpu, int mesg)
 {
-        out_be64(&per_cpu(iic, cpu).regs->generate, mesg);
+        out_be64(&per_cpu(iic, cpu).regs->generate, (IIC_NUM_IPIS - 1 - mesg) << 4);
 }
 
 static irqreturn_t iic_ipi_action(int irq, void *dev_id, struct pt_regs *regs)
 {
-
-        smp_message_recv(irq - IIC_IPI_OFFSET, regs);
+        smp_message_recv(iic_irq_to_ipi(irq), regs);
         return IRQ_HANDLED;
 }
 
-static void iic_request_ipi(int irq, const char *name)
+static void iic_request_ipi(int ipi, const char *name)
 {
+        int irq;
+
+        irq = iic_ipi_to_irq(ipi);
         /* IPIs are marked SA_INTERRUPT as they must run with irqs
          * disabled */
         get_irq_desc(irq)->handler = &iic_pic;
@@ -233,10 +247,10 @@ static void iic_request_ipi(int irq, const char *name)
 
 void iic_request_IPIs(void)
 {
-        iic_request_ipi(IIC_IPI_OFFSET + PPC_MSG_CALL_FUNCTION, "IPI-call");
-        iic_request_ipi(IIC_IPI_OFFSET + PPC_MSG_RESCHEDULE, "IPI-resched");
+        iic_request_ipi(PPC_MSG_CALL_FUNCTION, "IPI-call");
+        iic_request_ipi(PPC_MSG_RESCHEDULE, "IPI-resched");
 #ifdef CONFIG_DEBUGGER
-        iic_request_ipi(IIC_IPI_OFFSET + PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
+        iic_request_ipi(PPC_MSG_DEBUGGER_BREAK, "IPI-debug");
 #endif /* CONFIG_DEBUGGER */
 }
 #endif /* CONFIG_SMP */
diff --git a/arch/ppc64/kernel/cpu_setup_power4.S b/arch/ppc64/kernel/cpu_setup_power4.S
index 0482c063c26e..1fb673c511ff 100644
--- a/arch/ppc64/kernel/cpu_setup_power4.S
+++ b/arch/ppc64/kernel/cpu_setup_power4.S
@@ -12,10 +12,9 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/page.h>
-#include <asm/ppc_asm.h>
 #include <asm/cputable.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cache.h>
 
 _GLOBAL(__970_cpu_preinit)
diff --git a/arch/ppc64/kernel/eeh.c b/arch/ppc64/kernel/eeh.c
index af5272fedadf..ba93fd731222 100644
--- a/arch/ppc64/kernel/eeh.c
+++ b/arch/ppc64/kernel/eeh.c
@@ -202,10 +202,9 @@ static void pci_addr_cache_print(struct pci_io_addr_cache *cache)
         while (n) {
                 struct pci_io_addr_range *piar;
                 piar = rb_entry(n, struct pci_io_addr_range, rb_node);
-                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s %s\n",
+                printk(KERN_DEBUG "PCI: %s addr range %d [%lx-%lx]: %s\n",
                        (piar->flags & IORESOURCE_IO) ? "i/o" : "mem", cnt,
-                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev),
-                       pci_pretty_name(piar->pcidev));
+                       piar->addr_lo, piar->addr_hi, pci_name(piar->pcidev));
                 cnt++;
                 n = rb_next(n);
         }
@@ -255,22 +254,24 @@ pci_addr_cache_insert(struct pci_dev *dev, unsigned long alo,
 static void __pci_addr_cache_insert_device(struct pci_dev *dev)
 {
         struct device_node *dn;
+        struct pci_dn *pdn;
         int i;
         int inserted = 0;
 
         dn = pci_device_to_OF_node(dev);
         if (!dn) {
-                printk(KERN_WARNING "PCI: no pci dn found for dev=%s %s\n",
-                        pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_WARNING "PCI: no pci dn found for dev=%s\n",
+                        pci_name(dev));
                 return;
         }
 
         /* Skip any devices for which EEH is not enabled. */
-        if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) ||
-            dn->eeh_mode & EEH_MODE_NOCHECK) {
+        pdn = dn->data;
+        if (!(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
+            pdn->eeh_mode & EEH_MODE_NOCHECK) {
 #ifdef DEBUG
-                printk(KERN_INFO "PCI: skip building address cache for=%s %s\n",
-                       pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_INFO "PCI: skip building address cache for=%s\n",
+                       pci_name(dev));
 #endif
                 return;
         }
@@ -416,6 +417,7 @@ int eeh_unregister_notifier(struct notifier_block *nb)
 static int read_slot_reset_state(struct device_node *dn, int rets[])
 {
         int token, outputs;
+        struct pci_dn *pdn = dn->data;
 
         if (ibm_read_slot_reset_state2 != RTAS_UNKNOWN_SERVICE) {
                 token = ibm_read_slot_reset_state2;
@@ -425,8 +427,8 @@ static int read_slot_reset_state(struct device_node *dn, int rets[])
                 outputs = 3;
         }
 
-        return rtas_call(token, 3, outputs, rets, dn->eeh_config_addr,
-                         BUID_HI(dn->phb->buid), BUID_LO(dn->phb->buid));
+        return rtas_call(token, 3, outputs, rets, pdn->eeh_config_addr,
+                         BUID_HI(pdn->phb->buid), BUID_LO(pdn->phb->buid));
 }
 
 /**
@@ -447,12 +449,12 @@ static void eeh_panic(struct pci_dev *dev, int reset_state)
          * in light of potential corruption, we can use it here.
          */
         if (panic_on_oops)
-                panic("EEH: MMIO failure (%d) on device:%s %s\n", reset_state,
-                      pci_name(dev), pci_pretty_name(dev));
+                panic("EEH: MMIO failure (%d) on device:%s\n", reset_state,
+                      pci_name(dev));
         else {
                 __get_cpu_var(ignored_failures)++;
-                printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s %s\n",
-                       reset_state, pci_name(dev), pci_pretty_name(dev));
+                printk(KERN_INFO "EEH: Ignored MMIO failure (%d) on device:%s\n",
+                       reset_state, pci_name(dev));
         }
 }
 
@@ -482,8 +484,8 @@ static void eeh_event_handler(void *dummy)
                         break;
 
                 printk(KERN_INFO "EEH: MMIO failure (%d), notifiying device "
-                       "%s %s\n", event->reset_state,
-                       pci_name(event->dev), pci_pretty_name(event->dev));
+                       "%s\n", event->reset_state,
+                       pci_name(event->dev));
 
                 atomic_set(&eeh_fail_count, 0);
                 notifier_call_chain (&eeh_notifier_chain,
@@ -535,6 +537,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         unsigned long flags;
         int rc, reset_state;
         struct eeh_event  *event;
+        struct pci_dn *pdn;
 
         __get_cpu_var(total_mmio_ffs)++;
 
@@ -543,14 +546,15 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
 
         if (!dn)
                 return 0;
+        pdn = dn->data;
 
         /* Access to IO BARs might get this far and still not want checking. */
-        if (!(dn->eeh_mode & EEH_MODE_SUPPORTED) ||
-            dn->eeh_mode & EEH_MODE_NOCHECK) {
+        if (!pdn->eeh_capable || !(pdn->eeh_mode & EEH_MODE_SUPPORTED) ||
+            pdn->eeh_mode & EEH_MODE_NOCHECK) {
                 return 0;
         }
 
-        if (!dn->eeh_config_addr) {
+        if (!pdn->eeh_config_addr) {
                 return 0;
         }
 
@@ -558,7 +562,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
          * If we already have a pending isolation event for this
          * slot, we know it's bad already, we don't need to check...
          */
-        if (dn->eeh_mode & EEH_MODE_ISOLATED) {
+        if (pdn->eeh_mode & EEH_MODE_ISOLATED) {
                 atomic_inc(&eeh_fail_count);
                 if (atomic_read(&eeh_fail_count) >= EEH_MAX_FAILS) {
                         /* re-read the slot reset state */
@@ -583,7 +587,7 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         }
 
         /* prevent repeated reports of this failure */
-        dn->eeh_mode |= EEH_MODE_ISOLATED;
+        pdn->eeh_mode |= EEH_MODE_ISOLATED;
 
         reset_state = rets[0];
 
@@ -591,9 +595,9 @@ int eeh_dn_check_failure(struct device_node *dn, struct pci_dev *dev)
         memset(slot_errbuf, 0, eeh_error_buf_size);
 
         rc = rtas_call(ibm_slot_error_detail,
-                       8, 1, NULL, dn->eeh_config_addr,
-                       BUID_HI(dn->phb->buid),
-                       BUID_LO(dn->phb->buid), NULL, 0,
+                       8, 1, NULL, pdn->eeh_config_addr,
+                       BUID_HI(pdn->phb->buid),
+                       BUID_LO(pdn->phb->buid), NULL, 0,
                        virt_to_phys(slot_errbuf),
                        eeh_error_buf_size,
                        1 /* Temporary Error */);
@@ -680,8 +684,9 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
         u32 *device_id = (u32 *)get_property(dn, "device-id", NULL);
         u32 *regs;
         int enable;
+        struct pci_dn *pdn = dn->data;
 
-        dn->eeh_mode = 0;
+        pdn->eeh_mode = 0;
 
         if (status && strcmp(status, "ok") != 0)
                 return NULL;    /* ignore devices with bad status */
@@ -692,7 +697,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
 
         /* There is nothing to check on PCI to ISA bridges */
         if (dn->type && !strcmp(dn->type, "isa")) {
-                dn->eeh_mode |= EEH_MODE_NOCHECK;
+                pdn->eeh_mode |= EEH_MODE_NOCHECK;
                 return NULL;
         }
 
@@ -709,7 +714,7 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                 enable = 0;
 
         if (!enable)
-                dn->eeh_mode |= EEH_MODE_NOCHECK;
+                pdn->eeh_mode |= EEH_MODE_NOCHECK;
 
         /* Ok... see if this device supports EEH.  Some do, some don't,
          * and the only way to find out is to check each and every one. */
@@ -722,8 +727,8 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
                                 EEH_ENABLE);
                 if (ret == 0) {
                         eeh_subsystem_enabled = 1;
-                        dn->eeh_mode |= EEH_MODE_SUPPORTED;
-                        dn->eeh_config_addr = regs[0];
+                        pdn->eeh_mode |= EEH_MODE_SUPPORTED;
+                        pdn->eeh_config_addr = regs[0];
 #ifdef DEBUG
                         printk(KERN_DEBUG "EEH: %s: eeh enabled\n", dn->full_name);
 #endif
@@ -731,10 +736,11 @@ static void *early_enable_eeh(struct device_node *dn, void *data)
 
                         /* This device doesn't support EEH, but it may have an
                          * EEH parent, in which case we mark it as supported. */
-                        if (dn->parent && (dn->parent->eeh_mode & EEH_MODE_SUPPORTED)) {
+                        if (dn->parent && dn->parent->data
+                            && (PCI_DN(dn->parent)->eeh_mode & EEH_MODE_SUPPORTED)) {
                                 /* Parent supports EEH. */
-                                dn->eeh_mode |= EEH_MODE_SUPPORTED;
-                                dn->eeh_config_addr = dn->parent->eeh_config_addr;
+                                pdn->eeh_mode |= EEH_MODE_SUPPORTED;
+                                pdn->eeh_config_addr = PCI_DN(dn->parent)->eeh_config_addr;
                                 return NULL;
                         }
                 }
@@ -791,11 +797,13 @@ void __init eeh_init(void)
         for (phb = of_find_node_by_name(NULL, "pci"); phb;
              phb = of_find_node_by_name(phb, "pci")) {
                 unsigned long buid;
+                struct pci_dn *pci;
 
                 buid = get_phb_buid(phb);
-                if (buid == 0)
+                if (buid == 0 || phb->data == NULL)
                         continue;
 
+                pci = phb->data;
                 info.buid_lo = BUID_LO(buid);
                 info.buid_hi = BUID_HI(buid);
                 traverse_pci_devices(phb, early_enable_eeh, &info);
@@ -824,9 +832,9 @@ void eeh_add_device_early(struct device_node *dn)
         struct pci_controller *phb;
         struct eeh_early_enable_info info;
 
-        if (!dn)
+        if (!dn || !dn->data)
                 return;
-        phb = dn->phb;
+        phb = PCI_DN(dn)->phb;
         if (NULL == phb || 0 == phb->buid) {
                 printk(KERN_WARNING "EEH: Expected buid but found none\n");
                 return;
@@ -851,8 +859,7 @@ void eeh_add_device_late(struct pci_dev *dev)
                 return;
 
 #ifdef DEBUG
-        printk(KERN_DEBUG "EEH: adding device %s %s\n", pci_name(dev),
-               pci_pretty_name(dev));
+        printk(KERN_DEBUG "EEH: adding device %s\n", pci_name(dev));
 #endif
 
         pci_addr_cache_insert_device (dev);
@@ -873,8 +880,7 @@ void eeh_remove_device(struct pci_dev *dev)
 
         /* Unregister the device with the EEH/PCI address search system */
 #ifdef DEBUG
-        printk(KERN_DEBUG "EEH: remove device %s %s\n", pci_name(dev),
-               pci_pretty_name(dev));
+        printk(KERN_DEBUG "EEH: remove device %s\n", pci_name(dev));
 #endif
         pci_addr_cache_remove_device(dev);
 }
diff --git a/arch/ppc64/kernel/entry.S b/arch/ppc64/kernel/entry.S
index bf99b4a92f20..d133a49cdf89 100644
--- a/arch/ppc64/kernel/entry.S
+++ b/arch/ppc64/kernel/entry.S
@@ -28,7 +28,7 @@
 #include <asm/mmu.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cputable.h>
 
 #ifdef CONFIG_PPC_ISERIES
diff --git a/arch/ppc64/kernel/head.S b/arch/ppc64/kernel/head.S
index b436206e317d..58c314738c99 100644
--- a/arch/ppc64/kernel/head.S
+++ b/arch/ppc64/kernel/head.S
@@ -30,7 +30,7 @@
 #include <asm/mmu.h>
 #include <asm/systemcfg.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/bug.h>
 #include <asm/cputable.h>
 #include <asm/setup.h>
diff --git a/arch/ppc64/kernel/iSeries_VpdInfo.c b/arch/ppc64/kernel/iSeries_VpdInfo.c
index d11c732daf81..5d921792571f 100644
--- a/arch/ppc64/kernel/iSeries_VpdInfo.c
+++ b/arch/ppc64/kernel/iSeries_VpdInfo.c
@@ -264,8 +264,5 @@ void __init iSeries_Device_Information(struct pci_dev *PciDev, int count)
         printk("%d. PCI: Bus%3d, Device%3d, Vendor %04X Frame%3d, Card %4s  ",
                         count, bus, PCI_SLOT(PciDev->devfn), PciDev->vendor,
                         frame, card);
-        if (pci_class_name(PciDev->class >> 8) == 0)
-                printk("0x%04X\n", (int)(PciDev->class >> 8));
-        else
-                printk("%s\n", pci_class_name(PciDev->class >> 8));
+        printk("0x%04X\n", (int)(PciDev->class >> 8));
 }
diff --git a/arch/ppc64/kernel/idle_power4.S b/arch/ppc64/kernel/idle_power4.S
index 97e4a2655040..ca02afe2a795 100644
--- a/arch/ppc64/kernel/idle_power4.S
+++ b/arch/ppc64/kernel/idle_power4.S
@@ -20,7 +20,7 @@
 #include <asm/cputable.h>
 #include <asm/thread_info.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
 #undef DEBUG
 
diff --git a/arch/ppc64/kernel/iomap.c b/arch/ppc64/kernel/iomap.c
index 153cc8b0f136..6160c8dbb7c5 100644
--- a/arch/ppc64/kernel/iomap.c
+++ b/arch/ppc64/kernel/iomap.c
@@ -22,13 +22,23 @@ unsigned int fastcall ioread16(void __iomem *addr)
 {
         return readw(addr);
 }
+unsigned int fastcall ioread16be(void __iomem *addr)
+{
+        return in_be16(addr);
+}
 unsigned int fastcall ioread32(void __iomem *addr)
 {
         return readl(addr);
 }
+unsigned int fastcall ioread32be(void __iomem *addr)
+{
+        return in_be32(addr);
+}
 EXPORT_SYMBOL(ioread8);
 EXPORT_SYMBOL(ioread16);
+EXPORT_SYMBOL(ioread16be);
 EXPORT_SYMBOL(ioread32);
+EXPORT_SYMBOL(ioread32be);
 
 void fastcall iowrite8(u8 val, void __iomem *addr)
 {
@@ -38,13 +48,23 @@ void fastcall iowrite16(u16 val, void __iomem *addr)
 {
         writew(val, addr);
 }
+void fastcall iowrite16be(u16 val, void __iomem *addr)
+{
+        out_be16(addr, val);
+}
 void fastcall iowrite32(u32 val, void __iomem *addr)
 {
         writel(val, addr);
 }
+void fastcall iowrite32be(u32 val, void __iomem *addr)
+{
+        out_be32(addr, val);
+}
 EXPORT_SYMBOL(iowrite8);
 EXPORT_SYMBOL(iowrite16);
+EXPORT_SYMBOL(iowrite16be);
 EXPORT_SYMBOL(iowrite32);
+EXPORT_SYMBOL(iowrite32be);
 
 /*
  * These are the "repeat read/write" functions. Note the
@@ -56,15 +76,15 @@ EXPORT_SYMBOL(iowrite32);
  */
 void ioread8_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insb((u8 __force *) addr, dst, count);
+        _insb((u8 __iomem *) addr, dst, count);
 }
 void ioread16_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insw_ns((u16 __force *) addr, dst, count);
+        _insw_ns((u16 __iomem *) addr, dst, count);
 }
 void ioread32_rep(void __iomem *addr, void *dst, unsigned long count)
 {
-        _insl_ns((u32 __force *) addr, dst, count);
+        _insl_ns((u32 __iomem *) addr, dst, count);
 }
 EXPORT_SYMBOL(ioread8_rep);
 EXPORT_SYMBOL(ioread16_rep);
@@ -72,15 +92,15 @@ EXPORT_SYMBOL(ioread32_rep);
 
 void iowrite8_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsb((u8 __force *) addr, src, count);
+        _outsb((u8 __iomem *) addr, src, count);
 }
 void iowrite16_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsw_ns((u16 __force *) addr, src, count);
+        _outsw_ns((u16 __iomem *) addr, src, count);
 }
 void iowrite32_rep(void __iomem *addr, const void *src, unsigned long count)
 {
-        _outsl_ns((u32 __force *) addr, src, count);
+        _outsl_ns((u32 __iomem *) addr, src, count);
 }
 EXPORT_SYMBOL(iowrite8_rep);
 EXPORT_SYMBOL(iowrite16_rep);
diff --git a/arch/ppc64/kernel/iommu.c b/arch/ppc64/kernel/iommu.c
index 845eebd1e28d..9032b6bfe036 100644
--- a/arch/ppc64/kernel/iommu.c
+++ b/arch/ppc64/kernel/iommu.c
@@ -438,7 +438,8 @@ struct iommu_table *iommu_init_table(struct iommu_table *tbl)
 
 void iommu_free_table(struct device_node *dn)
 {
-        struct iommu_table *tbl = dn->iommu_table;
+        struct pci_dn *pdn = dn->data;
+        struct iommu_table *tbl = pdn->iommu_table;
         unsigned long bitmap_sz, i;
         unsigned int order;
 
diff --git a/arch/ppc64/kernel/kprobes.c b/arch/ppc64/kernel/kprobes.c
index a3d519518fb8..7e80d49c589a 100644
--- a/arch/ppc64/kernel/kprobes.c
+++ b/arch/ppc64/kernel/kprobes.c
@@ -44,7 +44,7 @@ static struct kprobe *kprobe_prev;
 static unsigned long kprobe_status_prev, kprobe_saved_msr_prev;
 static struct pt_regs jprobe_saved_regs;
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         int ret = 0;
         kprobe_opcode_t insn = *p->addr;
@@ -68,27 +68,27 @@ int arch_prepare_kprobe(struct kprobe *p)
         return ret;
 }
 
-void arch_copy_kprobe(struct kprobe *p)
+void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
         memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE * sizeof(kprobe_opcode_t));
         p->opcode = *p->addr;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         *p->addr = BREAKPOINT_INSTRUCTION;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         *p->addr = p->opcode;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         up(&kprobe_mutex);
         free_insn_slot(p->ainsn.insn);
@@ -102,7 +102,7 @@ static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
         regs->msr |= MSR_SE;
 
         /* single step inline if it is a trap variant */
-        if (IS_TW(insn) || IS_TD(insn) || IS_TWI(insn) || IS_TDI(insn))
+        if (is_trap(insn))
                 regs->nip = (unsigned long)p->addr;
         else
                 regs->nip = (unsigned long)p->ainsn.insn;
@@ -122,7 +122,8 @@ static inline void restore_previous_kprobe(void)
         kprobe_saved_msr = kprobe_saved_msr_prev;
 }
 
-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+                                      struct pt_regs *regs)
 {
         struct kretprobe_instance *ri;
 
@@ -151,7 +152,9 @@ static inline int kprobe_handler(struct pt_regs *regs)
                    Disarm the probe we just hit, and ignore it. */
                 p = get_kprobe(addr);
                 if (p) {
-                        if (kprobe_status == KPROBE_HIT_SS) {
+                        kprobe_opcode_t insn = *p->ainsn.insn;
+                        if (kprobe_status == KPROBE_HIT_SS &&
+                                        is_trap(insn)) {
                                 regs->msr &= ~MSR_SE;
                                 regs->msr |= kprobe_saved_msr;
                                 unlock_kprobes();
@@ -191,8 +194,7 @@ static inline int kprobe_handler(struct pt_regs *regs)
                          * trap variant, it could belong to someone else
                          */
                         kprobe_opcode_t cur_insn = *addr;
-                        if (IS_TW(cur_insn) || IS_TD(cur_insn) ||
-                                        IS_TWI(cur_insn) || IS_TDI(cur_insn))
+                        if (is_trap(cur_insn))
                                 goto no_kprobe;
                         /*
                          * The breakpoint instruction was removed right
@@ -244,7 +246,7 @@ void kretprobe_trampoline_holder(void)
 /*
  * Called when the probe at kretprobe trampoline is hit
  */
-int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head;
@@ -308,7 +310,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
  * single-stepped a copy of the instruction.  The address of this
  * copy is p->ainsn.insn.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         int ret;
         unsigned int insn = *p->ainsn.insn;
@@ -373,8 +375,8 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 /*
  * Wrapper routine to for handling exceptions.
  */
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         int ret = NOTIFY_DONE;
@@ -402,11 +404,11 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         default:
                 break;
         }
-        preempt_enable();
+        preempt_enable_no_resched();
         return ret;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
 
@@ -419,16 +421,16 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void jprobe_return(void)
+void __kprobes jprobe_return(void)
 {
         asm volatile("trap" ::: "memory");
 }
 
-void jprobe_return_end(void)
+void __kprobes jprobe_return_end(void)
 {
 };
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         /*
          * FIXME - we should ideally be validating that we got here 'cos
diff --git a/arch/ppc64/kernel/maple_pci.c b/arch/ppc64/kernel/maple_pci.c
index 53993999b265..5a8b4d8c2dd6 100644
--- a/arch/ppc64/kernel/maple_pci.c
+++ b/arch/ppc64/kernel/maple_pci.c
@@ -447,9 +447,9 @@ void __init maple_pci_init(void)
          */
         if (u3_agp) {
                 struct device_node *np = u3_agp->arch_data;
-                np->busno = 0xf0;
+                PCI_DN(np)->busno = 0xf0;
                 for (np = np->child; np; np = np->sibling)
-                        np->busno = 0xf0;
+                        PCI_DN(np)->busno = 0xf0;
         }
 
         /* Tell pci.c to use the common resource allocation mecanism */
diff --git a/arch/ppc64/kernel/misc.S b/arch/ppc64/kernel/misc.S
index 474df0a862bf..e7241ad80a08 100644
--- a/arch/ppc64/kernel/misc.S
+++ b/arch/ppc64/kernel/misc.S
@@ -26,7 +26,7 @@
 #include <asm/page.h>
 #include <asm/cache.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cputable.h>
 
         .text
@@ -183,7 +183,7 @@ PPC64_CACHES:
  *   flush all bytes from start through stop-1 inclusive
  */
 
-_GLOBAL(__flush_icache_range)
+_KPROBE(__flush_icache_range)
 
 /*
  * Flush the data cache to memory 
@@ -223,7 +223,7 @@ _GLOBAL(__flush_icache_range)
         bdnz    2b
         isync
         blr
-        
+        .previous .text
 /*
  * Like above, but only do the D-cache.
  *
@@ -957,7 +957,7 @@ _GLOBAL(sys_call_table32)
         .llong .ppc_fork
         .llong .sys_read
         .llong .sys_write
-        .llong .sys32_open              /* 5 */
+        .llong .compat_sys_open         /* 5 */
         .llong .sys_close
         .llong .sys32_waitpid
         .llong .sys32_creat
@@ -1431,9 +1431,9 @@ _GLOBAL(sys_call_table)
         .llong .sys_ni_syscall          /* 195 - 32bit only stat64 */
         .llong .sys_ni_syscall          /* 32bit only lstat64 */
         .llong .sys_ni_syscall          /* 32bit only fstat64 */
-        .llong .sys_ni_syscall          /* 32bit only pciconfig_read */
-        .llong .sys_ni_syscall          /* 32bit only pciconfig_write */
-        .llong .sys_ni_syscall          /* 32bit only pciconfig_iobase */
+        .llong .sys_pciconfig_read
+        .llong .sys_pciconfig_write
+        .llong .sys_pciconfig_iobase    /* 200 - pciconfig_iobase */
         .llong .sys_ni_syscall          /* reserved for MacOnLinux */
         .llong .sys_getdents64
         .llong .sys_pivot_root
diff --git a/arch/ppc64/kernel/pSeries_iommu.c b/arch/ppc64/kernel/pSeries_iommu.c
index 9d5e1e7fc389..f0fd7fbd6531 100644
--- a/arch/ppc64/kernel/pSeries_iommu.c
+++ b/arch/ppc64/kernel/pSeries_iommu.c
@@ -295,7 +295,7 @@ static void iommu_table_setparms_lpar(struct pci_controller *phb,
                                       struct iommu_table *tbl,
                                       unsigned int *dma_window)
 {
-        tbl->it_busno  = dn->bussubno;
+        tbl->it_busno  = PCI_DN(dn)->bussubno;
 
         /* TODO: Parse field size properties properly. */
         tbl->it_size   = (((unsigned long)dma_window[4] << 32) |
@@ -311,6 +311,7 @@ static void iommu_table_setparms_lpar(struct pci_controller *phb,
 static void iommu_bus_setup_pSeries(struct pci_bus *bus)
 {
         struct device_node *dn, *pdn;
+        struct pci_dn *pci;
         struct iommu_table *tbl;
 
         DBG("iommu_bus_setup_pSeries, bus %p, bus->self %p\n", bus, bus->self);
@@ -325,6 +326,7 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
          */
 
         dn = pci_bus_to_OF_node(bus);
+        pci = dn->data;
 
         if (!bus->self) {
                 /* Root bus */
@@ -341,18 +343,18 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
                                  * alltogether. This leaves 768MB for the window.
                                  */
                                 DBG("PHB has io-hole, reserving 256MB\n");
-                                dn->phb->dma_window_size = 3 << 28;
-                                dn->phb->dma_window_base_cur = 1 << 28;
+                                pci->phb->dma_window_size = 3 << 28;
+                                pci->phb->dma_window_base_cur = 1 << 28;
                         } else {
                                 /* 1GB window by default */
-                                dn->phb->dma_window_size = 1 << 30;
-                                dn->phb->dma_window_base_cur = 0;
+                                pci->phb->dma_window_size = 1 << 30;
+                                pci->phb->dma_window_base_cur = 0;
                         }
 
                         tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
 
-                        iommu_table_setparms(dn->phb, dn, tbl);
-                        dn->iommu_table = iommu_init_table(tbl);
+                        iommu_table_setparms(pci->phb, dn, tbl);
+                        pci->iommu_table = iommu_init_table(tbl);
                 } else {
                         /* Do a 128MB table at root. This is used for the IDE
                          * controller on some SMP-mode POWER4 machines. It
@@ -363,16 +365,16 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
                          * Allocate at offset 128MB to avoid having to deal
                          * with ISA holes; 128MB table for IDE is plenty.
                          */
-                        dn->phb->dma_window_size = 1 << 27;
-                        dn->phb->dma_window_base_cur = 1 << 27;
+                        pci->phb->dma_window_size = 1 << 27;
+                        pci->phb->dma_window_base_cur = 1 << 27;
 
                         tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
 
-                        iommu_table_setparms(dn->phb, dn, tbl);
-                        dn->iommu_table = iommu_init_table(tbl);
+                        iommu_table_setparms(pci->phb, dn, tbl);
+                        pci->iommu_table = iommu_init_table(tbl);
 
                         /* All child buses have 256MB tables */
-                        dn->phb->dma_window_size = 1 << 28;
+                        pci->phb->dma_window_size = 1 << 28;
                 }
         } else {
                 pdn = pci_bus_to_OF_node(bus->parent);
@@ -386,12 +388,12 @@ static void iommu_bus_setup_pSeries(struct pci_bus *bus)
 
                         tbl = kmalloc(sizeof(struct iommu_table), GFP_KERNEL);
 
-                        iommu_table_setparms(dn->phb, dn, tbl);
+                        iommu_table_setparms(pci->phb, dn, tbl);
 
-                        dn->iommu_table = iommu_init_table(tbl);
+                        pci->iommu_table = iommu_init_table(tbl);
                 } else {
                         /* Lower than first child or under python, use parent table */
-                        dn->iommu_table = pdn->iommu_table;
+                        pci->iommu_table = PCI_DN(pdn)->iommu_table;
                 }
         }
 }
@@ -401,6 +403,7 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
 {
         struct iommu_table *tbl;
         struct device_node *dn, *pdn;
+        struct pci_dn *ppci;
         unsigned int *dma_window = NULL;
 
         DBG("iommu_bus_setup_pSeriesLP, bus %p, bus->self %p\n", bus, bus->self);
@@ -419,22 +422,24 @@ static void iommu_bus_setup_pSeriesLP(struct pci_bus *bus)
                 return;
         }
 
-        if (!pdn->iommu_table) {
+        ppci = pdn->data;
+        if (!ppci->iommu_table) {
                 /* Bussubno hasn't been copied yet.
                  * Do it now because iommu_table_setparms_lpar needs it.
                  */
-                pdn->bussubno = bus->number;
+
+                ppci->bussubno = bus->number;
 
                 tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),
                                                     GFP_KERNEL);
         
-                iommu_table_setparms_lpar(pdn->phb, pdn, tbl, dma_window);
+                iommu_table_setparms_lpar(ppci->phb, pdn, tbl, dma_window);
 
-                pdn->iommu_table = iommu_init_table(tbl);
+                ppci->iommu_table = iommu_init_table(tbl);
         }
 
         if (pdn != dn)
-                dn->iommu_table = pdn->iommu_table;
+                PCI_DN(dn)->iommu_table = ppci->iommu_table;
 }
 
 
@@ -449,11 +454,11 @@ static void iommu_dev_setup_pSeries(struct pci_dev *dev)
          */
         mydn = dn = pci_device_to_OF_node(dev);
 
-        while (dn && dn->iommu_table == NULL)
+        while (dn && dn->data && PCI_DN(dn)->iommu_table == NULL)
                 dn = dn->parent;
 
-        if (dn) {
-                mydn->iommu_table = dn->iommu_table;
+        if (dn && dn->data) {
+                PCI_DN(mydn)->iommu_table = PCI_DN(dn)->iommu_table;
         } else {
                 DBG("iommu_dev_setup_pSeries, dev %p (%s) has no iommu table\n", dev, dev->pretty_name);
         }
@@ -463,10 +468,11 @@ static int iommu_reconfig_notifier(struct notifier_block *nb, unsigned long acti
 {
         int err = NOTIFY_OK;
         struct device_node *np = node;
+        struct pci_dn *pci = np->data;
 
         switch (action) {
         case PSERIES_RECONFIG_REMOVE:
-                if (np->iommu_table &&
+                if (pci->iommu_table &&
                     get_property(np, "ibm,dma-window", NULL))
                         iommu_free_table(np);
                 break;
@@ -486,6 +492,7 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
         struct device_node *pdn, *dn;
         struct iommu_table *tbl;
         int *dma_window = NULL;
+        struct pci_dn *pci;
 
         DBG("iommu_dev_setup_pSeriesLP, dev %p (%s)\n", dev, dev->pretty_name);
 
@@ -497,8 +504,10 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
          */
         dn = pci_device_to_OF_node(dev);
 
-        for (pdn = dn; pdn && !pdn->iommu_table; pdn = pdn->parent) {
-                dma_window = (unsigned int *)get_property(pdn, "ibm,dma-window", NULL);
+        for (pdn = dn; pdn && pdn->data && !PCI_DN(pdn)->iommu_table;
+             pdn = pdn->parent) {
+                dma_window = (unsigned int *)
+                        get_property(pdn, "ibm,dma-window", NULL);
                 if (dma_window)
                         break;
         }
@@ -515,20 +524,21 @@ static void iommu_dev_setup_pSeriesLP(struct pci_dev *dev)
                 DBG("Found DMA window, allocating table\n");
         }
 
-        if (!pdn->iommu_table) {
+        pci = pdn->data;
+        if (!pci->iommu_table) {
                 /* iommu_table_setparms_lpar needs bussubno. */
-                pdn->bussubno = pdn->phb->bus->number;
+                pci->bussubno = pci->phb->bus->number;
 
                 tbl = (struct iommu_table *)kmalloc(sizeof(struct iommu_table),
                                                     GFP_KERNEL);
 
-                iommu_table_setparms_lpar(pdn->phb, pdn, tbl, dma_window);
+                iommu_table_setparms_lpar(pci->phb, pdn, tbl, dma_window);
 
-                pdn->iommu_table = iommu_init_table(tbl);
+                pci->iommu_table = iommu_init_table(tbl);
         }
 
         if (pdn != dn)
-                dn->iommu_table = pdn->iommu_table;
+                PCI_DN(dn)->iommu_table = pci->iommu_table;
 }
 
 static void iommu_bus_setup_null(struct pci_bus *b) { }
diff --git a/arch/ppc64/kernel/pSeries_reconfig.c b/arch/ppc64/kernel/pSeries_reconfig.c
index dc2a69d412a2..58c61219d08e 100644
--- a/arch/ppc64/kernel/pSeries_reconfig.c
+++ b/arch/ppc64/kernel/pSeries_reconfig.c
@@ -111,7 +111,7 @@ static int pSeries_reconfig_add_node(const char *path, struct property *proplist
         struct device_node *np;
         int err = -ENOMEM;
 
-        np = kcalloc(1, sizeof(*np), GFP_KERNEL);
+        np = kzalloc(sizeof(*np), GFP_KERNEL);
         if (!np)
                 goto out_err;
 
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index d0d55c7908ef..8447dcc2c2b3 100644
--- a/arch/ppc64/kernel/pci.c
+++ b/arch/ppc64/kernel/pci.c
@@ -21,6 +21,7 @@
 #include <linux/bootmem.h>
 #include <linux/mm.h>
 #include <linux/list.h>
+#include <linux/syscalls.h>
 
 #include <asm/processor.h>
 #include <asm/io.h>
@@ -84,7 +85,6 @@ static void fixup_broken_pcnet32(struct pci_dev* dev)
         if ((dev->class>>8 == PCI_CLASS_NETWORK_ETHERNET)) {
                 dev->vendor = PCI_VENDOR_ID_AMD;
                 pci_write_config_word(dev, PCI_VENDOR_ID, PCI_VENDOR_ID_AMD);
-                pci_name_device(dev);
         }
 }
 DECLARE_PCI_FIXUP_HEADER(PCI_VENDOR_ID_TRIDENT, PCI_ANY_ID, fixup_broken_pcnet32);
@@ -838,9 +838,11 @@ int pcibios_scan_all_fns(struct pci_bus *bus, int devfn)
         * device tree.  If they are then we need to scan all the
         * functions of this slot.
         */
-       for (dn = busdn->child; dn; dn = dn->sibling)
-               if ((dn->devfn >> 3) == (devfn >> 3))
+       for (dn = busdn->child; dn; dn = dn->sibling) {
+               struct pci_dn *pdn = dn->data;
+               if (pdn && (pdn->devfn >> 3) == (devfn >> 3))
                        return 1;
+       }
 
        return 0;
 }
@@ -983,3 +985,62 @@ void pci_resource_to_user(const struct pci_dev *dev, int bar,
 }
 
 #endif /* CONFIG_PPC_MULTIPLATFORM */
+
+
+#define IOBASE_BRIDGE_NUMBER    0
+#define IOBASE_MEMORY           1
+#define IOBASE_IO               2
+#define IOBASE_ISA_IO           3
+#define IOBASE_ISA_MEM          4
+
+long sys_pciconfig_iobase(long which, unsigned long in_bus,
+                          unsigned long in_devfn)
+{
+        struct pci_controller* hose;
+        struct list_head *ln;
+        struct pci_bus *bus = NULL;
+        struct device_node *hose_node;
+
+        /* Argh ! Please forgive me for that hack, but that's the
+         * simplest way to get existing XFree to not lockup on some
+         * G5 machines... So when something asks for bus 0 io base
+         * (bus 0 is HT root), we return the AGP one instead.
+         */
+#ifdef CONFIG_PPC_PMAC
+        if (systemcfg->platform == PLATFORM_POWERMAC &&
+            machine_is_compatible("MacRISC4"))
+                if (in_bus == 0)
+                        in_bus = 0xf0;
+#endif /* CONFIG_PPC_PMAC */
+
+        /* That syscall isn't quite compatible with PCI domains, but it's
+         * used on pre-domains setup. We return the first match
+         */
+
+        for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
+                bus = pci_bus_b(ln);
+                if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate))
+                        break;
+                bus = NULL;
+        }
+        if (bus == NULL || bus->sysdata == NULL)
+                return -ENODEV;
+
+        hose_node = (struct device_node *)bus->sysdata;
+        hose = PCI_DN(hose_node)->phb;
+
+        switch (which) {
+        case IOBASE_BRIDGE_NUMBER:
+                return (long)hose->first_busno;
+        case IOBASE_MEMORY:
+                return (long)hose->pci_mem_offset;
+        case IOBASE_IO:
+                return (long)hose->io_base_phys;
+        case IOBASE_ISA_IO:
+                return (long)isa_io_base;
+        case IOBASE_ISA_MEM:
+                return -EINVAL;
+        }
+
+        return -EOPNOTSUPP;
+}
diff --git a/arch/ppc64/kernel/pci.h b/arch/ppc64/kernel/pci.h
index 26be78b13af1..5eb2cc320566 100644
--- a/arch/ppc64/kernel/pci.h
+++ b/arch/ppc64/kernel/pci.h
@@ -34,7 +34,6 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
 
 void pci_devs_phb_init(void);
 void pci_devs_phb_init_dynamic(struct pci_controller *phb);
-struct device_node *fetch_dev_dn(struct pci_dev *dev);
 
 /* PCI address cache management routines */
 void pci_addr_cache_insert_device(struct pci_dev *dev);
diff --git a/arch/ppc64/kernel/pci_dn.c b/arch/ppc64/kernel/pci_dn.c
index ec345462afc3..a86389d07d57 100644
--- a/arch/ppc64/kernel/pci_dn.c
+++ b/arch/ppc64/kernel/pci_dn.c
@@ -23,6 +23,8 @@
 #include <linux/pci.h>
 #include <linux/string.h>
 #include <linux/init.h>
+#include <linux/slab.h>
+#include <linux/bootmem.h>
 
 #include <asm/io.h>
 #include <asm/prom.h>
@@ -40,16 +42,26 @@ static void * __devinit update_dn_pci_info(struct device_node *dn, void *data)
         struct pci_controller *phb = data;
         int *type = (int *)get_property(dn, "ibm,pci-config-space-type", NULL);
         u32 *regs;
-
-        dn->phb = phb;
+        struct pci_dn *pdn;
+
+        if (phb->is_dynamic)
+                pdn = kmalloc(sizeof(*pdn), GFP_KERNEL);
+        else
+                pdn = alloc_bootmem(sizeof(*pdn));
+        if (pdn == NULL)
+                return NULL;
+        memset(pdn, 0, sizeof(*pdn));
+        dn->data = pdn;
+        pdn->node = dn;
+        pdn->phb = phb;
         regs = (u32 *)get_property(dn, "reg", NULL);
         if (regs) {
                 /* First register entry is addr (00BBSS00)  */
-                dn->busno = (regs[0] >> 16) & 0xff;
-                dn->devfn = (regs[0] >> 8) & 0xff;
+                pdn->busno = (regs[0] >> 16) & 0xff;
+                pdn->devfn = (regs[0] >> 8) & 0xff;
         }
 
-        dn->pci_ext_config_space = (type && *type == 1);
+        pdn->pci_ext_config_space = (type && *type == 1);
         return NULL;
 }
 
@@ -112,10 +124,15 @@ void *traverse_pci_devices(struct device_node *start, traverse_func pre,
 void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
 {
         struct device_node * dn = (struct device_node *) phb->arch_data;
+        struct pci_dn *pdn;
 
         /* PHB nodes themselves must not match */
-        dn->devfn = dn->busno = -1;
-        dn->phb = phb;
+        update_dn_pci_info(dn, phb);
+        pdn = dn->data;
+        if (pdn) {
+                pdn->devfn = pdn->busno = -1;
+                pdn->phb = phb;
+        }
 
         /* Update dn->phb ptrs for new phb and children devices */
         traverse_pci_devices(dn, update_dn_pci_info, phb);
@@ -123,14 +140,17 @@ void __devinit pci_devs_phb_init_dynamic(struct pci_controller *phb)
 
 /*
  * Traversal func that looks for a <busno,devfcn> value.
- * If found, the device_node is returned (thus terminating the traversal).
+ * If found, the pci_dn is returned (thus terminating the traversal).
  */
 static void *is_devfn_node(struct device_node *dn, void *data)
 {
         int busno = ((unsigned long)data >> 8) & 0xff;
         int devfn = ((unsigned long)data) & 0xff;
+        struct pci_dn *pci = dn->data;
 
-        return ((devfn == dn->devfn) && (busno == dn->busno)) ? dn : NULL;
+        if (pci && (devfn == pci->devfn) && (busno == pci->busno))
+                return dn;
+        return NULL;
 }
 
 /*
@@ -149,13 +169,10 @@ static void *is_devfn_node(struct device_node *dn, void *data)
 struct device_node *fetch_dev_dn(struct pci_dev *dev)
 {
         struct device_node *orig_dn = dev->sysdata;
-        struct pci_controller *phb = orig_dn->phb; /* assume same phb as orig_dn */
-        struct device_node *phb_dn;
         struct device_node *dn;
         unsigned long searchval = (dev->bus->number << 8) | dev->devfn;
 
-        phb_dn = phb->arch_data;
-        dn = traverse_pci_devices(phb_dn, is_devfn_node, (void *)searchval);
+        dn = traverse_pci_devices(orig_dn, is_devfn_node, (void *)searchval);
         if (dn)
                 dev->sysdata = dn;
         return dn;
@@ -165,11 +182,13 @@ EXPORT_SYMBOL(fetch_dev_dn);
 static int pci_dn_reconfig_notifier(struct notifier_block *nb, unsigned long action, void *node)
 {
         struct device_node *np = node;
+        struct pci_dn *pci;
         int err = NOTIFY_OK;
 
         switch (action) {
         case PSERIES_RECONFIG_ADD:
-                update_dn_pci_info(np, np->parent->phb);
+                pci = np->parent->data;
+                update_dn_pci_info(np, pci->phb);
                 break;
         default:
                 err = NOTIFY_DONE;
diff --git a/arch/ppc64/kernel/pci_iommu.c b/arch/ppc64/kernel/pci_iommu.c
index ef0a62b916be..14647e09c9cd 100644
--- a/arch/ppc64/kernel/pci_iommu.c
+++ b/arch/ppc64/kernel/pci_iommu.c
@@ -66,7 +66,7 @@ static inline struct iommu_table *devnode_table(struct device *dev)
 #endif /* CONFIG_PPC_ISERIES */
 
 #ifdef CONFIG_PPC_MULTIPLATFORM
-        return PCI_GET_DN(pdev)->iommu_table;
+        return PCI_DN(PCI_GET_DN(pdev))->iommu_table;
 #endif /* CONFIG_PPC_MULTIPLATFORM */
 }
 
diff --git a/arch/ppc64/kernel/pmac_feature.c b/arch/ppc64/kernel/pmac_feature.c
index 98ed2bccab1a..eb4e6c3f694d 100644
--- a/arch/ppc64/kernel/pmac_feature.c
+++ b/arch/ppc64/kernel/pmac_feature.c
@@ -674,6 +674,7 @@ void __init pmac_check_ht_link(void)
 #if 0 /* Disabled for now */
         u32     ufreq, freq, ucfg, cfg;
         struct device_node *pcix_node;
+        struct pci_dn *pdn;
         u8      px_bus, px_devfn;
         struct pci_controller *px_hose;
 
@@ -687,9 +688,10 @@ void __init pmac_check_ht_link(void)
                 printk("No PCI-X bridge found\n");
                 return;
         }
-        px_hose = pcix_node->phb;
-        px_bus = pcix_node->busno;
-        px_devfn = pcix_node->devfn;
+        pdn = pcix_node->data;
+        px_hose = pdn->phb;
+        px_bus = pdn->busno;
+        px_devfn = pdn->devfn;
         
         early_read_config_dword(px_hose, px_bus, px_devfn, 0xc4, &cfg);
         early_read_config_dword(px_hose, px_bus, px_devfn, 0xcc, &freq);
diff --git a/arch/ppc64/kernel/pmac_pci.c b/arch/ppc64/kernel/pmac_pci.c
index 71fe911ad183..d37bff2d7d40 100644
--- a/arch/ppc64/kernel/pmac_pci.c
+++ b/arch/ppc64/kernel/pmac_pci.c
@@ -242,7 +242,7 @@ static int u3_ht_skip_device(struct pci_controller *hose,
         else
                 busdn = hose->arch_data;
         for (dn = busdn->child; dn; dn = dn->sibling)
-                if (dn->devfn == devfn)
+                if (dn->data && PCI_DN(dn)->devfn == devfn)
                         break;
         if (dn == NULL)
                 return -1;
@@ -746,9 +746,9 @@ void __init pmac_pci_init(void)
          */
         if (u3_agp) {
                 struct device_node *np = u3_agp->arch_data;
-                np->busno = 0xf0;
+                PCI_DN(np)->busno = 0xf0;
                 for (np = np->child; np; np = np->sibling)
-                        np->busno = 0xf0;
+                        PCI_DN(np)->busno = 0xf0;
         }
 
         pmac_check_ht_link();
diff --git a/arch/ppc64/kernel/pmc.c b/arch/ppc64/kernel/pmc.c
index cdfec7438d01..63d9481c3ec2 100644
--- a/arch/ppc64/kernel/pmc.c
+++ b/arch/ppc64/kernel/pmc.c
@@ -26,7 +26,7 @@ static void dummy_perf(struct pt_regs *regs)
         mtspr(SPRN_MMCR0, mmcr0);
 }
 
-static spinlock_t pmc_owner_lock = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(pmc_owner_lock);
 static void *pmc_owner_caller; /* mostly for debugging */
 perf_irq_t perf_irq = dummy_perf;
 
diff --git a/arch/ppc64/kernel/prom.c b/arch/ppc64/kernel/prom.c
index 6ad5a8467f87..7035deb6de92 100644
--- a/arch/ppc64/kernel/prom.c
+++ b/arch/ppc64/kernel/prom.c
@@ -1733,6 +1733,7 @@ static void of_node_release(struct kref *kref)
         kfree(node->intrs);
         kfree(node->addrs);
         kfree(node->full_name);
+        kfree(node->data);
         kfree(node);
 }
 
diff --git a/arch/ppc64/kernel/rtas_pci.c b/arch/ppc64/kernel/rtas_pci.c
index 1dccadaddd1d..4a9719b48abe 100644
--- a/arch/ppc64/kernel/rtas_pci.c
+++ b/arch/ppc64/kernel/rtas_pci.c
@@ -48,7 +48,7 @@ static int write_pci_config;
 static int ibm_read_pci_config;
 static int ibm_write_pci_config;
 
-static int config_access_valid(struct device_node *dn, int where)
+static int config_access_valid(struct pci_dn *dn, int where)
 {
         if (where < 256)
                 return 1;
@@ -78,15 +78,17 @@ static int rtas_read_config(struct device_node *dn, int where, int size, u32 *va
         int returnval = -1;
         unsigned long buid, addr;
         int ret;
+        struct pci_dn *pdn;
 
-        if (!dn)
+        if (!dn || !dn->data)
                 return PCIBIOS_DEVICE_NOT_FOUND;
-        if (!config_access_valid(dn, where))
+        pdn = dn->data;
+        if (!config_access_valid(pdn, where))
                 return PCIBIOS_BAD_REGISTER_NUMBER;
 
-        addr = ((where & 0xf00) << 20) | (dn->busno << 16) |
-                (dn->devfn << 8) | (where & 0xff);
-        buid = dn->phb->buid;
+        addr = ((where & 0xf00) << 20) | (pdn->busno << 16) |
+                (pdn->devfn << 8) | (where & 0xff);
+        buid = pdn->phb->buid;
         if (buid) {
                 ret = rtas_call(ibm_read_pci_config, 4, 2, &returnval,
                                 addr, buid >> 32, buid & 0xffffffff, size);
@@ -98,8 +100,8 @@ static int rtas_read_config(struct device_node *dn, int where, int size, u32 *va
         if (ret)
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
-        if (returnval == EEH_IO_ERROR_VALUE(size)
-            && eeh_dn_check_failure (dn, NULL))
+        if (returnval == EEH_IO_ERROR_VALUE(size) &&
+            eeh_dn_check_failure (dn, NULL))
                 return PCIBIOS_DEVICE_NOT_FOUND;
 
         return PCIBIOS_SUCCESSFUL;
@@ -118,24 +120,28 @@ static int rtas_pci_read_config(struct pci_bus *bus,
 
         /* Search only direct children of the bus */
         for (dn = busdn->child; dn; dn = dn->sibling)
-                if (dn->devfn == devfn && of_device_available(dn))
+                if (dn->data && PCI_DN(dn)->devfn == devfn
+                    && of_device_available(dn))
                         return rtas_read_config(dn, where, size, val);
+
         return PCIBIOS_DEVICE_NOT_FOUND;
 }
 
-static int rtas_write_config(struct device_node *dn, int where, int size, u32 val)
+int rtas_write_config(struct device_node *dn, int where, int size, u32 val)
 {
         unsigned long buid, addr;
         int ret;
+        struct pci_dn *pdn;
 
-        if (!dn)
+        if (!dn || !dn->data)
                 return PCIBIOS_DEVICE_NOT_FOUND;
-        if (!config_access_valid(dn, where))
+        pdn = dn->data;
+        if (!config_access_valid(pdn, where))
                 return PCIBIOS_BAD_REGISTER_NUMBER;
 
-        addr = ((where & 0xf00) << 20) | (dn->busno << 16) |
-                (dn->devfn << 8) | (where & 0xff);
-        buid = dn->phb->buid;
+        addr = ((where & 0xf00) << 20) | (pdn->busno << 16) |
+                (pdn->devfn << 8) | (where & 0xff);
+        buid = pdn->phb->buid;
         if (buid) {
                 ret = rtas_call(ibm_write_pci_config, 5, 1, NULL, addr, buid >> 32, buid & 0xffffffff, size, (ulong) val);
         } else {
@@ -161,7 +167,8 @@ static int rtas_pci_write_config(struct pci_bus *bus,
 
         /* Search only direct children of the bus */
         for (dn = busdn->child; dn; dn = dn->sibling)
-                if (dn->devfn == devfn && of_device_available(dn))
+                if (dn->data && PCI_DN(dn)->devfn == devfn
+                    && of_device_available(dn))
                         return rtas_write_config(dn, where, size, val);
         return PCIBIOS_DEVICE_NOT_FOUND;
 }
diff --git a/arch/ppc64/kernel/setup.c b/arch/ppc64/kernel/setup.c
index d0bb68af0ea4..bfa8791c9807 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -1283,7 +1283,7 @@ void __init generic_find_legacy_serial_ports(u64 *physport,
 
 static struct platform_device serial_device = {
         .name   = "serial8250",
-        .id     = 0,
+        .id     = PLAT8250_DEV_PLATFORM,
         .dev    = {
                 .platform_data = serial_ports,
         },
diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index 206619080e66..e93c13458910 100644
--- a/arch/ppc64/kernel/sys_ppc32.c
+++ b/arch/ppc64/kernel/sys_ppc32.c
@@ -708,62 +708,9 @@ asmlinkage int sys32_pciconfig_write(u32 bus, u32 dfn, u32 off, u32 len, u32 ubu
                                    compat_ptr(ubuf));
 }
 
-#define IOBASE_BRIDGE_NUMBER    0
-#define IOBASE_MEMORY           1
-#define IOBASE_IO               2
-#define IOBASE_ISA_IO           3
-#define IOBASE_ISA_MEM          4
-
 asmlinkage int sys32_pciconfig_iobase(u32 which, u32 in_bus, u32 in_devfn)
 {
-#ifdef CONFIG_PCI
-        struct pci_controller* hose;
-        struct list_head *ln;
-        struct pci_bus *bus = NULL;
-        struct device_node *hose_node;
-
-        /* Argh ! Please forgive me for that hack, but that's the
-         * simplest way to get existing XFree to not lockup on some
-         * G5 machines... So when something asks for bus 0 io base
-         * (bus 0 is HT root), we return the AGP one instead.
-         */
-#ifdef CONFIG_PPC_PMAC
-        if (systemcfg->platform == PLATFORM_POWERMAC &&
-            machine_is_compatible("MacRISC4"))
-                if (in_bus == 0)
-                        in_bus = 0xf0;
-#endif /* CONFIG_PPC_PMAC */
-
-        /* That syscall isn't quite compatible with PCI domains, but it's
-         * used on pre-domains setup. We return the first match
-         */
-
-        for (ln = pci_root_buses.next; ln != &pci_root_buses; ln = ln->next) {
-                bus = pci_bus_b(ln);
-                if (in_bus >= bus->number && in_bus < (bus->number + bus->subordinate))
-                        break;
-                bus = NULL;
-        }
-        if (bus == NULL || bus->sysdata == NULL)
-                return -ENODEV;
-
-        hose_node = (struct device_node *)bus->sysdata;
-        hose = hose_node->phb;
-
-        switch (which) {
-        case IOBASE_BRIDGE_NUMBER:
-                return (long)hose->first_busno;
-        case IOBASE_MEMORY:
-                return (long)hose->pci_mem_offset;
-        case IOBASE_IO:
-                return (long)hose->io_base_phys;
-        case IOBASE_ISA_IO:
-                return (long)isa_io_base;
-        case IOBASE_ISA_MEM:
-                return -EINVAL;
-        }
-#endif  /* CONFIG_PCI */
-        return -EOPNOTSUPP;
+        return sys_pciconfig_iobase(which, in_bus, in_devfn);
 }
 
 
@@ -867,37 +814,6 @@ off_t ppc32_lseek(unsigned int fd, u32 offset, unsigned int origin)
         return sys_lseek(fd, (int)offset, origin);
 }
 
-/*
- * This is just a version for 32-bit applications which does
- * not force O_LARGEFILE on.
- */
-asmlinkage long sys32_open(const char __user * filename, int flags, int mode)
-{
-        char * tmp;
-        int fd, error;
-
-        tmp = getname(filename);
-        fd = PTR_ERR(tmp);
-        if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
-                if (fd >= 0) {
-                        struct file * f = filp_open(tmp, flags, mode);
-                        error = PTR_ERR(f);
-                        if (IS_ERR(f))
-                                goto out_error;
-                        fd_install(fd, f);
-                }
-out:
-                putname(tmp);
-        }
-        return fd;
-
-out_error:
-        put_unused_fd(fd);
-        fd = error;
-        goto out;
-}
-
 /* Note: it is necessary to treat bufsiz as an unsigned int,
  * with the corresponding cast to a signed int to insure that the 
  * proper conversion (sign extension) between the register representation of a signed int (msr in 32-bit mode)
diff --git a/arch/ppc64/kernel/syscalls.c b/arch/ppc64/kernel/syscalls.c
index a8cbb202b8cd..05f16633bd2c 100644
--- a/arch/ppc64/kernel/syscalls.c
+++ b/arch/ppc64/kernel/syscalls.c
@@ -46,10 +46,6 @@
 
 extern unsigned long wall_jiffies;
 
-void
-check_bugs(void)
-{
-}
 
 /*
  * sys_ipc() is the de-multiplexer for the SysV IPC calls..
diff --git a/arch/ppc64/kernel/time.c b/arch/ppc64/kernel/time.c
index 91ef95ccda4f..9939c206afa4 100644
--- a/arch/ppc64/kernel/time.c
+++ b/arch/ppc64/kernel/time.c
@@ -128,7 +128,7 @@ static __inline__ void timer_check_rtc(void)
          * We should have an rtc call that only sets the minutes and
          * seconds like on Intel to avoid problems with non UTC clocks.
          */
-        if ( (time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
              xtime.tv_sec - last_rtc_update >= 659 &&
              abs((xtime.tv_nsec/1000) - (1000000-1000000/HZ)) < 500000/HZ &&
              jiffies - wall_jiffies == 1) {
@@ -435,10 +435,7 @@ int do_settimeofday(struct timespec *tv)
          */
         last_rtc_update = new_sec - 658;
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         delta_xsec = mulhdu( (tb_last_stamp-do_gtod.varp->tb_orig_stamp),
                              do_gtod.varp->tb_to_xs );
diff --git a/arch/ppc64/kernel/traps.c b/arch/ppc64/kernel/traps.c
index a8d5e83ee89f..7467ae508e6e 100644
--- a/arch/ppc64/kernel/traps.c
+++ b/arch/ppc64/kernel/traps.c
@@ -30,6 +30,7 @@
 #include <linux/init.h>
 #include <linux/module.h>
 #include <linux/delay.h>
+#include <linux/kprobes.h>
 #include <asm/kdebug.h>
 
 #include <asm/pgtable.h>
@@ -220,7 +221,7 @@ void instruction_breakpoint_exception(struct pt_regs *regs)
         _exception(SIGTRAP, regs, TRAP_BRKPT, regs->nip);
 }
 
-void single_step_exception(struct pt_regs *regs)
+void __kprobes single_step_exception(struct pt_regs *regs)
 {
         regs->msr &= ~MSR_SE;  /* Turn off 'trace' bit */
 
@@ -398,7 +399,7 @@ check_bug_trap(struct pt_regs *regs)
         return 0;
 }
 
-void program_check_exception(struct pt_regs *regs)
+void __kprobes program_check_exception(struct pt_regs *regs)
 {
         if (debugger_fault_handler(regs))
                 return;
diff --git a/arch/ppc64/kernel/u3_iommu.c b/arch/ppc64/kernel/u3_iommu.c
index b6e3bca4102d..41ea09cb9ac7 100644
--- a/arch/ppc64/kernel/u3_iommu.c
+++ b/arch/ppc64/kernel/u3_iommu.c
@@ -276,7 +276,7 @@ static void iommu_dev_setup_u3(struct pci_dev *dev)
         dn = pci_device_to_OF_node(dev);
 
         if (dn)
-                dn->iommu_table = &iommu_table_u3;
+                PCI_DN(dn)->iommu_table = &iommu_table_u3;
 }
 
 static void iommu_bus_setup_u3(struct pci_bus *bus)
@@ -291,7 +291,7 @@ static void iommu_bus_setup_u3(struct pci_bus *bus)
         dn = pci_bus_to_OF_node(bus);
 
         if (dn)
-                dn->iommu_table = &iommu_table_u3;
+                PCI_DN(dn)->iommu_table = &iommu_table_u3;
 }
 
 static void iommu_dev_setup_null(struct pci_dev *dev) { }
diff --git a/arch/ppc64/kernel/udbg.c b/arch/ppc64/kernel/udbg.c
index ed6766e21f5a..d49c3613c8ec 100644
--- a/arch/ppc64/kernel/udbg.c
+++ b/arch/ppc64/kernel/udbg.c
@@ -158,14 +158,20 @@ static struct console udbg_console = {
         .index  = -1,
 };
 
+static int early_console_initialized;
+
 void __init disable_early_printk(void)
 {
+        if (!early_console_initialized)
+                return;
         unregister_console(&udbg_console);
+        early_console_initialized = 0;
 }
 
 /* called by setup_system */
 void register_early_udbg_console(void)
 {
+        early_console_initialized = 1;
         register_console(&udbg_console);
 }
 
diff --git a/arch/ppc64/kernel/vdso32/cacheflush.S b/arch/ppc64/kernel/vdso32/cacheflush.S
index 0ed7ea721715..c8db993574ee 100644
--- a/arch/ppc64/kernel/vdso32/cacheflush.S
+++ b/arch/ppc64/kernel/vdso32/cacheflush.S
@@ -13,7 +13,7 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/vdso.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
 
diff --git a/arch/ppc64/kernel/vdso32/datapage.S b/arch/ppc64/kernel/vdso32/datapage.S
index 29b6bd32e1f1..4f4eb0be3992 100644
--- a/arch/ppc64/kernel/vdso32/datapage.S
+++ b/arch/ppc64/kernel/vdso32/datapage.S
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/vdso.h>
 
diff --git a/arch/ppc64/kernel/vdso32/gettimeofday.S b/arch/ppc64/kernel/vdso32/gettimeofday.S
index 2b48bf1fb109..07f1c1c650c8 100644
--- a/arch/ppc64/kernel/vdso32/gettimeofday.S
+++ b/arch/ppc64/kernel/vdso32/gettimeofday.S
@@ -13,7 +13,7 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/vdso.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 
         .text
diff --git a/arch/ppc64/kernel/vdso64/cacheflush.S b/arch/ppc64/kernel/vdso64/cacheflush.S
index e0725b7b7003..d4a0ad28d534 100644
--- a/arch/ppc64/kernel/vdso64/cacheflush.S
+++ b/arch/ppc64/kernel/vdso64/cacheflush.S
@@ -13,7 +13,7 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/vdso.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
 
diff --git a/arch/ppc64/kernel/vdso64/datapage.S b/arch/ppc64/kernel/vdso64/datapage.S
index 18afd971c9d9..ed6e599ae824 100644
--- a/arch/ppc64/kernel/vdso64/datapage.S
+++ b/arch/ppc64/kernel/vdso64/datapage.S
@@ -12,7 +12,7 @@
 #include <linux/config.h>
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/vdso.h>
 
diff --git a/arch/ppc64/kernel/vdso64/gettimeofday.S b/arch/ppc64/kernel/vdso64/gettimeofday.S
index ed3f970ff05e..f6df8028570a 100644
--- a/arch/ppc64/kernel/vdso64/gettimeofday.S
+++ b/arch/ppc64/kernel/vdso64/gettimeofday.S
@@ -14,7 +14,7 @@
 #include <asm/processor.h>
 #include <asm/ppc_asm.h>
 #include <asm/vdso.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
 /*
diff --git a/arch/ppc64/kernel/vmlinux.lds.S b/arch/ppc64/kernel/vmlinux.lds.S
index 4103cc13f8d6..0306510bc4ff 100644
--- a/arch/ppc64/kernel/vmlinux.lds.S
+++ b/arch/ppc64/kernel/vmlinux.lds.S
@@ -15,6 +15,7 @@ SECTIONS
         *(.text .text.*)
         SCHED_TEXT
         LOCK_TEXT
+        KPROBES_TEXT
         *(.fixup)
         . = ALIGN(4096);
         _etext = .;
diff --git a/arch/ppc64/lib/dec_and_lock.c b/arch/ppc64/lib/dec_and_lock.c
index 6e8d8591708c..7b9d4da5cf92 100644
--- a/arch/ppc64/lib/dec_and_lock.c
+++ b/arch/ppc64/lib/dec_and_lock.c
@@ -20,14 +20,7 @@
  * has a cmpxchg, and where atomic->value is an int holding
  * the value of the atomic (i.e. the high bits aren't used
  * for a lock or anything like that).
- *
- * N.B. ATOMIC_DEC_AND_LOCK gets defined in include/linux/spinlock.h
- * if spinlocks are empty and thus atomic_dec_and_lock is defined
- * to be atomic_dec_and_test - in that case we don't need it
- * defined here as well.
  */
-
-#ifndef ATOMIC_DEC_AND_LOCK
 int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 {
         int counter;
@@ -52,4 +45,3 @@ int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock)
 }
 
 EXPORT_SYMBOL(_atomic_dec_and_lock);
-#endif /* ATOMIC_DEC_AND_LOCK */
diff --git a/arch/ppc64/lib/locks.c b/arch/ppc64/lib/locks.c
index ef70ef91abe2..033643ab69e0 100644
--- a/arch/ppc64/lib/locks.c
+++ b/arch/ppc64/lib/locks.c
@@ -23,12 +23,12 @@
 /* waiting for a spinlock... */
 #if defined(CONFIG_PPC_SPLPAR) || defined(CONFIG_PPC_ISERIES)
 
-void __spin_yield(spinlock_t *lock)
+void __spin_yield(raw_spinlock_t *lock)
 {
         unsigned int lock_value, holder_cpu, yield_count;
         struct paca_struct *holder_paca;
 
-        lock_value = lock->lock;
+        lock_value = lock->slock;
         if (lock_value == 0)
                 return;
         holder_cpu = lock_value & 0xffff;
@@ -38,7 +38,7 @@ void __spin_yield(spinlock_t *lock)
         if ((yield_count & 1) == 0)
                 return;         /* virtual cpu is currently running */
         rmb();
-        if (lock->lock != lock_value)
+        if (lock->slock != lock_value)
                 return;         /* something has changed */
 #ifdef CONFIG_PPC_ISERIES
         HvCall2(HvCallBaseYieldProcessor, HvCall_YieldToProc,
@@ -54,7 +54,7 @@ void __spin_yield(spinlock_t *lock)
  * This turns out to be the same for read and write locks, since
  * we only know the holder if it is write-locked.
  */
-void __rw_yield(rwlock_t *rw)
+void __rw_yield(raw_rwlock_t *rw)
 {
         int lock_value;
         unsigned int holder_cpu, yield_count;
@@ -82,9 +82,9 @@ void __rw_yield(rwlock_t *rw)
 }
 #endif
 
-void spin_unlock_wait(spinlock_t *lock)
+void __raw_spin_unlock_wait(raw_spinlock_t *lock)
 {
-        while (lock->lock) {
+        while (lock->slock) {
                 HMT_low();
                 if (SHARED_PROCESSOR)
                         __spin_yield(lock);
@@ -92,4 +92,4 @@ void spin_unlock_wait(spinlock_t *lock)
         HMT_medium();
 }
 
-EXPORT_SYMBOL(spin_unlock_wait);
+EXPORT_SYMBOL(__raw_spin_unlock_wait);
diff --git a/arch/ppc64/mm/fault.c b/arch/ppc64/mm/fault.c
index 20b0f37e8bf8..772f0714a5b7 100644
--- a/arch/ppc64/mm/fault.c
+++ b/arch/ppc64/mm/fault.c
@@ -29,6 +29,7 @@
 #include <linux/interrupt.h>
 #include <linux/smp_lock.h>
 #include <linux/module.h>
+#include <linux/kprobes.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -84,8 +85,8 @@ static int store_updates_sp(struct pt_regs *regs)
  * The return value is 0 if the fault was handled, or the signal
  * number if this is a kernel fault that can't be handled here.
  */
-int do_page_fault(struct pt_regs *regs, unsigned long address,
-                  unsigned long error_code)
+int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
+                            unsigned long error_code)
 {
         struct vm_area_struct * vma;
         struct mm_struct *mm = current->mm;
diff --git a/arch/ppc64/mm/hash_low.S b/arch/ppc64/mm/hash_low.S
index 35eb49e1b890..ee5a5d36bfa8 100644
--- a/arch/ppc64/mm/hash_low.S
+++ b/arch/ppc64/mm/hash_low.S
@@ -16,7 +16,7 @@
 #include <asm/page.h>
 #include <asm/types.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cputable.h>
 
         .text
diff --git a/arch/ppc64/mm/init.c b/arch/ppc64/mm/init.c
index a14ab87df491..c2157c9c3acb 100644
--- a/arch/ppc64/mm/init.c
+++ b/arch/ppc64/mm/init.c
@@ -554,12 +554,12 @@ void __init do_init_bootmem(void)
          * present.
          */
         for (i=0; i < lmb.memory.cnt; i++)
-                free_bootmem(lmb_start_pfn(&lmb.memory, i),
+                free_bootmem(lmb.memory.region[i].base,
                              lmb_size_bytes(&lmb.memory, i));
 
         /* reserve the sections we're already using */
         for (i=0; i < lmb.reserved.cnt; i++)
-                reserve_bootmem(lmb_start_pfn(&lmb.reserved, i),
+                reserve_bootmem(lmb.reserved.region[i].base,
                                 lmb_size_bytes(&lmb.reserved, i));
 
         for (i=0; i < lmb.memory.cnt; i++)
diff --git a/arch/ppc64/mm/slb_low.S b/arch/ppc64/mm/slb_low.S
index 698d6b9ed6d1..a3a03da503bc 100644
--- a/arch/ppc64/mm/slb_low.S
+++ b/arch/ppc64/mm/slb_low.S
@@ -21,7 +21,7 @@
 #include <asm/page.h>
 #include <asm/mmu.h>
 #include <asm/ppc_asm.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/cputable.h>
 
 /* void slb_allocate(unsigned long ea);
diff --git a/arch/s390/Makefile b/arch/s390/Makefile
index 3cd8dd25c9d7..98db30481d97 100644
--- a/arch/s390/Makefile
+++ b/arch/s390/Makefile
@@ -19,6 +19,7 @@ CFLAGS		+= -m31
 AFLAGS          += -m31
 UTS_MACHINE     := s390
 STACK_SIZE      := 8192
+CHECKFLAGS      += -D__s390__
 endif
 
 ifdef CONFIG_ARCH_S390X
@@ -28,6 +29,7 @@ CFLAGS		+= -m64
 AFLAGS          += -m64
 UTS_MACHINE     := s390x
 STACK_SIZE      := 16384
+CHECKFLAGS      += -D__s390__ -D__s390x__
 endif
 
 cflags-$(CONFIG_MARCH_G5)   += $(call cc-option,-march=g5)
@@ -100,16 +102,6 @@ image: vmlinux
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES += include/asm-$(ARCH)/offsets.h
-
 # Don't use tabs in echo arguments
 define archhelp
   echo  '* image           - Kernel image for IPL ($(boot)/image)'
diff --git a/arch/s390/kernel/entry.S b/arch/s390/kernel/entry.S
index cbe7d6a2d02c..58fc7fbcb40e 100644
--- a/arch/s390/kernel/entry.S
+++ b/arch/s390/kernel/entry.S
@@ -18,7 +18,7 @@
 #include <asm/errno.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
 
diff --git a/arch/s390/kernel/entry64.S b/arch/s390/kernel/entry64.S
index fb77b72ab262..d0c9ffaa25db 100644
--- a/arch/s390/kernel/entry64.S
+++ b/arch/s390/kernel/entry64.S
@@ -18,7 +18,7 @@
 #include <asm/errno.h>
 #include <asm/ptrace.h>
 #include <asm/thread_info.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/unistd.h>
 #include <asm/page.h>
 
diff --git a/arch/s390/kernel/head.S b/arch/s390/kernel/head.S
index 2710e66fefba..55654b6e16dc 100644
--- a/arch/s390/kernel/head.S
+++ b/arch/s390/kernel/head.S
@@ -30,7 +30,7 @@
 #include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 
diff --git a/arch/s390/kernel/head64.S b/arch/s390/kernel/head64.S
index 9a8263a153cb..c9ff0404c875 100644
--- a/arch/s390/kernel/head64.S
+++ b/arch/s390/kernel/head64.S
@@ -30,7 +30,7 @@
 #include <linux/config.h>
 #include <asm/setup.h>
 #include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 #include <asm/page.h>
 
diff --git a/arch/s390/kernel/time.c b/arch/s390/kernel/time.c
index 8ca485676780..2fd75da15495 100644
--- a/arch/s390/kernel/time.c
+++ b/arch/s390/kernel/time.c
@@ -139,10 +139,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
         return 0;
diff --git a/arch/s390/lib/spinlock.c b/arch/s390/lib/spinlock.c
index 888b5596c195..2dc14e9c8327 100644
--- a/arch/s390/lib/spinlock.c
+++ b/arch/s390/lib/spinlock.c
@@ -36,7 +36,7 @@ _diag44(void)
 }
 
 void
-_raw_spin_lock_wait(spinlock_t *lp, unsigned int pc)
+_raw_spin_lock_wait(raw_spinlock_t *lp, unsigned int pc)
 {
         int count = spin_retry;
 
@@ -53,7 +53,7 @@ _raw_spin_lock_wait(spinlock_t *lp, unsigned int pc)
 EXPORT_SYMBOL(_raw_spin_lock_wait);
 
 int
-_raw_spin_trylock_retry(spinlock_t *lp, unsigned int pc)
+_raw_spin_trylock_retry(raw_spinlock_t *lp, unsigned int pc)
 {
         int count = spin_retry;
 
@@ -67,7 +67,7 @@ _raw_spin_trylock_retry(spinlock_t *lp, unsigned int pc)
 EXPORT_SYMBOL(_raw_spin_trylock_retry);
 
 void
-_raw_read_lock_wait(rwlock_t *rw)
+_raw_read_lock_wait(raw_rwlock_t *rw)
 {
         unsigned int old;
         int count = spin_retry;
@@ -86,7 +86,7 @@ _raw_read_lock_wait(rwlock_t *rw)
 EXPORT_SYMBOL(_raw_read_lock_wait);
 
 int
-_raw_read_trylock_retry(rwlock_t *rw)
+_raw_read_trylock_retry(raw_rwlock_t *rw)
 {
         unsigned int old;
         int count = spin_retry;
@@ -102,7 +102,7 @@ _raw_read_trylock_retry(rwlock_t *rw)
 EXPORT_SYMBOL(_raw_read_trylock_retry);
 
 void
-_raw_write_lock_wait(rwlock_t *rw)
+_raw_write_lock_wait(raw_rwlock_t *rw)
 {
         int count = spin_retry;
 
@@ -119,7 +119,7 @@ _raw_write_lock_wait(rwlock_t *rw)
 EXPORT_SYMBOL(_raw_write_lock_wait);
 
 int
-_raw_write_trylock_retry(rwlock_t *rw)
+_raw_write_trylock_retry(raw_rwlock_t *rw)
 {
         int count = spin_retry;
 
diff --git a/arch/s390/lib/uaccess.S b/arch/s390/lib/uaccess.S
index e8029ef42ef2..88fc94fe6488 100644
--- a/arch/s390/lib/uaccess.S
+++ b/arch/s390/lib/uaccess.S
@@ -11,7 +11,7 @@
 
 #include <linux/errno.h>
 #include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
         .align 4
diff --git a/arch/s390/lib/uaccess64.S b/arch/s390/lib/uaccess64.S
index 0ca56972f4f0..50219786fc7a 100644
--- a/arch/s390/lib/uaccess64.S
+++ b/arch/s390/lib/uaccess64.S
@@ -11,7 +11,7 @@
 
 #include <linux/errno.h>
 #include <asm/lowcore.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
         .align 4
diff --git a/arch/sh/Kconfig b/arch/sh/Kconfig
index adc8109f8b77..3e804c736e64 100644
--- a/arch/sh/Kconfig
+++ b/arch/sh/Kconfig
@@ -37,6 +37,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 menu "System type"
diff --git a/arch/sh/Makefile b/arch/sh/Makefile
index b5635635b5ee..19f00d57acf0 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -155,7 +155,7 @@ endif
 prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
 
 .PHONY: maketools FORCE
-maketools: include/asm-sh/asm-offsets.h include/linux/version.h FORCE
+maketools:  include/linux/version.h FORCE
         $(Q)$(MAKE) $(build)=arch/sh/tools include/asm-sh/machtypes.h
 
 all: zImage
@@ -168,14 +168,7 @@ compressed: zImage
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-CLEAN_FILES += include/asm-sh/machtypes.h include/asm-sh/asm-offsets.h
-
-arch/sh/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                              include/asm-sh/.cpu include/asm-sh/.mach
-
-include/asm-sh/asm-offsets.h: arch/sh/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
+CLEAN_FILES += include/asm-sh/machtypes.h
 
 define archhelp
         @echo '  zImage                    - Compressed kernel image (arch/sh/boot/zImage)'
diff --git a/arch/sh/boards/adx/irq_maskreg.c b/arch/sh/boards/adx/irq_maskreg.c
index ca91bb0f1f5c..c0973f8d57ba 100644
--- a/arch/sh/boards/adx/irq_maskreg.c
+++ b/arch/sh/boards/adx/irq_maskreg.c
@@ -37,13 +37,13 @@ static void end_maskreg_irq(unsigned int irq);
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type maskreg_irq_type = {
-        " Mask Register",
-        startup_maskreg_irq,
-        shutdown_maskreg_irq,
-        enable_maskreg_irq,
-        disable_maskreg_irq,
-        mask_and_ack_maskreg,
-        end_maskreg_irq
+        .typename = " Mask Register",
+        .startup = startup_maskreg_irq,
+        .shutdown = shutdown_maskreg_irq,
+        .enable = enable_maskreg_irq,
+        .disable = disable_maskreg_irq,
+        .ack = mask_and_ack_maskreg,
+        .end = end_maskreg_irq
 };
 
 /* actual implementatin */
diff --git a/arch/sh/boards/bigsur/io.c b/arch/sh/boards/bigsur/io.c
index 697144de7419..a9fde781b21a 100644
--- a/arch/sh/boards/bigsur/io.c
+++ b/arch/sh/boards/bigsur/io.c
@@ -37,10 +37,6 @@ static u8 bigsur_iomap_lo_shift[BIGSUR_IOMAP_LO_NMAP];
 static u32 bigsur_iomap_hi[BIGSUR_IOMAP_HI_NMAP];
 static u8 bigsur_iomap_hi_shift[BIGSUR_IOMAP_HI_NMAP];
 
-#ifndef MAX
-#define MAX(a,b)    ((a)>(b)?(a):(b))
-#endif
-
 void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
 {
         u32 port, endport = baseport + nports;
@@ -57,7 +53,7 @@ void bigsur_port_map(u32 baseport, u32 nports, u32 addr, u8 shift)
                 addr += (1<<(BIGSUR_IOMAP_LO_SHIFT));
         }
 
-        for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ;
+        for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
              port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
              port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
                 pr_debug("    maphi[0x%x] = 0x%08x\n", port, addr);
@@ -80,7 +76,7 @@ void bigsur_port_unmap(u32 baseport, u32 nports)
                 bigsur_iomap_lo[port>>BIGSUR_IOMAP_LO_SHIFT] = 0;
         }
 
-        for (port = MAX(baseport, BIGSUR_IOMAP_LO_THRESH) ;
+        for (port = max_t(u32, baseport, BIGSUR_IOMAP_LO_THRESH);
              port < endport && port < BIGSUR_IOMAP_HI_THRESH ;
              port += (1<<BIGSUR_IOMAP_HI_SHIFT)) {
                 bigsur_iomap_hi[port>>BIGSUR_IOMAP_HI_SHIFT] = 0;
diff --git a/arch/sh/boards/bigsur/irq.c b/arch/sh/boards/bigsur/irq.c
index c188fc32dc9a..6ddbcc77244d 100644
--- a/arch/sh/boards/bigsur/irq.c
+++ b/arch/sh/boards/bigsur/irq.c
@@ -228,23 +228,23 @@ static void shutdown_bigsur_irq(unsigned int irq)
 
 /* Define the IRQ structures for the L1 and L2 IRQ types */
 static struct hw_interrupt_type bigsur_l1irq_type = {
-        "BigSur-CPLD-Level1-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l1irq,
-        disable_bigsur_l1irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+        .typename  = "BigSur-CPLD-Level1-IRQ",
+        .startup = startup_bigsur_irq,
+        .shutdown = shutdown_bigsur_irq,
+        .enable = enable_bigsur_l1irq,
+        .disable = disable_bigsur_l1irq,
+        .ack = mask_and_ack_bigsur,
+        .end = end_bigsur_irq
 };
 
 static struct hw_interrupt_type bigsur_l2irq_type = {
-        "BigSur-CPLD-Level2-IRQ",
-        startup_bigsur_irq,
-        shutdown_bigsur_irq,
-        enable_bigsur_l2irq,
-        disable_bigsur_l2irq,
-        mask_and_ack_bigsur,
-        end_bigsur_irq
+        .typename  = "BigSur-CPLD-Level2-IRQ",
+        .startup = startup_bigsur_irq,
+        .shutdown  =shutdown_bigsur_irq,
+        .enable = enable_bigsur_l2irq,
+        .disable = disable_bigsur_l2irq,
+        .ack = mask_and_ack_bigsur,
+        .end = end_bigsur_irq
 };
 
 
diff --git a/arch/sh/boards/cqreek/irq.c b/arch/sh/boards/cqreek/irq.c
index fa6cfe5a20a7..d1da0d844567 100644
--- a/arch/sh/boards/cqreek/irq.c
+++ b/arch/sh/boards/cqreek/irq.c
@@ -83,13 +83,13 @@ static void shutdown_cqreek_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type cqreek_irq_type = {
-        "CqREEK-IRQ",
-        startup_cqreek_irq,
-        shutdown_cqreek_irq,
-        enable_cqreek_irq,
-        disable_cqreek_irq,
-        mask_and_ack_cqreek,
-        end_cqreek_irq
+        .typename = "CqREEK-IRQ",
+        .startup = startup_cqreek_irq,
+        .shutdown = shutdown_cqreek_irq,
+        .enable = enable_cqreek_irq,
+        .disable = disable_cqreek_irq,
+        .ack = mask_and_ack_cqreek,
+        .end = end_cqreek_irq
 };
 
 int cqreek_has_ide, cqreek_has_isa;
diff --git a/arch/sh/boards/harp/irq.c b/arch/sh/boards/harp/irq.c
index acd58489970f..52d0ba39031b 100644
--- a/arch/sh/boards/harp/irq.c
+++ b/arch/sh/boards/harp/irq.c
@@ -39,13 +39,13 @@ static unsigned int startup_harp_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type harp_irq_type = {
-        "Harp-IRQ",
-        startup_harp_irq,
-        shutdown_harp_irq,
-        enable_harp_irq,
-        disable_harp_irq,
-        mask_and_ack_harp,
-        end_harp_irq
+        .typename = "Harp-IRQ",
+        .startup = startup_harp_irq,
+        .shutdown = shutdown_harp_irq,
+        .enable = enable_harp_irq,
+        .disable = disable_harp_irq,
+        .ack = mask_and_ack_harp,
+        .end = end_harp_irq
 };
 
 static void disable_harp_irq(unsigned int irq)
diff --git a/arch/sh/boards/overdrive/irq.c b/arch/sh/boards/overdrive/irq.c
index 23adc6be71e7..715e8feb3a68 100644
--- a/arch/sh/boards/overdrive/irq.c
+++ b/arch/sh/boards/overdrive/irq.c
@@ -86,13 +86,13 @@ static unsigned int startup_od_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type od_irq_type = {
-        "Overdrive-IRQ",
-        startup_od_irq,
-        shutdown_od_irq,
-        enable_od_irq,
-        disable_od_irq,
-        mask_and_ack_od,
-        end_od_irq
+        .typename = "Overdrive-IRQ",
+        .startup = startup_od_irq,
+        .shutdown = shutdown_od_irq,
+        .enable = enable_od_irq,
+        .disable = disable_od_irq,
+        .ack = mask_and_ack_od,
+        .end = end_od_irq
 };
 
 static void disable_od_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/hs7751rvoip/irq.c b/arch/sh/boards/renesas/hs7751rvoip/irq.c
index a7921f67a35f..ed4c5b50ea45 100644
--- a/arch/sh/boards/renesas/hs7751rvoip/irq.c
+++ b/arch/sh/boards/renesas/hs7751rvoip/irq.c
@@ -74,13 +74,13 @@ static void end_hs7751rvoip_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type hs7751rvoip_irq_type = {
-        "HS7751RVoIP IRQ",
-        startup_hs7751rvoip_irq,
-        shutdown_hs7751rvoip_irq,
-        enable_hs7751rvoip_irq,
-        disable_hs7751rvoip_irq,
-        ack_hs7751rvoip_irq,
-        end_hs7751rvoip_irq,
+        .typename =  "HS7751RVoIP IRQ",
+        .startup = startup_hs7751rvoip_irq,
+        .shutdown = shutdown_hs7751rvoip_irq,
+        .enable = enable_hs7751rvoip_irq,
+        .disable = disable_hs7751rvoip_irq,
+        .ack = ack_hs7751rvoip_irq,
+        .end = end_hs7751rvoip_irq,
 };
 
 static void make_hs7751rvoip_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/rts7751r2d/irq.c b/arch/sh/boards/renesas/rts7751r2d/irq.c
index 95717f4f1e2d..d36c9374aed1 100644
--- a/arch/sh/boards/renesas/rts7751r2d/irq.c
+++ b/arch/sh/boards/renesas/rts7751r2d/irq.c
@@ -88,13 +88,13 @@ static void end_rts7751r2d_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type rts7751r2d_irq_type = {
-        "RTS7751R2D IRQ",
-        startup_rts7751r2d_irq,
-        shutdown_rts7751r2d_irq,
-        enable_rts7751r2d_irq,
-        disable_rts7751r2d_irq,
-        ack_rts7751r2d_irq,
-        end_rts7751r2d_irq,
+        .typename = "RTS7751R2D IRQ",
+        .startup = startup_rts7751r2d_irq,
+        .shutdown = shutdown_rts7751r2d_irq,
+        .enable = enable_rts7751r2d_irq,
+        .disable = disable_rts7751r2d_irq,
+        .ack = ack_rts7751r2d_irq,
+        .end = end_rts7751r2d_irq,
 };
 
 static void make_rts7751r2d_irq(unsigned int irq)
diff --git a/arch/sh/boards/renesas/systemh/irq.c b/arch/sh/boards/renesas/systemh/irq.c
index 5675a4134eee..7a2eb10edb56 100644
--- a/arch/sh/boards/renesas/systemh/irq.c
+++ b/arch/sh/boards/renesas/systemh/irq.c
@@ -35,13 +35,13 @@ static void end_systemh_irq(unsigned int irq);
 
 /* hw_interrupt_type */
 static struct hw_interrupt_type systemh_irq_type = {
-        " SystemH Register",
-        startup_systemh_irq,
-        shutdown_systemh_irq,
-        enable_systemh_irq,
-        disable_systemh_irq,
-        mask_and_ack_systemh,
-        end_systemh_irq
+        .typename = " SystemH Register",
+        .startup = startup_systemh_irq,
+        .shutdown = shutdown_systemh_irq,
+        .enable = enable_systemh_irq,
+        .disable = disable_systemh_irq,
+        .ack = mask_and_ack_systemh,
+        .end = end_systemh_irq
 };
 
 static unsigned int startup_systemh_irq(unsigned int irq)
diff --git a/arch/sh/boards/superh/microdev/irq.c b/arch/sh/boards/superh/microdev/irq.c
index 1298883eca4b..1395c1e65da4 100644
--- a/arch/sh/boards/superh/microdev/irq.c
+++ b/arch/sh/boards/superh/microdev/irq.c
@@ -83,13 +83,13 @@ static unsigned int startup_microdev_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type microdev_irq_type = {
-        "MicroDev-IRQ",
-        startup_microdev_irq,
-        shutdown_microdev_irq,
-        enable_microdev_irq,
-        disable_microdev_irq,
-        mask_and_ack_microdev,
-        end_microdev_irq
+        .typename = "MicroDev-IRQ",
+        .startup = startup_microdev_irq,
+        .shutdown = shutdown_microdev_irq,
+        .enable = enable_microdev_irq,
+        .disable = disable_microdev_irq,
+        .ack = mask_and_ack_microdev,
+        .end = end_microdev_irq
 };
 
 static void disable_microdev_irq(unsigned int irq)
diff --git a/arch/sh/cchips/hd6446x/hd64465/io.c b/arch/sh/cchips/hd6446x/hd64465/io.c
index 99ac709c550e..84cb142def0b 100644
--- a/arch/sh/cchips/hd6446x/hd64465/io.c
+++ b/arch/sh/cchips/hd6446x/hd64465/io.c
@@ -48,10 +48,6 @@ static unsigned char	hd64465_iomap_lo_shift[HD64465_IOMAP_LO_NMAP];
 static unsigned long    hd64465_iomap_hi[HD64465_IOMAP_HI_NMAP];
 static unsigned char    hd64465_iomap_hi_shift[HD64465_IOMAP_HI_NMAP];
 
-#ifndef MAX
-#define MAX(a,b)    ((a)>(b)?(a):(b))
-#endif
-
 #define PORT2ADDR(x) (sh_mv.mv_isa_port2addr(x))
 
 void hd64465_port_map(unsigned short baseport, unsigned int nports,
@@ -71,7 +67,7 @@ void hd64465_port_map(unsigned short baseport, unsigned int nports,
             addr += (1<<(HD64465_IOMAP_LO_SHIFT));
         }
 
-        for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
+        for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
              port < endport && port < HD64465_IOMAP_HI_THRESH ;
              port += (1<<HD64465_IOMAP_HI_SHIFT)) {
             DPRINTK("    maphi[0x%x] = 0x%08lx\n", port, addr);
@@ -95,7 +91,7 @@ void hd64465_port_unmap(unsigned short baseport, unsigned int nports)
             hd64465_iomap_lo[port>>HD64465_IOMAP_LO_SHIFT] = 0;
         }
 
-        for (port = MAX(baseport, HD64465_IOMAP_LO_THRESH) ;
+        for (port = max_t(unsigned int, baseport, HD64465_IOMAP_LO_THRESH);
              port < endport && port < HD64465_IOMAP_HI_THRESH ;
              port += (1<<HD64465_IOMAP_HI_SHIFT)) {
             hd64465_iomap_hi[port>>HD64465_IOMAP_HI_SHIFT] = 0;
diff --git a/arch/sh/cchips/voyagergx/irq.c b/arch/sh/cchips/voyagergx/irq.c
index 3079234cb65b..1b6ac523b458 100644
--- a/arch/sh/cchips/voyagergx/irq.c
+++ b/arch/sh/cchips/voyagergx/irq.c
@@ -87,13 +87,13 @@ static void shutdown_voyagergx_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type voyagergx_irq_type = {
-        "VOYAGERGX-IRQ",
-        startup_voyagergx_irq,
-        shutdown_voyagergx_irq,
-        enable_voyagergx_irq,
-        disable_voyagergx_irq,
-        mask_and_ack_voyagergx,
-        end_voyagergx_irq,
+        .typename = "VOYAGERGX-IRQ",
+        .startup = startup_voyagergx_irq,
+        .shutdown = shutdown_voyagergx_irq,
+        .enable = enable_voyagergx_irq,
+        .disable = disable_voyagergx_irq,
+        .ack = mask_and_ack_voyagergx,
+        .end = end_voyagergx_irq,
 };
 
 static irqreturn_t voyagergx_interrupt(int irq, void *dev_id, struct pt_regs *regs)
diff --git a/arch/sh/kernel/cpu/irq_imask.c b/arch/sh/kernel/cpu/irq_imask.c
index f76901e732fb..a963d00a971e 100644
--- a/arch/sh/kernel/cpu/irq_imask.c
+++ b/arch/sh/kernel/cpu/irq_imask.c
@@ -46,13 +46,13 @@ static unsigned int startup_imask_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type imask_irq_type = {
-        "SR.IMASK",
-        startup_imask_irq,
-        shutdown_imask_irq,
-        enable_imask_irq,
-        disable_imask_irq,
-        mask_and_ack_imask,
-        end_imask_irq
+        .typename = "SR.IMASK",
+        .startup = startup_imask_irq,
+        .shutdown = shutdown_imask_irq,
+        .enable = enable_imask_irq,
+        .disable = disable_imask_irq,
+        .ack = mask_and_ack_imask,
+        .end = end_imask_irq
 };
 
 void static inline set_interrupt_registers(int ip)
diff --git a/arch/sh/kernel/cpu/irq_ipr.c b/arch/sh/kernel/cpu/irq_ipr.c
index 7ea3d2d030e5..71f92096132b 100644
--- a/arch/sh/kernel/cpu/irq_ipr.c
+++ b/arch/sh/kernel/cpu/irq_ipr.c
@@ -48,13 +48,13 @@ static unsigned int startup_ipr_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type ipr_irq_type = {
-        "IPR-IRQ",
-        startup_ipr_irq,
-        shutdown_ipr_irq,
-        enable_ipr_irq,
-        disable_ipr_irq,
-        mask_and_ack_ipr,
-        end_ipr_irq
+        .typename = "IPR-IRQ",
+        .startup = startup_ipr_irq,
+        .shutdown = shutdown_ipr_irq,
+        .enable = enable_ipr_irq,
+        .disable = disable_ipr_irq,
+        .ack = mask_and_ack_ipr,
+        .end = end_ipr_irq
 };
 
 static void disable_ipr_irq(unsigned int irq)
@@ -142,13 +142,13 @@ static unsigned int startup_pint_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type pint_irq_type = {
-        "PINT-IRQ",
-        startup_pint_irq,
-        shutdown_pint_irq,
-        enable_pint_irq,
-        disable_pint_irq,
-        mask_and_ack_pint,
-        end_pint_irq
+        .typename = "PINT-IRQ",
+        .startup = startup_pint_irq,
+        .shutdown = shutdown_pint_irq,
+        .enable = enable_pint_irq,
+        .disable = disable_pint_irq,
+        .ack = mask_and_ack_pint,
+        .end = end_pint_irq
 };
 
 static void disable_pint_irq(unsigned int irq)
diff --git a/arch/sh/kernel/cpu/sh4/irq_intc2.c b/arch/sh/kernel/cpu/sh4/irq_intc2.c
index 099ebbf89745..f6b16ba01932 100644
--- a/arch/sh/kernel/cpu/sh4/irq_intc2.c
+++ b/arch/sh/kernel/cpu/sh4/irq_intc2.c
@@ -48,13 +48,13 @@ static unsigned int startup_intc2_irq(unsigned int irq)
 }
 
 static struct hw_interrupt_type intc2_irq_type = {
-        "INTC2-IRQ",
-        startup_intc2_irq,
-        shutdown_intc2_irq,
-        enable_intc2_irq,
-        disable_intc2_irq,
-        mask_and_ack_intc2,
-        end_intc2_irq
+        .typename = "INTC2-IRQ",
+        .startup = startup_intc2_irq,
+        .shutdown = shutdown_intc2_irq,
+        .enable = enable_intc2_irq,
+        .disable = disable_intc2_irq,
+        .ack = mask_and_ack_intc2,
+        .end = end_intc2_irq
 };
 
 static void disable_intc2_irq(unsigned int irq)
diff --git a/arch/sh/kernel/time.c b/arch/sh/kernel/time.c
index df7a9b9d4cbf..02ca69918d7c 100644
--- a/arch/sh/kernel/time.c
+++ b/arch/sh/kernel/time.c
@@ -215,10 +215,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
 
@@ -234,7 +231,7 @@ static long last_rtc_update;
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
         do_timer(regs);
 #ifndef CONFIG_SMP
@@ -252,7 +249,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *reg
          * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -285,7 +282,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * locally disabled. -arca
          */
         write_seqlock(&xtime_lock);
-        do_timer_interrupt(irq, NULL, regs);
+        do_timer_interrupt(irq, regs);
         write_sequnlock(&xtime_lock);
 
         return IRQ_HANDLED;
diff --git a/arch/sh64/Makefile b/arch/sh64/Makefile
index b4fd8e13fea9..39073734a476 100644
--- a/arch/sh64/Makefile
+++ b/arch/sh64/Makefile
@@ -73,11 +73,7 @@ compressed: zImage
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
-
-include/asm-$(ARCH)/asm-offsets.h: arch/$(ARCH)/kernel/asm-offsets.s \
-                                   include/asm include/linux/version.h
-        $(call filechk,gen-asm-offsets)
+prepare: arch/$(ARCH)/lib/syscalltab.h
 
 define filechk_gen-syscalltab
        (set -e; \
@@ -108,7 +104,7 @@ endef
 arch/$(ARCH)/lib/syscalltab.h: arch/sh64/kernel/syscalls.S
         $(call filechk,gen-syscalltab)
 
-CLEAN_FILES += include/asm-$(ARCH)/asm-offsets.h arch/$(ARCH)/lib/syscalltab.h
+CLEAN_FILES += arch/$(ARCH)/lib/syscalltab.h
 
 define archhelp
         @echo '  zImage                    - Compressed kernel image (arch/sh64/boot/zImage)'
diff --git a/arch/sh64/kernel/irq_intc.c b/arch/sh64/kernel/irq_intc.c
index 43f88f3a78b0..fc99bf4e362c 100644
--- a/arch/sh64/kernel/irq_intc.c
+++ b/arch/sh64/kernel/irq_intc.c
@@ -107,13 +107,13 @@ static void mask_and_ack_intc(unsigned int);
 static void end_intc_irq(unsigned int irq);
 
 static struct hw_interrupt_type intc_irq_type = {
-        "INTC",
-        startup_intc_irq,
-        shutdown_intc_irq,
-        enable_intc_irq,
-        disable_intc_irq,
-        mask_and_ack_intc,
-        end_intc_irq
+        .typename = "INTC",
+        .startup = startup_intc_irq,
+        .shutdown = shutdown_intc_irq,
+        .enable = enable_intc_irq,
+        .disable = disable_intc_irq,
+        .ack = mask_and_ack_intc,
+        .end = end_intc_irq
 };
 
 static int irlm;                /* IRL mode */
diff --git a/arch/sh64/kernel/time.c b/arch/sh64/kernel/time.c
index 6c84da3efc73..f4a62a10053c 100644
--- a/arch/sh64/kernel/time.c
+++ b/arch/sh64/kernel/time.c
@@ -247,10 +247,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
 
@@ -303,7 +300,7 @@ static long last_rtc_update = 0;
  * timer_interrupt() needs to keep up the real-time clock,
  * as well as call the "do_timer()" routine every clocktick
  */
-static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
+static inline void do_timer_interrupt(int irq, struct pt_regs *regs)
 {
         unsigned long long current_ctc;
         asm ("getcon cr62, %0" : "=r" (current_ctc));
@@ -328,7 +325,7 @@ static inline void do_timer_interrupt(int irq, void *dev_id, struct pt_regs *reg
          * RTC clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -361,7 +358,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
          * locally disabled. -arca
          */
         write_lock(&xtime_lock);
-        do_timer_interrupt(irq, NULL, regs);
+        do_timer_interrupt(irq, regs);
         write_unlock(&xtime_lock);
 
         return IRQ_HANDLED;
diff --git a/arch/sparc/Kconfig b/arch/sparc/Kconfig
index aca028aa29bf..aba05394d30a 100644
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -211,6 +211,10 @@ config GENERIC_CALIBRATE_DELAY
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 config SUN_PM
         bool
         default y
diff --git a/arch/sparc/Makefile b/arch/sparc/Makefile
index 7b3bbaf083a6..dea48f6cff38 100644
--- a/arch/sparc/Makefile
+++ b/arch/sparc/Makefile
@@ -59,17 +59,7 @@ image tftpboot.img: vmlinux
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/asm_offsets.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/asm_offsets.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES +=  include/asm-$(ARCH)/asm_offsets.h       \
-                arch/$(ARCH)/kernel/asm-offsets.s       \
-                arch/$(ARCH)/boot/System.map
+CLEAN_FILES += arch/$(ARCH)/boot/System.map
 
 # Don't use tabs in echo arguments.
 define archhelp
diff --git a/arch/sparc/kernel/entry.S b/arch/sparc/kernel/entry.S
index b448166f5da9..03ecb4e4614e 100644
--- a/arch/sparc/kernel/entry.S
+++ b/arch/sparc/kernel/entry.S
@@ -17,7 +17,7 @@
 #include <asm/kgdb.h>
 #include <asm/contregs.h>
 #include <asm/ptrace.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/psr.h>
 #include <asm/vaddrs.h>
 #include <asm/memreg.h>
diff --git a/arch/sparc/kernel/pcic.c b/arch/sparc/kernel/pcic.c
index 597d3ff6ad68..36a40697b8d6 100644
--- a/arch/sparc/kernel/pcic.c
+++ b/arch/sparc/kernel/pcic.c
@@ -840,10 +840,7 @@ static int pci_do_settimeofday(struct timespec *tv)
 
         xtime.tv_sec = tv->tv_sec;
         xtime.tv_nsec = tv->tv_nsec;
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         return 0;
 }
 
diff --git a/arch/sparc/kernel/sclow.S b/arch/sparc/kernel/sclow.S
index 3a867fc19927..136e37c53d49 100644
--- a/arch/sparc/kernel/sclow.S
+++ b/arch/sparc/kernel/sclow.S
@@ -7,7 +7,7 @@
  */
 
 #include <asm/ptrace.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/errno.h>
 #include <asm/winmacro.h>
 #include <asm/thread_info.h>
diff --git a/arch/sparc/kernel/sparc_ksyms.c b/arch/sparc/kernel/sparc_ksyms.c
index 5d974a2b735a..f84809333624 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -114,17 +114,7 @@ DOT_ALIAS2(unsigned, urem, unsigned, unsigned)
 /* used by various drivers */
 EXPORT_SYMBOL(sparc_cpu_model);
 EXPORT_SYMBOL(kernel_thread);
-#ifdef CONFIG_DEBUG_SPINLOCK
 #ifdef CONFIG_SMP
-EXPORT_SYMBOL(_do_spin_lock);
-EXPORT_SYMBOL(_do_spin_unlock);
-EXPORT_SYMBOL(_spin_trylock);
-EXPORT_SYMBOL(_do_read_lock);
-EXPORT_SYMBOL(_do_read_unlock);
-EXPORT_SYMBOL(_do_write_lock);
-EXPORT_SYMBOL(_do_write_unlock);
-#endif
-#else
 // XXX find what uses (or used) these.
 EXPORT_SYMBOL(___rw_read_enter);
 EXPORT_SYMBOL(___rw_read_exit);
diff --git a/arch/sparc/kernel/time.c b/arch/sparc/kernel/time.c
index 3b759aefc170..bc015e980341 100644
--- a/arch/sparc/kernel/time.c
+++ b/arch/sparc/kernel/time.c
@@ -139,7 +139,7 @@ irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs * regs)
 
 
         /* Determine when to update the Mostek clock. */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -554,10 +554,7 @@ static int sbus_do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         return 0;
 }
 
diff --git a/arch/sparc/lib/Makefile b/arch/sparc/lib/Makefile
index 2296ff9dc47a..fa5006946062 100644
--- a/arch/sparc/lib/Makefile
+++ b/arch/sparc/lib/Makefile
@@ -9,5 +9,3 @@ lib-y := mul.o rem.o sdiv.o udiv.o umul.o urem.o ashrdi3.o memcpy.o memset.o \
          strncpy_from_user.o divdi3.o udivdi3.o strlen_user.o \
          copy_user.o locks.o atomic.o atomic32.o bitops.o \
          lshrdi3.o ashldi3.o rwsem.o muldi3.o bitext.o
-
-lib-$(CONFIG_DEBUG_SPINLOCK) += debuglocks.o
diff --git a/arch/sparc/lib/atomic32.c b/arch/sparc/lib/atomic32.c
index 19724c5800a7..2e64e8c3e8e5 100644
--- a/arch/sparc/lib/atomic32.c
+++ b/arch/sparc/lib/atomic32.c
@@ -20,7 +20,7 @@ spinlock_t __atomic_hash[ATOMIC_HASH_SIZE] = {
 
 #else /* SMP */
 
-static spinlock_t dummy = SPIN_LOCK_UNLOCKED;
+static DEFINE_SPINLOCK(dummy);
 #define ATOMIC_HASH_SIZE        1
 #define ATOMIC_HASH(a)          (&dummy)
 
diff --git a/arch/sparc/lib/debuglocks.c b/arch/sparc/lib/debuglocks.c
deleted file mode 100644
index fb182352782c..000000000000
--- a/arch/sparc/lib/debuglocks.c
+++ /dev/null
@@ -1,202 +0,0 @@
-/* $Id: debuglocks.c,v 1.11 2001/09/20 00:35:31 davem Exp $
- * debuglocks.c: Debugging versions of SMP locking primitives.
- *
- * Copyright (C) 1997 David S. Miller (davem@caip.rutgers.edu)
- * Copyright (C) 1998-99 Anton Blanchard (anton@progsoc.uts.edu.au)
- */
-
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/threads.h>      /* For NR_CPUS */
-#include <linux/spinlock.h>
-#include <asm/psr.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_SMP
-
-/* Some notes on how these debugging routines work.  When a lock is acquired
- * an extra debugging member lock->owner_pc is set to the caller of the lock
- * acquisition routine.  Right before releasing a lock, the debugging program
- * counter is cleared to zero.
- *
- * Furthermore, since PC's are 4 byte aligned on Sparc, we stuff the CPU
- * number of the owner in the lowest two bits.
- */
-
-#define STORE_CALLER(A) __asm__ __volatile__("mov %%i7, %0" : "=r" (A));
-
-static inline void show(char *str, spinlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n",str,
-                lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3);
-}
-
-static inline void show_read(char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)\n", str,
-                lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3);
-}
-
-static inline void show_write(char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-        int i;
-
-        printk("%s(%p) CPU#%d stuck at %08lx, owner PC(%08lx):CPU(%lx)", str,
-                lock, cpu, caller, lock->owner_pc & ~3, lock->owner_pc & 3);
-
-        for(i = 0; i < NR_CPUS; i++)
-                printk(" reader[%d]=%08lx", i, lock->reader_pc[i]);
-
-        printk("\n");
-}
-
-#undef INIT_STUCK
-#define INIT_STUCK 100000000
-
-void _do_spin_lock(spinlock_t *lock, char *str)
-{
-        unsigned long caller;
-        unsigned long val;
-        int cpu = smp_processor_id();
-        int stuck = INIT_STUCK;
-
-        STORE_CALLER(caller);
-
-again:
-        __asm__ __volatile__("ldstub [%1], %0" : "=r" (val) : "r" (&(lock->lock)));
-        if(val) {
-                while(lock->lock) {
-                        if (!--stuck) {
-                                show(str, lock, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        barrier();
-                }
-                goto again;
-        }
-        lock->owner_pc = (cpu & 3) | (caller & ~3);
-}
-
-int _spin_trylock(spinlock_t *lock)
-{
-        unsigned long val;
-        unsigned long caller;
-        int cpu = smp_processor_id();
-
-        STORE_CALLER(caller);
-
-        __asm__ __volatile__("ldstub [%1], %0" : "=r" (val) : "r" (&(lock->lock)));
-        if(!val) {
-                /* We got it, record our identity for debugging. */
-                lock->owner_pc = (cpu & 3) | (caller & ~3);
-        }
-        return val == 0;
-}
-
-void _do_spin_unlock(spinlock_t *lock)
-{
-        lock->owner_pc = 0;
-        barrier();
-        lock->lock = 0;
-}
-
-void _do_read_lock(rwlock_t *rw, char *str)
-{
-        unsigned long caller;
-        unsigned long val;
-        int cpu = smp_processor_id();
-        int stuck = INIT_STUCK;
-
-        STORE_CALLER(caller);
-
-wlock_again:
-        __asm__ __volatile__("ldstub [%1 + 3], %0" : "=r" (val) : "r" (&(rw->lock)));
-        if(val) {
-                while(rw->lock & 0xff) {
-                        if (!--stuck) {
-                                show_read(str, rw, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        barrier();
-                }
-                goto wlock_again;
-        }
-
-        rw->reader_pc[cpu] = caller;
-        barrier();
-        rw->lock++;
-}
-
-void _do_read_unlock(rwlock_t *rw, char *str)
-{
-        unsigned long caller;
-        unsigned long val;
-        int cpu = smp_processor_id();
-        int stuck = INIT_STUCK;
-
-        STORE_CALLER(caller);
-
-wlock_again:
-        __asm__ __volatile__("ldstub [%1 + 3], %0" : "=r" (val) : "r" (&(rw->lock)));
-        if(val) {
-                while(rw->lock & 0xff) {
-                        if (!--stuck) {
-                                show_read(str, rw, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        barrier();
-                }
-                goto wlock_again;
-        }
-
-        rw->reader_pc[cpu] = 0;
-        barrier();
-        rw->lock -= 0x1ff;
-}
-
-void _do_write_lock(rwlock_t *rw, char *str)
-{
-        unsigned long caller;
-        unsigned long val;
-        int cpu = smp_processor_id();
-        int stuck = INIT_STUCK;
-
-        STORE_CALLER(caller);
-
-wlock_again:
-        __asm__ __volatile__("ldstub [%1 + 3], %0" : "=r" (val) : "r" (&(rw->lock)));
-        if(val) {
-wlock_wait:
-                while(rw->lock) {
-                        if (!--stuck) {
-                                show_write(str, rw, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        barrier();
-                }
-                goto wlock_again;
-        }
-
-        if (rw->lock & ~0xff) {
-                *(((unsigned char *)&rw->lock)+3) = 0;
-                barrier();
-                goto wlock_wait;
-        }
-
-        barrier();
-        rw->owner_pc = (cpu & 3) | (caller & ~3);
-}
-
-void _do_write_unlock(rwlock_t *rw)
-{
-        rw->owner_pc = 0;
-        barrier();
-        rw->lock = 0;
-}
-
-#endif /* SMP */
diff --git a/arch/sparc/mm/hypersparc.S b/arch/sparc/mm/hypersparc.S
index 54b8e764b042..a231cca37216 100644
--- a/arch/sparc/mm/hypersparc.S
+++ b/arch/sparc/mm/hypersparc.S
@@ -6,7 +6,7 @@
 
 #include <asm/ptrace.h>
 #include <asm/psr.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/asi.h>
 #include <asm/page.h>
 #include <asm/pgtsrmmu.h>
diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S
index 2dcaa5ac1a38..cd90f3fdc4e7 100644
--- a/arch/sparc/mm/swift.S
+++ b/arch/sparc/mm/swift.S
@@ -9,7 +9,7 @@
 #include <asm/asi.h>
 #include <asm/page.h>
 #include <asm/pgtsrmmu.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 
         .text
         .align  4
diff --git a/arch/sparc/mm/tsunami.S b/arch/sparc/mm/tsunami.S
index 8acd1787fde2..697af617594a 100644
--- a/arch/sparc/mm/tsunami.S
+++ b/arch/sparc/mm/tsunami.S
@@ -6,7 +6,7 @@
 
 #include <linux/config.h>
 #include <asm/ptrace.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/psr.h>
 #include <asm/asi.h>
 #include <asm/page.h>
diff --git a/arch/sparc/mm/viking.S b/arch/sparc/mm/viking.S
index f58712d26bf5..3cbd6de18dde 100644
--- a/arch/sparc/mm/viking.S
+++ b/arch/sparc/mm/viking.S
@@ -9,7 +9,7 @@
 #include <linux/config.h>
 #include <asm/ptrace.h>
 #include <asm/psr.h>
-#include <asm/asm_offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/asi.h>
 #include <asm/mxcc.h>
 #include <asm/page.h>
diff --git a/arch/sparc64/Kconfig b/arch/sparc64/Kconfig
index 73ec6aec5ed5..1e9d8638a28a 100644
--- a/arch/sparc64/Kconfig
+++ b/arch/sparc64/Kconfig
@@ -26,6 +26,10 @@ config TIME_INTERPOLATION
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 choice
         prompt "Kernel page size"
         default SPARC64_PAGE_SIZE_8KB
diff --git a/arch/sparc64/kernel/asm-offsets.c b/arch/sparc64/kernel/asm-offsets.c
new file mode 100644
index 000000000000..9e263112a6e2
--- /dev/null
+++ b/arch/sparc64/kernel/asm-offsets.c
@@ -0,0 +1 @@
+/* Dummy asm-offsets.c file. Required by kbuild and ready to be used - hint! */
diff --git a/arch/sparc64/kernel/kprobes.c b/arch/sparc64/kernel/kprobes.c
index bbf11f85dab1..0d66d07c8c6e 100644
--- a/arch/sparc64/kernel/kprobes.c
+++ b/arch/sparc64/kernel/kprobes.c
@@ -8,6 +8,7 @@
 #include <linux/kprobes.h>
 #include <asm/kdebug.h>
 #include <asm/signal.h>
+#include <asm/cacheflush.h>
 
 /* We do not have hardware single-stepping on sparc64.
  * So we implement software single-stepping with breakpoint
@@ -37,31 +38,31 @@
  * - Mark that we are no longer actively in a kprobe.
  */
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         return 0;
 }
 
-void arch_copy_kprobe(struct kprobe *p)
+void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
         p->ainsn.insn[0] = *p->addr;
         p->ainsn.insn[1] = BREAKPOINT_INSTRUCTION_2;
         p->opcode = *p->addr;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         *p->addr = BREAKPOINT_INSTRUCTION;
         flushi(p->addr);
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         *p->addr = p->opcode;
         flushi(p->addr);
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
 }
 
@@ -111,7 +112,7 @@ static inline void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
         }
 }
 
-static int kprobe_handler(struct pt_regs *regs)
+static int __kprobes kprobe_handler(struct pt_regs *regs)
 {
         struct kprobe *p;
         void *addr = (void *) regs->tpc;
@@ -191,8 +192,9 @@ no_kprobe:
  * The original INSN location was REAL_PC, it actually
  * executed at PC and produced destination address NPC.
  */
-static unsigned long relbranch_fixup(u32 insn, unsigned long real_pc,
-                                     unsigned long pc, unsigned long npc)
+static unsigned long __kprobes relbranch_fixup(u32 insn, unsigned long real_pc,
+                                               unsigned long pc,
+                                               unsigned long npc)
 {
         /* Branch not taken, no mods necessary.  */
         if (npc == pc + 0x4UL)
@@ -217,7 +219,8 @@ static unsigned long relbranch_fixup(u32 insn, unsigned long real_pc,
 /* If INSN is an instruction which writes it's PC location
  * into a destination register, fix that up.
  */
-static void retpc_fixup(struct pt_regs *regs, u32 insn, unsigned long real_pc)
+static void __kprobes retpc_fixup(struct pt_regs *regs, u32 insn,
+                                  unsigned long real_pc)
 {
         unsigned long *slot = NULL;
 
@@ -257,7 +260,7 @@ static void retpc_fixup(struct pt_regs *regs, u32 insn, unsigned long real_pc)
  * This function prepares to return from the post-single-step
  * breakpoint trap.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         u32 insn = p->ainsn.insn[0];
 
@@ -315,8 +318,8 @@ static inline int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 /*
  * Wrapper routine to for handling exceptions.
  */
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         switch (val) {
@@ -344,7 +347,8 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         return NOTIFY_DONE;
 }
 
-asmlinkage void kprobe_trap(unsigned long trap_level, struct pt_regs *regs)
+asmlinkage void __kprobes kprobe_trap(unsigned long trap_level,
+                                      struct pt_regs *regs)
 {
         BUG_ON(trap_level != 0x170 && trap_level != 0x171);
 
@@ -368,7 +372,7 @@ static struct pt_regs jprobe_saved_regs;
 static struct pt_regs *jprobe_saved_regs_location;
 static struct sparc_stackf jprobe_saved_stack;
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
 
@@ -390,7 +394,7 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void jprobe_return(void)
+void __kprobes jprobe_return(void)
 {
         preempt_enable_no_resched();
         __asm__ __volatile__(
@@ -403,7 +407,7 @@ extern void jprobe_return_trap_instruction(void);
 
 extern void __show_regs(struct pt_regs * regs);
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         u32 *addr = (u32 *) regs->tpc;
 
diff --git a/arch/sparc64/kernel/pci.c b/arch/sparc64/kernel/pci.c
index ec8bf4012c0c..2ff7c32ab0ce 100644
--- a/arch/sparc64/kernel/pci.c
+++ b/arch/sparc64/kernel/pci.c
@@ -359,134 +359,17 @@ void pcibios_fixup_bus(struct pci_bus *pbus)
         pbus->resource[1] = &pbm->mem_space;
 }
 
-int pci_claim_resource(struct pci_dev *pdev, int resource)
+struct resource *pcibios_select_root(struct pci_dev *pdev, struct resource *r)
 {
         struct pci_pbm_info *pbm = pdev->bus->sysdata;
-        struct resource *res = &pdev->resource[resource];
-        struct resource *root;
-
-        if (!pbm)
-                return -EINVAL;
+        struct resource *root = NULL;
 
-        if (res->flags & IORESOURCE_IO)
+        if (r->flags & IORESOURCE_IO)
                 root = &pbm->io_space;
-        else
+        if (r->flags & IORESOURCE_MEM)
                 root = &pbm->mem_space;
 
-        pbm->parent->resource_adjust(pdev, res, root);
-
-        return request_resource(root, res);
-}
-
-/*
- * Given the PCI bus a device resides on, try to
- * find an acceptable resource allocation for a
- * specific device resource..
- */
-static int pci_assign_bus_resource(const struct pci_bus *bus,
-        struct pci_dev *dev,
-        struct resource *res,
-        unsigned long size,
-        unsigned long min,
-        int resno)
-{
-        unsigned int type_mask;
-        int i;
-
-        type_mask = IORESOURCE_IO | IORESOURCE_MEM;
-        for (i = 0 ; i < 4; i++) {
-                struct resource *r = bus->resource[i];
-                if (!r)
-                        continue;
-
-                /* type_mask must match */
-                if ((res->flags ^ r->flags) & type_mask)
-                        continue;
-
-                /* Ok, try it out.. */
-                if (allocate_resource(r, res, size, min, -1, size, NULL, NULL) < 0)
-                        continue;
-
-                /* PCI config space updated by caller.  */
-                return 0;
-        }
-        return -EBUSY;
-}
-
-int pci_assign_resource(struct pci_dev *pdev, int resource)
-{
-        struct pcidev_cookie *pcp = pdev->sysdata;
-        struct pci_pbm_info *pbm = pcp->pbm;
-        struct resource *res = &pdev->resource[resource];
-        unsigned long min, size;
-        int err;
-
-        if (res->flags & IORESOURCE_IO)
-                min = pbm->io_space.start + 0x400UL;
-        else
-                min = pbm->mem_space.start;
-
-        size = res->end - res->start + 1;
-
-        err = pci_assign_bus_resource(pdev->bus, pdev, res, size, min, resource);
-
-        if (err < 0) {
-                printk("PCI: Failed to allocate resource %d for %s\n",
-                       resource, pci_name(pdev));
-        } else {
-                /* Update PCI config space. */
-                pbm->parent->base_address_update(pdev, resource);
-        }
-
-        return err;
-}
-
-/* Sort resources by alignment */
-void pdev_sort_resources(struct pci_dev *dev, struct resource_list *head)
-{
-        int i;
-
-        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                struct resource *r;
-                struct resource_list *list, *tmp;
-                unsigned long r_align;
-
-                r = &dev->resource[i];
-                r_align = r->end - r->start;
-                
-                if (!(r->flags) || r->parent)
-                        continue;
-                if (!r_align) {
-                        printk(KERN_WARNING "PCI: Ignore bogus resource %d "
-                                            "[%lx:%lx] of %s\n",
-                                            i, r->start, r->end, pci_name(dev));
-                        continue;
-                }
-                r_align = (i < PCI_BRIDGE_RESOURCES) ? r_align + 1 : r->start;
-                for (list = head; ; list = list->next) {
-                        unsigned long align = 0;
-                        struct resource_list *ln = list->next;
-                        int idx;
-
-                        if (ln) {
-                                idx = ln->res - &ln->dev->resource[0];
-                                align = (idx < PCI_BRIDGE_RESOURCES) ?
-                                        ln->res->end - ln->res->start + 1 :
-                                        ln->res->start;
-                        }
-                        if (r_align > align) {
-                                tmp = kmalloc(sizeof(*tmp), GFP_KERNEL);
-                                if (!tmp)
-                                        panic("pdev_sort_resources(): "
-                                              "kmalloc() failed!\n");
-                                tmp->next = ln;
-                                tmp->res = r;
-                                tmp->dev = dev;
-                                list->next = tmp;
-                                break;
-                        }
-                }
-        }
+        return root;
 }
 
 void pcibios_update_irq(struct pci_dev *pdev, int irq)
diff --git a/arch/sparc64/kernel/pci_psycho.c b/arch/sparc64/kernel/pci_psycho.c
index 91ab466d6c66..6ed1ef25e0ac 100644
--- a/arch/sparc64/kernel/pci_psycho.c
+++ b/arch/sparc64/kernel/pci_psycho.c
@@ -307,7 +307,7 @@ static unsigned char psycho_pil_table[] = {
 /*0x32*/15,             /* Power Management             */
 };
 
-static int __init psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
+static int psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
 {
         int ret;
 
@@ -344,9 +344,9 @@ static int __init psycho_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
         return ret;
 }
 
-static unsigned int __init psycho_irq_build(struct pci_pbm_info *pbm,
-                                            struct pci_dev *pdev,
-                                            unsigned int ino)
+static unsigned int psycho_irq_build(struct pci_pbm_info *pbm,
+                                     struct pci_dev *pdev,
+                                     unsigned int ino)
 {
         struct ino_bucket *bucket;
         unsigned long imap, iclr;
@@ -1024,7 +1024,7 @@ static irqreturn_t psycho_pcierr_intr(int irq, void *dev_id, struct pt_regs *reg
 #define PSYCHO_CE_INO           0x2f
 #define PSYCHO_PCIERR_A_INO     0x30
 #define PSYCHO_PCIERR_B_INO     0x31
-static void __init psycho_register_error_handlers(struct pci_controller_info *p)
+static void psycho_register_error_handlers(struct pci_controller_info *p)
 {
         struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */
         unsigned long base = p->pbm_A.controller_regs;
@@ -1091,15 +1091,15 @@ static void __init psycho_register_error_handlers(struct pci_controller_info *p)
 }
 
 /* PSYCHO boot time probing and initialization. */
-static void __init psycho_resource_adjust(struct pci_dev *pdev,
-                                          struct resource *res,
-                                          struct resource *root)
+static void psycho_resource_adjust(struct pci_dev *pdev,
+                                   struct resource *res,
+                                   struct resource *root)
 {
         res->start += root->start;
         res->end += root->start;
 }
 
-static void __init psycho_base_address_update(struct pci_dev *pdev, int resource)
+static void psycho_base_address_update(struct pci_dev *pdev, int resource)
 {
         struct pcidev_cookie *pcp = pdev->sysdata;
         struct pci_pbm_info *pbm = pcp->pbm;
@@ -1144,7 +1144,7 @@ static void __init psycho_base_address_update(struct pci_dev *pdev, int resource
                 pci_write_config_dword(pdev, where + 4, 0);
 }
 
-static void __init pbm_config_busmastering(struct pci_pbm_info *pbm)
+static void pbm_config_busmastering(struct pci_pbm_info *pbm)
 {
         u8 *addr;
 
@@ -1161,8 +1161,8 @@ static void __init pbm_config_busmastering(struct pci_pbm_info *pbm)
         pci_config_write8(addr, 64);
 }
 
-static void __init pbm_scan_bus(struct pci_controller_info *p,
-                                struct pci_pbm_info *pbm)
+static void pbm_scan_bus(struct pci_controller_info *p,
+                         struct pci_pbm_info *pbm)
 {
         struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
 
@@ -1189,7 +1189,7 @@ static void __init pbm_scan_bus(struct pci_controller_info *p,
         pci_setup_busmastering(pbm, pbm->pci_bus);
 }
 
-static void __init psycho_scan_bus(struct pci_controller_info *p)
+static void psycho_scan_bus(struct pci_controller_info *p)
 {
         pbm_config_busmastering(&p->pbm_B);
         p->pbm_B.is_66mhz_capable = 0;
@@ -1204,7 +1204,7 @@ static void __init psycho_scan_bus(struct pci_controller_info *p)
         psycho_register_error_handlers(p);
 }
 
-static void __init psycho_iommu_init(struct pci_controller_info *p)
+static void psycho_iommu_init(struct pci_controller_info *p)
 {
         struct pci_iommu *iommu = p->pbm_A.iommu;
         unsigned long tsbbase, i;
@@ -1327,8 +1327,8 @@ static void psycho_controller_hwinit(struct pci_controller_info *p)
         psycho_write(p->pbm_A.controller_regs + PSYCHO_PCIB_DIAG, tmp);
 }
 
-static void __init pbm_register_toplevel_resources(struct pci_controller_info *p,
-                                                   struct pci_pbm_info *pbm)
+static void pbm_register_toplevel_resources(struct pci_controller_info *p,
+                                            struct pci_pbm_info *pbm)
 {
         char *name = pbm->name;
 
@@ -1481,7 +1481,7 @@ static void psycho_pbm_init(struct pci_controller_info *p,
 
 #define PSYCHO_CONFIGSPACE      0x001000000UL
 
-void __init psycho_init(int node, char *model_name)
+void psycho_init(int node, char *model_name)
 {
         struct linux_prom64_registers pr_regs[3];
         struct pci_controller_info *p;
diff --git a/arch/sparc64/kernel/pci_sabre.c b/arch/sparc64/kernel/pci_sabre.c
index 52bf3431a422..0ee6bd5b9ac6 100644
--- a/arch/sparc64/kernel/pci_sabre.c
+++ b/arch/sparc64/kernel/pci_sabre.c
@@ -554,7 +554,7 @@ static unsigned char sabre_pil_table[] = {
 /*0x32*/15,             /* Power Management             */
 };
 
-static int __init sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
+static int sabre_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
 {
         int ret;
 
@@ -612,9 +612,9 @@ static void sabre_wsync_handler(struct ino_bucket *bucket, void *_arg1, void *_a
         sabre_read(sync_reg);
 }
 
-static unsigned int __init sabre_irq_build(struct pci_pbm_info *pbm,
-                                           struct pci_dev *pdev,
-                                           unsigned int ino)
+static unsigned int sabre_irq_build(struct pci_pbm_info *pbm,
+                                    struct pci_dev *pdev,
+                                    unsigned int ino)
 {
         struct ino_bucket *bucket;
         unsigned long imap, iclr;
@@ -1009,7 +1009,7 @@ static irqreturn_t sabre_pcierr_intr(int irq, void *dev_id, struct pt_regs *regs
 #define SABRE_UE_INO            0x2e
 #define SABRE_CE_INO            0x2f
 #define SABRE_PCIERR_INO        0x30
-static void __init sabre_register_error_handlers(struct pci_controller_info *p)
+static void sabre_register_error_handlers(struct pci_controller_info *p)
 {
         struct pci_pbm_info *pbm = &p->pbm_A; /* arbitrary */
         unsigned long base = pbm->controller_regs;
@@ -1056,9 +1056,9 @@ static void __init sabre_register_error_handlers(struct pci_controller_info *p)
         sabre_write(base + SABRE_PCICTRL, tmp);
 }
 
-static void __init sabre_resource_adjust(struct pci_dev *pdev,
-                                         struct resource *res,
-                                         struct resource *root)
+static void sabre_resource_adjust(struct pci_dev *pdev,
+                                  struct resource *res,
+                                  struct resource *root)
 {
         struct pci_pbm_info *pbm = pdev->bus->sysdata;
         unsigned long base;
@@ -1072,7 +1072,7 @@ static void __init sabre_resource_adjust(struct pci_dev *pdev,
         res->end += base;
 }
 
-static void __init sabre_base_address_update(struct pci_dev *pdev, int resource)
+static void sabre_base_address_update(struct pci_dev *pdev, int resource)
 {
         struct pcidev_cookie *pcp = pdev->sysdata;
         struct pci_pbm_info *pbm = pcp->pbm;
@@ -1118,7 +1118,7 @@ static void __init sabre_base_address_update(struct pci_dev *pdev, int resource)
                 pci_write_config_dword(pdev, where + 4, 0);
 }
 
-static void __init apb_init(struct pci_controller_info *p, struct pci_bus *sabre_bus)
+static void apb_init(struct pci_controller_info *p, struct pci_bus *sabre_bus)
 {
         struct pci_dev *pdev;
 
@@ -1181,7 +1181,7 @@ static struct pcidev_cookie *alloc_bridge_cookie(struct pci_pbm_info *pbm)
         return cookie;
 }
 
-static void __init sabre_scan_bus(struct pci_controller_info *p)
+static void sabre_scan_bus(struct pci_controller_info *p)
 {
         static int once;
         struct pci_bus *sabre_bus, *pbus;
@@ -1262,9 +1262,9 @@ static void __init sabre_scan_bus(struct pci_controller_info *p)
         sabre_register_error_handlers(p);
 }
 
-static void __init sabre_iommu_init(struct pci_controller_info *p,
-                                    int tsbsize, unsigned long dvma_offset,
-                                    u32 dma_mask)
+static void sabre_iommu_init(struct pci_controller_info *p,
+                             int tsbsize, unsigned long dvma_offset,
+                             u32 dma_mask)
 {
         struct pci_iommu *iommu = p->pbm_A.iommu;
         unsigned long tsbbase, i, order;
@@ -1345,8 +1345,8 @@ static void __init sabre_iommu_init(struct pci_controller_info *p,
         }
 }
 
-static void __init pbm_register_toplevel_resources(struct pci_controller_info *p,
-                                                   struct pci_pbm_info *pbm)
+static void pbm_register_toplevel_resources(struct pci_controller_info *p,
+                                            struct pci_pbm_info *pbm)
 {
         char *name = pbm->name;
         unsigned long ibase = p->pbm_A.controller_regs + SABRE_IOSPACE;
@@ -1415,7 +1415,7 @@ static void __init pbm_register_toplevel_resources(struct pci_controller_info *p
                                             &pbm->mem_space);
 }
 
-static void __init sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dma_begin)
+static void sabre_pbm_init(struct pci_controller_info *p, int sabre_node, u32 dma_begin)
 {
         struct pci_pbm_info *pbm;
         char namebuf[128];
@@ -1552,7 +1552,7 @@ static void __init sabre_pbm_init(struct pci_controller_info *p, int sabre_node,
         }
 }
 
-void __init sabre_init(int pnode, char *model_name)
+void sabre_init(int pnode, char *model_name)
 {
         struct linux_prom64_registers pr_regs[2];
         struct pci_controller_info *p;
diff --git a/arch/sparc64/kernel/pci_schizo.c b/arch/sparc64/kernel/pci_schizo.c
index 6a182bb66281..331382e1a75d 100644
--- a/arch/sparc64/kernel/pci_schizo.c
+++ b/arch/sparc64/kernel/pci_schizo.c
@@ -285,7 +285,7 @@ static unsigned char schizo_pil_table[] = {
 /*0x3f*/0,              /* Reserved for NewLink         */
 };
 
-static int __init schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
+static int schizo_ino_to_pil(struct pci_dev *pdev, unsigned int ino)
 {
         int ret;
 
@@ -1221,7 +1221,7 @@ static irqreturn_t schizo_safarierr_intr(int irq, void *dev_id, struct pt_regs *
  * PCI bus units of the same Tomatillo.  I still have not really
  * figured this out...
  */
-static void __init tomatillo_register_error_handlers(struct pci_controller_info *p)
+static void tomatillo_register_error_handlers(struct pci_controller_info *p)
 {
         struct pci_pbm_info *pbm;
         unsigned int irq;
@@ -1359,7 +1359,7 @@ static void __init tomatillo_register_error_handlers(struct pci_controller_info
                      (SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP)));
 }
 
-static void __init schizo_register_error_handlers(struct pci_controller_info *p)
+static void schizo_register_error_handlers(struct pci_controller_info *p)
 {
         struct pci_pbm_info *pbm;
         unsigned int irq;
@@ -1505,7 +1505,7 @@ static void __init schizo_register_error_handlers(struct pci_controller_info *p)
                      (SCHIZO_SAFIRQCTRL_EN | (BUS_ERROR_UNMAP)));
 }
 
-static void __init pbm_config_busmastering(struct pci_pbm_info *pbm)
+static void pbm_config_busmastering(struct pci_pbm_info *pbm)
 {
         u8 *addr;
 
@@ -1522,8 +1522,8 @@ static void __init pbm_config_busmastering(struct pci_pbm_info *pbm)
         pci_config_write8(addr, 64);
 }
 
-static void __init pbm_scan_bus(struct pci_controller_info *p,
-                                struct pci_pbm_info *pbm)
+static void pbm_scan_bus(struct pci_controller_info *p,
+                         struct pci_pbm_info *pbm)
 {
         struct pcidev_cookie *cookie = kmalloc(sizeof(*cookie), GFP_KERNEL);
 
@@ -1550,8 +1550,8 @@ static void __init pbm_scan_bus(struct pci_controller_info *p,
         pci_setup_busmastering(pbm, pbm->pci_bus);
 }
 
-static void __init __schizo_scan_bus(struct pci_controller_info *p,
-                                     int chip_type)
+static void __schizo_scan_bus(struct pci_controller_info *p,
+                              int chip_type)
 {
         if (!p->pbm_B.prom_node || !p->pbm_A.prom_node) {
                 printk("PCI: Only one PCI bus module of controller found.\n");
@@ -1577,17 +1577,17 @@ static void __init __schizo_scan_bus(struct pci_controller_info *p,
                 schizo_register_error_handlers(p);
 }
 
-static void __init schizo_scan_bus(struct pci_controller_info *p)
+static void schizo_scan_bus(struct pci_controller_info *p)
 {
         __schizo_scan_bus(p, PBM_CHIP_TYPE_SCHIZO);
 }
 
-static void __init tomatillo_scan_bus(struct pci_controller_info *p)
+static void tomatillo_scan_bus(struct pci_controller_info *p)
 {
         __schizo_scan_bus(p, PBM_CHIP_TYPE_TOMATILLO);
 }
 
-static void __init schizo_base_address_update(struct pci_dev *pdev, int resource)
+static void schizo_base_address_update(struct pci_dev *pdev, int resource)
 {
         struct pcidev_cookie *pcp = pdev->sysdata;
         struct pci_pbm_info *pbm = pcp->pbm;
@@ -1632,9 +1632,9 @@ static void __init schizo_base_address_update(struct pci_dev *pdev, int resource
                 pci_write_config_dword(pdev, where + 4, 0);
 }
 
-static void __init schizo_resource_adjust(struct pci_dev *pdev,
-                                          struct resource *res,
-                                          struct resource *root)
+static void schizo_resource_adjust(struct pci_dev *pdev,
+                                   struct resource *res,
+                                   struct resource *root)
 {
         res->start += root->start;
         res->end += root->start;
@@ -1702,8 +1702,8 @@ static void schizo_determine_mem_io_space(struct pci_pbm_info *pbm)
                pbm->mem_space.start);
 }
 
-static void __init pbm_register_toplevel_resources(struct pci_controller_info *p,
-                                                   struct pci_pbm_info *pbm)
+static void pbm_register_toplevel_resources(struct pci_controller_info *p,
+                                            struct pci_pbm_info *pbm)
 {
         pbm->io_space.name = pbm->mem_space.name = pbm->name;
 
@@ -1932,7 +1932,7 @@ static void schizo_pbm_iommu_init(struct pci_pbm_info *pbm)
 #define TOMATILLO_PCI_IOC_TDIAG         (0x2250UL)
 #define TOMATILLO_PCI_IOC_DDIAG         (0x2290UL)
 
-static void __init schizo_pbm_hw_init(struct pci_pbm_info *pbm)
+static void schizo_pbm_hw_init(struct pci_pbm_info *pbm)
 {
         u64 tmp;
 
@@ -1986,9 +1986,9 @@ static void __init schizo_pbm_hw_init(struct pci_pbm_info *pbm)
         }
 }
 
-static void __init schizo_pbm_init(struct pci_controller_info *p,
-                                   int prom_node, u32 portid,
-                                   int chip_type)
+static void schizo_pbm_init(struct pci_controller_info *p,
+                            int prom_node, u32 portid,
+                            int chip_type)
 {
         struct linux_prom64_registers pr_regs[4];
         unsigned int busrange[2];
@@ -2145,7 +2145,7 @@ static inline int portid_compare(u32 x, u32 y, int chip_type)
         return (x == y);
 }
 
-static void __init __schizo_init(int node, char *model_name, int chip_type)
+static void __schizo_init(int node, char *model_name, int chip_type)
 {
         struct pci_controller_info *p;
         struct pci_iommu *iommu;
@@ -2213,17 +2213,17 @@ static void __init __schizo_init(int node, char *model_name, int chip_type)
         schizo_pbm_init(p, node, portid, chip_type);
 }
 
-void __init schizo_init(int node, char *model_name)
+void schizo_init(int node, char *model_name)
 {
         __schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO);
 }
 
-void __init schizo_plus_init(int node, char *model_name)
+void schizo_plus_init(int node, char *model_name)
 {
         __schizo_init(node, model_name, PBM_CHIP_TYPE_SCHIZO_PLUS);
 }
 
-void __init tomatillo_init(int node, char *model_name)
+void tomatillo_init(int node, char *model_name)
 {
         __schizo_init(node, model_name, PBM_CHIP_TYPE_TOMATILLO);
 }
diff --git a/arch/sparc64/kernel/process.c b/arch/sparc64/kernel/process.c
index 66255434128a..7d10b0397091 100644
--- a/arch/sparc64/kernel/process.c
+++ b/arch/sparc64/kernel/process.c
@@ -607,11 +607,6 @@ int copy_thread(int nr, unsigned long clone_flags, unsigned long sp,
         struct thread_info *t = p->thread_info;
         char *child_trap_frame;
 
-#ifdef CONFIG_DEBUG_SPINLOCK
-        p->thread.smp_lock_count = 0;
-        p->thread.smp_lock_pc = 0;
-#endif
-
         /* Calculate offset to stack_frame & pt_regs */
         child_trap_frame = ((char *)t) + (THREAD_SIZE - (TRACEREG_SZ+STACKFRAME_SZ));
         memcpy(child_trap_frame, (((struct sparc_stackf *)regs)-1), (TRACEREG_SZ+STACKFRAME_SZ));
diff --git a/arch/sparc64/kernel/sparc64_ksyms.c b/arch/sparc64/kernel/sparc64_ksyms.c
index d89fc24808d3..cbb5e59824e5 100644
--- a/arch/sparc64/kernel/sparc64_ksyms.c
+++ b/arch/sparc64/kernel/sparc64_ksyms.c
@@ -115,17 +115,12 @@ EXPORT_PER_CPU_SYMBOL(__cpu_data);
 
 /* used by various drivers */
 #ifdef CONFIG_SMP
-#ifndef CONFIG_DEBUG_SPINLOCK
 /* Out of line rw-locking implementation. */
 EXPORT_SYMBOL(__read_lock);
 EXPORT_SYMBOL(__read_unlock);
 EXPORT_SYMBOL(__write_lock);
 EXPORT_SYMBOL(__write_unlock);
 EXPORT_SYMBOL(__write_trylock);
-/* Out of line spin-locking implementation. */
-EXPORT_SYMBOL(_raw_spin_lock);
-EXPORT_SYMBOL(_raw_spin_lock_flags);
-#endif
 
 /* Hard IRQ locking */
 EXPORT_SYMBOL(synchronize_irq);
@@ -403,12 +398,3 @@ EXPORT_SYMBOL(xor_vis_4);
 EXPORT_SYMBOL(xor_vis_5);
 
 EXPORT_SYMBOL(prom_palette);
-
-/* memory barriers */
-EXPORT_SYMBOL(mb);
-EXPORT_SYMBOL(rmb);
-EXPORT_SYMBOL(wmb);
-EXPORT_SYMBOL(membar_storeload);
-EXPORT_SYMBOL(membar_storeload_storestore);
-EXPORT_SYMBOL(membar_storeload_loadload);
-EXPORT_SYMBOL(membar_storestore_loadstore);
diff --git a/arch/sparc64/kernel/sunos_ioctl32.c b/arch/sparc64/kernel/sunos_ioctl32.c
index 87c1aeb02220..7654b8a7f03a 100644
--- a/arch/sparc64/kernel/sunos_ioctl32.c
+++ b/arch/sparc64/kernel/sunos_ioctl32.c
@@ -152,11 +152,12 @@ asmlinkage int sunos_ioctl (int fd, u32 cmd, u32 arg)
                 ret = compat_sys_ioctl(fd, SIOCGIFCONF, arg);
                 goto out;
 
-        case _IOW('i', 21, struct ifreq): /* SIOCSIFMTU */
-                ret = sys_ioctl(fd, SIOCSIFMTU, arg);
+        case _IOW('i', 21, struct ifreq32):
+                ret = compat_sys_ioctl(fd, SIOCSIFMTU, arg);
                 goto out;
-        case _IOWR('i', 22, struct ifreq): /* SIOCGIFMTU */
-                ret = sys_ioctl(fd, SIOCGIFMTU, arg);
+
+        case _IOWR('i', 22, struct ifreq32):
+                ret = compat_sys_ioctl(fd, SIOCGIFMTU, arg);
                 goto out;
 
         case _IOWR('i', 23, struct ifreq32):
diff --git a/arch/sparc64/kernel/sys_sparc32.c b/arch/sparc64/kernel/sys_sparc32.c
index 1d3aa588df8a..7f6239ed2521 100644
--- a/arch/sparc64/kernel/sys_sparc32.c
+++ b/arch/sparc64/kernel/sys_sparc32.c
@@ -1002,29 +1002,7 @@ asmlinkage long sys32_adjtimex(struct timex32 __user *utp)
 asmlinkage long sparc32_open(const char __user *filename,
                              int flags, int mode)
 {
-        char * tmp;
-        int fd, error;
-
-        tmp = getname(filename);
-        fd = PTR_ERR(tmp);
-        if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
-                if (fd >= 0) {
-                        struct file * f = filp_open(tmp, flags, mode);
-                        error = PTR_ERR(f);
-                        if (IS_ERR(f))
-                                goto out_error;
-                        fd_install(fd, f);
-                }
-out:
-                putname(tmp);
-        }
-        return fd;
-
-out_error:
-        put_unused_fd(fd);
-        fd = error;
-        goto out;
+        return do_sys_open(filename, flags, mode);
 }
 
 extern unsigned long do_mremap(unsigned long addr,
diff --git a/arch/sparc64/kernel/time.c b/arch/sparc64/kernel/time.c
index 362b9c26871b..3f08a32f51a1 100644
--- a/arch/sparc64/kernel/time.c
+++ b/arch/sparc64/kernel/time.c
@@ -449,7 +449,7 @@ static inline void timer_check_rtc(void)
         static long last_rtc_update;
 
         /* Determine when to update the Mostek clock. */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
diff --git a/arch/sparc64/kernel/vmlinux.lds.S b/arch/sparc64/kernel/vmlinux.lds.S
index 950423da8a6a..f47d0be39378 100644
--- a/arch/sparc64/kernel/vmlinux.lds.S
+++ b/arch/sparc64/kernel/vmlinux.lds.S
@@ -17,6 +17,7 @@ SECTIONS
     *(.text)
     SCHED_TEXT
     LOCK_TEXT
+    KPROBES_TEXT
     *(.gnu.warning)
   } =0
   _etext = .;
diff --git a/arch/sparc64/lib/Makefile b/arch/sparc64/lib/Makefile
index 6201f1040982..d968aebe83b2 100644
--- a/arch/sparc64/lib/Makefile
+++ b/arch/sparc64/lib/Makefile
@@ -12,9 +12,8 @@ lib-y := PeeCeeI.o copy_page.o clear_page.o strlen.o strncmp.o \
          U1memcpy.o U1copy_from_user.o U1copy_to_user.o \
          U3memcpy.o U3copy_from_user.o U3copy_to_user.o U3patch.o \
          copy_in_user.o user_fixup.o memmove.o \
-         mcount.o ipcsum.o rwsem.o xor.o find_bit.o delay.o mb.o
+         mcount.o ipcsum.o rwsem.o xor.o find_bit.o delay.o
 
-lib-$(CONFIG_DEBUG_SPINLOCK) += debuglocks.o
 lib-$(CONFIG_HAVE_DEC_LOCK) += dec_and_lock.o
 
 obj-y += iomap.o
diff --git a/arch/sparc64/lib/debuglocks.c b/arch/sparc64/lib/debuglocks.c
deleted file mode 100644
index f5f0b5586f01..000000000000
--- a/arch/sparc64/lib/debuglocks.c
+++ /dev/null
@@ -1,366 +0,0 @@
-/* $Id: debuglocks.c,v 1.9 2001/11/17 00:10:48 davem Exp $
- * debuglocks.c: Debugging versions of SMP locking primitives.
- *
- * Copyright (C) 1998 David S. Miller (davem@redhat.com)
- */
-
-#include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/sched.h>
-#include <linux/spinlock.h>
-#include <asm/system.h>
-
-#ifdef CONFIG_SMP
-
-static inline void show (char *str, spinlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08x, owner PC(%08x):CPU(%x)\n",
-               str, lock, cpu, (unsigned int) caller,
-               lock->owner_pc, lock->owner_cpu);
-}
-
-static inline void show_read (char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-
-        printk("%s(%p) CPU#%d stuck at %08x, writer PC(%08x):CPU(%x)\n",
-               str, lock, cpu, (unsigned int) caller,
-               lock->writer_pc, lock->writer_cpu);
-}
-
-static inline void show_write (char *str, rwlock_t *lock, unsigned long caller)
-{
-        int cpu = smp_processor_id();
-        int i;
-
-        printk("%s(%p) CPU#%d stuck at %08x\n",
-               str, lock, cpu, (unsigned int) caller);
-        printk("Writer: PC(%08x):CPU(%x)\n",
-               lock->writer_pc, lock->writer_cpu);
-        printk("Readers:");
-        for (i = 0; i < NR_CPUS; i++)
-                if (lock->reader_pc[i])
-                        printk(" %d[%08x]", i, lock->reader_pc[i]);
-        printk("\n");
-}
-
-#undef INIT_STUCK
-#define INIT_STUCK 100000000
-
-void _do_spin_lock(spinlock_t *lock, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-again:
-        __asm__ __volatile__("ldstub [%1], %0"
-                             : "=r" (val)
-                             : "r" (&(lock->lock))
-                             : "memory");
-        membar_storeload_storestore();
-        if (val) {
-                while (lock->lock) {
-                        if (!--stuck) {
-                                if (shown++ <= 2)
-                                        show(str, lock, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        rmb();
-                }
-                goto again;
-        }
-        lock->owner_pc = ((unsigned int)caller);
-        lock->owner_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-int _do_spin_trylock(spinlock_t *lock, unsigned long caller)
-{
-        unsigned long val;
-        int cpu = get_cpu();
-
-        __asm__ __volatile__("ldstub [%1], %0"
-                             : "=r" (val)
-                             : "r" (&(lock->lock))
-                             : "memory");
-        membar_storeload_storestore();
-        if (!val) {
-                lock->owner_pc = ((unsigned int)caller);
-                lock->owner_cpu = cpu;
-                current->thread.smp_lock_count++;
-                current->thread.smp_lock_pc = ((unsigned int)caller);
-        }
-
-        put_cpu();
-
-        return val == 0;
-}
-
-void _do_spin_unlock(spinlock_t *lock)
-{
-        lock->owner_pc = 0;
-        lock->owner_cpu = NO_PROC_ID;
-        membar_storestore_loadstore();
-        lock->lock = 0;
-        current->thread.smp_lock_count--;
-}
-
-/* Keep INIT_STUCK the same... */
-
-void _do_read_lock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-wlock_again:
-        /* Wait for any writer to go away.  */
-        while (((long)(rw->lock)) < 0) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_read(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                rmb();
-        }
-        /* Try once to increment the counter.  */
-        __asm__ __volatile__(
-"       ldx             [%0], %%g1\n"
-"       brlz,a,pn       %%g1, 2f\n"
-"        mov            1, %0\n"
-"       add             %%g1, 1, %%g7\n"
-"       casx            [%0], %%g1, %%g7\n"
-"       sub             %%g1, %%g7, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g1", "g7", "memory");
-        membar_storeload_storestore();
-        if (val)
-                goto wlock_again;
-        rw->reader_pc[cpu] = ((unsigned int)caller);
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-void _do_read_unlock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-        /* Drop our identity _first_. */
-        rw->reader_pc[cpu] = 0;
-        current->thread.smp_lock_count--;
-runlock_again:
-        /* Spin trying to decrement the counter using casx.  */
-        __asm__ __volatile__(
-"       membar  #StoreLoad | #LoadLoad\n"
-"       ldx     [%0], %%g1\n"
-"       sub     %%g1, 1, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       sub     %%g1, %%g7, %0\n"
-        : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g1", "g7", "memory");
-        if (val) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_read(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto runlock_again;
-        }
-
-        put_cpu();
-}
-
-void _do_write_lock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int cpu = get_cpu();
-        int shown = 0;
-
-wlock_again:
-        /* Spin while there is another writer. */
-        while (((long)rw->lock) < 0) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                rmb();
-        }
-
-        /* Try to acuire the write bit.  */
-        __asm__ __volatile__(
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       brlz,pn %%g1, 1f\n"
-"        or     %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       ba,pt   %%xcc, 2f\n"
-"        sub    %%g1, %%g7, %0\n"
-"1:     mov     1, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-        if (val) {
-                /* We couldn't get the write bit. */
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto wlock_again;
-        }
-        if ((rw->lock & ((1UL<<63)-1UL)) != 0UL) {
-                /* Readers still around, drop the write
-                 * lock, spin, and try again.
-                 */
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write(str, rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                __asm__ __volatile__(
-"               mov     1, %%g3\n"
-"               sllx    %%g3, 63, %%g3\n"
-"1:             ldx     [%0], %%g1\n"
-"               andn    %%g1, %%g3, %%g7\n"
-"               casx    [%0], %%g1, %%g7\n"
-"               cmp     %%g1, %%g7\n"
-"               membar  #StoreLoad | #StoreStore\n"
-"               bne,pn  %%xcc, 1b\n"
-"                nop"
-                : /* no outputs */
-                : "r" (&(rw->lock))
-                : "g3", "g1", "g7", "cc", "memory");
-                while(rw->lock != 0) {
-                        if (!--stuck) {
-                                if (shown++ <= 2)
-                                        show_write(str, rw, caller);
-                                stuck = INIT_STUCK;
-                        }
-                        rmb();
-                }
-                goto wlock_again;
-        }
-
-        /* We have it, say who we are. */
-        rw->writer_pc = ((unsigned int)caller);
-        rw->writer_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-}
-
-void _do_write_unlock(rwlock_t *rw, unsigned long caller)
-{
-        unsigned long val;
-        int stuck = INIT_STUCK;
-        int shown = 0;
-
-        /* Drop our identity _first_ */
-        rw->writer_pc = 0;
-        rw->writer_cpu = NO_PROC_ID;
-        current->thread.smp_lock_count--;
-wlock_again:
-        __asm__ __volatile__(
-"       membar  #StoreLoad | #LoadLoad\n"
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       andn    %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       sub     %%g1, %%g7, %0\n"
-        : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-        if (val) {
-                if (!--stuck) {
-                        if (shown++ <= 2)
-                                show_write("write_unlock", rw, caller);
-                        stuck = INIT_STUCK;
-                }
-                goto wlock_again;
-        }
-}
-
-int _do_write_trylock(rwlock_t *rw, char *str, unsigned long caller)
-{
-        unsigned long val;
-        int cpu = get_cpu();
-
-        /* Try to acuire the write bit.  */
-        __asm__ __volatile__(
-"       mov     1, %%g3\n"
-"       sllx    %%g3, 63, %%g3\n"
-"       ldx     [%0], %%g1\n"
-"       brlz,pn %%g1, 1f\n"
-"        or     %%g1, %%g3, %%g7\n"
-"       casx    [%0], %%g1, %%g7\n"
-"       membar  #StoreLoad | #StoreStore\n"
-"       ba,pt   %%xcc, 2f\n"
-"        sub    %%g1, %%g7, %0\n"
-"1:     mov     1, %0\n"
-"2:"    : "=r" (val)
-        : "0" (&(rw->lock))
-        : "g3", "g1", "g7", "memory");
-
-        if (val) {
-                put_cpu();
-                return 0;
-        }
-
-        if ((rw->lock & ((1UL<<63)-1UL)) != 0UL) {
-                /* Readers still around, drop the write
-                 * lock, return failure.
-                 */
-                __asm__ __volatile__(
-"               mov     1, %%g3\n"
-"               sllx    %%g3, 63, %%g3\n"
-"1:             ldx     [%0], %%g1\n"
-"               andn    %%g1, %%g3, %%g7\n"
-"               casx    [%0], %%g1, %%g7\n"
-"               cmp     %%g1, %%g7\n"
-"               membar  #StoreLoad | #StoreStore\n"
-"               bne,pn  %%xcc, 1b\n"
-"                nop"
-                : /* no outputs */
-                : "r" (&(rw->lock))
-                : "g3", "g1", "g7", "cc", "memory");
-
-                put_cpu();
-
-                return 0;
-        }
-
-        /* We have it, say who we are. */
-        rw->writer_pc = ((unsigned int)caller);
-        rw->writer_cpu = cpu;
-        current->thread.smp_lock_count++;
-        current->thread.smp_lock_pc = ((unsigned int)caller);
-
-        put_cpu();
-
-        return 1;
-}
-
-#endif /* CONFIG_SMP */
diff --git a/arch/sparc64/lib/mb.S b/arch/sparc64/lib/mb.S
deleted file mode 100644
index 4004f748619f..000000000000
--- a/arch/sparc64/lib/mb.S
+++ /dev/null
@@ -1,73 +0,0 @@
-/* mb.S: Out of line memory barriers.
- *
- * Copyright (C) 2005 David S. Miller (davem@davemloft.net)
- */
-
-        /* These are here in an effort to more fully work around
-         * Spitfire Errata #51.  Essentially, if a memory barrier
-         * occurs soon after a mispredicted branch, the chip can stop
-         * executing instructions until a trap occurs.  Therefore, if
-         * interrupts are disabled, the chip can hang forever.
-         *
-         * It used to be believed that the memory barrier had to be
-         * right in the delay slot, but a case has been traced
-         * recently wherein the memory barrier was one instruction
-         * after the branch delay slot and the chip still hung.  The
-         * offending sequence was the following in sym_wakeup_done()
-         * of the sym53c8xx_2 driver:
-         *
-         *      call    sym_ccb_from_dsa, 0
-         *       movge  %icc, 0, %l0
-         *      brz,pn  %o0, .LL1303
-         *       mov    %o0, %l2
-         *      membar  #LoadLoad
-         *
-         * The branch has to be mispredicted for the bug to occur.
-         * Therefore, we put the memory barrier explicitly into a
-         * "branch always, predicted taken" delay slot to avoid the
-         * problem case.
-         */
-
-        .text
-
-99:     retl
-         nop
-
-        .globl  mb
-mb:     ba,pt   %xcc, 99b
-         membar #LoadLoad | #LoadStore | #StoreStore | #StoreLoad
-        .size   mb, .-mb
-
-        .globl  rmb
-rmb:    ba,pt   %xcc, 99b
-         membar #LoadLoad
-        .size   rmb, .-rmb
-
-        .globl  wmb
-wmb:    ba,pt   %xcc, 99b
-         membar #StoreStore
-        .size   wmb, .-wmb
-
-        .globl  membar_storeload
-membar_storeload:
-        ba,pt   %xcc, 99b
-         membar #StoreLoad
-        .size   membar_storeload, .-membar_storeload
-
-        .globl  membar_storeload_storestore
-membar_storeload_storestore:
-        ba,pt   %xcc, 99b
-         membar #StoreLoad | #StoreStore
-        .size   membar_storeload_storestore, .-membar_storeload_storestore
-
-        .globl  membar_storeload_loadload
-membar_storeload_loadload:
-        ba,pt   %xcc, 99b
-         membar #StoreLoad | #LoadLoad
-        .size   membar_storeload_loadload, .-membar_storeload_loadload
-
-        .globl  membar_storestore_loadstore
-membar_storestore_loadstore:
-        ba,pt   %xcc, 99b
-         membar #StoreStore | #LoadStore
-        .size   membar_storestore_loadstore, .-membar_storestore_loadstore
diff --git a/arch/sparc64/mm/fault.c b/arch/sparc64/mm/fault.c
index 52e9375288a9..db1e3310e907 100644
--- a/arch/sparc64/mm/fault.c
+++ b/arch/sparc64/mm/fault.c
@@ -18,6 +18,7 @@
 #include <linux/smp_lock.h>
 #include <linux/init.h>
 #include <linux/interrupt.h>
+#include <linux/kprobes.h>
 
 #include <asm/page.h>
 #include <asm/pgtable.h>
@@ -117,8 +118,9 @@ unsigned long __init prom_probe_memory (void)
         return tally;
 }
 
-static void unhandled_fault(unsigned long address, struct task_struct *tsk,
-                            struct pt_regs *regs)
+static void __kprobes unhandled_fault(unsigned long address,
+                                      struct task_struct *tsk,
+                                      struct pt_regs *regs)
 {
         if ((unsigned long) address < PAGE_SIZE) {
                 printk(KERN_ALERT "Unable to handle kernel NULL "
@@ -304,7 +306,7 @@ cannot_handle:
         unhandled_fault (address, current, regs);
 }
 
-asmlinkage void do_sparc64_fault(struct pt_regs *regs)
+asmlinkage void __kprobes do_sparc64_fault(struct pt_regs *regs)
 {
         struct mm_struct *mm = current->mm;
         struct vm_area_struct *vma;
diff --git a/arch/sparc64/mm/init.c b/arch/sparc64/mm/init.c
index 3fbaf342a452..fdb1ebb308c9 100644
--- a/arch/sparc64/mm/init.c
+++ b/arch/sparc64/mm/init.c
@@ -19,6 +19,7 @@
 #include <linux/pagemap.h>
 #include <linux/fs.h>
 #include <linux/seq_file.h>
+#include <linux/kprobes.h>
 
 #include <asm/head.h>
 #include <asm/system.h>
@@ -250,7 +251,7 @@ out:
         put_cpu();
 }
 
-void flush_icache_range(unsigned long start, unsigned long end)
+void __kprobes flush_icache_range(unsigned long start, unsigned long end)
 {
         /* Cheetah has coherent I-cache. */
         if (tlb_type == spitfire) {
diff --git a/arch/sparc64/mm/ultra.S b/arch/sparc64/mm/ultra.S
index 8dfa825eca51..b2ee9b53227f 100644
--- a/arch/sparc64/mm/ultra.S
+++ b/arch/sparc64/mm/ultra.S
@@ -119,6 +119,7 @@ __spitfire_flush_tlb_mm_slow:
 #else
 #error unsupported PAGE_SIZE
 #endif
+        .section .kprobes.text, "ax"
         .align          32
         .globl          __flush_icache_page
 __flush_icache_page:    /* %o0 = phys_page */
@@ -201,6 +202,7 @@ dflush4:stxa		%g0, [%o4] ASI_DCACHE_TAG
          nop
 #endif /* DCACHE_ALIASING_POSSIBLE */
 
+        .previous .text
         .align          32
 __prefill_dtlb:
         rdpr            %pstate, %g7
diff --git a/arch/sparc64/solaris/ioctl.c b/arch/sparc64/solaris/ioctl.c
index cac0a1cf0050..be0a054e3ed6 100644
--- a/arch/sparc64/solaris/ioctl.c
+++ b/arch/sparc64/solaris/ioctl.c
@@ -24,6 +24,7 @@
 #include <linux/netdevice.h>
 #include <linux/mtio.h>
 #include <linux/time.h>
+#include <linux/rcupdate.h>
 #include <linux/compat.h>
 
 #include <net/sock.h>
@@ -293,16 +294,18 @@ static struct module_info {
 static inline int solaris_sockmod(unsigned int fd, unsigned int cmd, u32 arg)
 {
         struct inode *ino;
+        struct fdtable *fdt;
         /* I wonder which of these tests are superfluous... --patrik */
-        spin_lock(&current->files->file_lock);
-        if (! current->files->fd[fd] ||
-            ! current->files->fd[fd]->f_dentry ||
-            ! (ino = current->files->fd[fd]->f_dentry->d_inode) ||
+        rcu_read_lock();
+        fdt = files_fdtable(current->files);
+        if (! fdt->fd[fd] ||
+            ! fdt->fd[fd]->f_dentry ||
+            ! (ino = fdt->fd[fd]->f_dentry->d_inode) ||
             ! S_ISSOCK(ino->i_mode)) {
-                spin_unlock(&current->files->file_lock);
+                rcu_read_unlock();
                 return TBADF;
         }
-        spin_unlock(&current->files->file_lock);
+        rcu_read_unlock();
         
         switch (cmd & 0xff) {
         case 109: /* SI_SOCKPARAMS */
diff --git a/arch/sparc64/solaris/timod.c b/arch/sparc64/solaris/timod.c
index 022c80f43392..aaad29c35c83 100644
--- a/arch/sparc64/solaris/timod.c
+++ b/arch/sparc64/solaris/timod.c
@@ -143,9 +143,11 @@ static struct T_primsg *timod_mkctl(int size)
 static void timod_wake_socket(unsigned int fd)
 {
         struct socket *sock;
+        struct fdtable *fdt;
 
         SOLD("wakeing socket");
-        sock = SOCKET_I(current->files->fd[fd]->f_dentry->d_inode);
+        fdt = files_fdtable(current->files);
+        sock = SOCKET_I(fdt->fd[fd]->f_dentry->d_inode);
         wake_up_interruptible(&sock->wait);
         read_lock(&sock->sk->sk_callback_lock);
         if (sock->fasync_list && !test_bit(SOCK_ASYNC_WAITDATA, &sock->flags))
@@ -157,9 +159,11 @@ static void timod_wake_socket(unsigned int fd)
 static void timod_queue(unsigned int fd, struct T_primsg *it)
 {
         struct sol_socket_struct *sock;
+        struct fdtable *fdt;
 
         SOLD("queuing primsg");
-        sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+        fdt = files_fdtable(current->files);
+        sock = (struct sol_socket_struct *)fdt->fd[fd]->private_data;
         it->next = sock->pfirst;
         sock->pfirst = it;
         if (!sock->plast)
@@ -171,9 +175,11 @@ static void timod_queue(unsigned int fd, struct T_primsg *it)
 static void timod_queue_end(unsigned int fd, struct T_primsg *it)
 {
         struct sol_socket_struct *sock;
+        struct fdtable *fdt;
 
         SOLD("queuing primsg at end");
-        sock = (struct sol_socket_struct *)current->files->fd[fd]->private_data;
+        fdt = files_fdtable(current->files);
+        sock = (struct sol_socket_struct *)fdt->fd[fd]->private_data;
         it->next = NULL;
         if (sock->plast)
                 sock->plast->next = it;
@@ -344,6 +350,7 @@ int timod_putmsg(unsigned int fd, char __user *ctl_buf, int ctl_len,
         char *buf;
         struct file *filp;
         struct inode *ino;
+        struct fdtable *fdt;
         struct sol_socket_struct *sock;
         mm_segment_t old_fs = get_fs();
         long args[6];
@@ -351,7 +358,9 @@ int timod_putmsg(unsigned int fd, char __user *ctl_buf, int ctl_len,
                 (int (*)(int, unsigned long __user *))SYS(socketcall);
         int (*sys_sendto)(int, void __user *, size_t, unsigned, struct sockaddr __user *, int) =
                 (int (*)(int, void __user *, size_t, unsigned, struct sockaddr __user *, int))SYS(sendto);
-        filp = current->files->fd[fd];
+
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         ino = filp->f_dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLD("entry");
@@ -620,6 +629,7 @@ int timod_getmsg(unsigned int fd, char __user *ctl_buf, int ctl_maxlen, s32 __us
         int oldflags;
         struct file *filp;
         struct inode *ino;
+        struct fdtable *fdt;
         struct sol_socket_struct *sock;
         struct T_unitdata_ind udi;
         mm_segment_t old_fs = get_fs();
@@ -632,7 +642,8 @@ int timod_getmsg(unsigned int fd, char __user *ctl_buf, int ctl_maxlen, s32 __us
         
         SOLD("entry");
         SOLDD(("%u %p %d %p %p %d %p %d\n", fd, ctl_buf, ctl_maxlen, ctl_len, data_buf, data_maxlen, data_len, *flags_p));
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         ino = filp->f_dentry->d_inode;
         sock = (struct sol_socket_struct *)filp->private_data;
         SOLDD(("%p %p\n", sock->pfirst, sock->pfirst ? sock->pfirst->next : NULL));
@@ -844,12 +855,14 @@ asmlinkage int solaris_getmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         int __user *flgptr;
         int flags;
         int error = -EBADF;
+        struct fdtable *fdt;
 
         SOLD("entry");
         lock_kernel();
         if(fd >= NR_OPEN) goto out;
 
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         if(!filp) goto out;
 
         ino = filp->f_dentry->d_inode;
@@ -910,12 +923,14 @@ asmlinkage int solaris_putmsg(unsigned int fd, u32 arg1, u32 arg2, u32 arg3)
         struct strbuf ctl, dat;
         int flags = (int) arg3;
         int error = -EBADF;
+        struct fdtable *fdt;
 
         SOLD("entry");
         lock_kernel();
         if(fd >= NR_OPEN) goto out;
 
-        filp = current->files->fd[fd];
+        fdt = files_fdtable(current->files);
+        filp = fdt->fd[fd];
         if(!filp) goto out;
 
         ino = filp->f_dentry->d_inode;
diff --git a/arch/um/Makefile b/arch/um/Makefile
index b15f6048caae..154803a22698 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -103,7 +103,6 @@ endef
 
 ifneq ($(KBUILD_SRC),)
 $(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
-CLEAN_FILES += $(ARCH_DIR)/Kconfig.arch
 else
 $(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
 endif
@@ -144,14 +143,14 @@ endef
 #TT or skas makefiles and don't clean skas_ptregs.h.
 CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
         $(GEN_HEADERS) $(ARCH_DIR)/include/skas_ptregs.h \
-        $(ARCH_DIR)/include/user_constants.h
+        $(ARCH_DIR)/include/user_constants.h $(ARCH_DIR)/Kconfig.arch
 
 MRPROPER_FILES += $(SYMLINK_HEADERS) $(ARCH_SYMLINKS) \
-        $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os \
-        $(ARCH_DIR)/Kconfig.arch
+        $(addprefix $(ARCH_DIR)/kernel/,$(KERN_SYMLINKS)) $(ARCH_DIR)/os
 
 archclean:
         $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/util
+        $(Q)$(MAKE) $(clean)=$(ARCH_DIR)/os-$(OS)/util
         @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
                 -o -name '*.gcov' \) -type f -print | xargs rm -f
 
@@ -197,6 +196,22 @@ define filechk_umlconfig
         sed 's/ CONFIG/ UML_CONFIG/'
 endef
 
+define filechk_gen-asm-offsets
+        (set -e; \
+         echo "#ifndef __ASM_OFFSETS_H__"; \
+         echo "#define __ASM_OFFSETS_H__"; \
+         echo "/*"; \
+         echo " * DO NOT MODIFY."; \
+         echo " *"; \
+         echo " * This file was generated by arch/$(ARCH)/Makefile"; \
+         echo " *"; \
+         echo " */"; \
+         echo ""; \
+         sed -ne "/^->/{s:^->\([^ ]*\) [\$$#]*\([^ ]*\) \(.*\):#define \1 \2 /* \3 */:; s:->::; p;}"; \
+         echo ""; \
+         echo "#endif" )
+endef
+
 $(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
         $(call filechk,umlconfig)
 
diff --git a/arch/um/Makefile-i386 b/arch/um/Makefile-i386
index a777e57dbf89..1ab431a53ac3 100644
--- a/arch/um/Makefile-i386
+++ b/arch/um/Makefile-i386
@@ -27,7 +27,7 @@ export LDFLAGS HOSTCFLAGS HOSTLDFLAGS UML_OBJCOPYFLAGS
 endif
 endif
 
-CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH) $(STUB_CFLAGS)
+CFLAGS += -U__$(SUBARCH)__ -U$(SUBARCH)
 
 ifneq ($(CONFIG_GPROF),y)
 ARCH_CFLAGS += -DUM_FASTCALL
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index baddb5d64ca5..436abbba409b 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -8,6 +8,7 @@ START := 0x60000000
 #it's needed for headers to work!
 CFLAGS += -U__$(SUBARCH)__ -fno-builtin
 USER_CFLAGS += -fno-builtin
+CHECKFLAGS  += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
diff --git a/arch/um/include/common-offsets.h b/arch/um/include/common-offsets.h
index d705daa2d854..0aa620970adb 100644
--- a/arch/um/include/common-offsets.h
+++ b/arch/um/include/common-offsets.h
@@ -12,3 +12,4 @@ DEFINE_STR(UM_KERN_WARNING, KERN_WARNING);
 DEFINE_STR(UM_KERN_NOTICE, KERN_NOTICE);
 DEFINE_STR(UM_KERN_INFO, KERN_INFO);
 DEFINE_STR(UM_KERN_DEBUG, KERN_DEBUG);
+DEFINE(HOST_ELF_CLASS, ELF_CLASS);
diff --git a/arch/um/include/mem.h b/arch/um/include/mem.h
index 99d3ad4a03e5..e8ff0d8fa610 100644
--- a/arch/um/include/mem.h
+++ b/arch/um/include/mem.h
@@ -13,7 +13,17 @@ extern int physmem_subst_mapping(void *virt, int fd, __u64 offset, int w);
 extern int is_remapped(void *virt);
 extern int physmem_remove_mapping(void *virt);
 extern void physmem_forget_descriptor(int fd);
-extern unsigned long to_phys(void *virt);
+
+extern unsigned long uml_physmem;
+static inline unsigned long to_phys(void *virt)
+{
+        return(((unsigned long) virt) - uml_physmem);
+}
+
+static inline void *to_virt(unsigned long phys)
+{
+        return((void *) uml_physmem + phys);
+}
 
 #endif
 
diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/um_uaccess.h
index 6e348cb6de24..84c0868cd561 100644
--- a/arch/um/include/um_uaccess.h
+++ b/arch/um/include/um_uaccess.h
@@ -20,13 +20,6 @@
 #define access_ok(type, addr, size) \
         CHOOSE_MODE_PROC(access_ok_tt, access_ok_skas, type, addr, size)
 
-/* this function will go away soon - use access_ok() instead */
-static inline int __deprecated verify_area(int type, const void __user *addr, unsigned long size)
-{
-        return (CHOOSE_MODE_PROC(verify_area_tt, verify_area_skas, type, addr,
-                                size));
-}
-
 static inline int copy_from_user(void *to, const void __user *from, int n)
 {
         return(CHOOSE_MODE_PROC(copy_from_user_tt, copy_from_user_skas, to,
diff --git a/arch/um/kernel/asm-offsets.c b/arch/um/kernel/asm-offsets.c
new file mode 100644
index 000000000000..c13a64a288f6
--- /dev/null
+++ b/arch/um/kernel/asm-offsets.c
@@ -0,0 +1 @@
+/* Dummy file to make kbuild happy - unused! */
diff --git a/arch/um/kernel/dyn.lds.S b/arch/um/kernel/dyn.lds.S
index 3942a5f245de..2517ecb8bf27 100644
--- a/arch/um/kernel/dyn.lds.S
+++ b/arch/um/kernel/dyn.lds.S
@@ -146,37 +146,8 @@ SECTIONS
   }
   _end = .;
   PROVIDE (end = .);
-   /* Stabs debugging sections.  */
-  .stab          0 : { *(.stab) }
-  .stabstr       0 : { *(.stabstr) }
-  .stab.excl     0 : { *(.stab.excl) }
-  .stab.exclstr  0 : { *(.stab.exclstr) }
-  .stab.index    0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment       0 : { *(.comment) }
-  /* DWARF debug sections.
-     Symbols in the DWARF debugging sections are relative to the beginning
-     of the section so we begin them at 0.  */
-  /* DWARF 1 */
-  .debug          0 : { *(.debug) }
-  .line           0 : { *(.line) }
-  /* GNU DWARF 1 extensions */
-  .debug_srcinfo  0 : { *(.debug_srcinfo) }
-  .debug_sfnames  0 : { *(.debug_sfnames) }
-  /* DWARF 1.1 and DWARF 2 */
-  .debug_aranges  0 : { *(.debug_aranges) }
-  .debug_pubnames 0 : { *(.debug_pubnames) }
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info .gnu.linkonce.wi.*) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
+
+  STABS_DEBUG
+
+  DWARF_DEBUG
 }
diff --git a/arch/um/kernel/ksyms.c b/arch/um/kernel/ksyms.c
index 32d3076dd220..a97a72e516aa 100644
--- a/arch/um/kernel/ksyms.c
+++ b/arch/um/kernel/ksyms.c
@@ -34,14 +34,9 @@ EXPORT_SYMBOL(host_task_size);
 EXPORT_SYMBOL(arch_validate);
 EXPORT_SYMBOL(get_kmem_end);
 
-EXPORT_SYMBOL(page_to_phys);
-EXPORT_SYMBOL(phys_to_page);
 EXPORT_SYMBOL(high_physmem);
 EXPORT_SYMBOL(empty_zero_page);
 EXPORT_SYMBOL(um_virt_to_phys);
-EXPORT_SYMBOL(__virt_to_page);
-EXPORT_SYMBOL(to_phys);
-EXPORT_SYMBOL(to_virt);
 EXPORT_SYMBOL(mode_tt);
 EXPORT_SYMBOL(handle_page_fault);
 EXPORT_SYMBOL(find_iomem);
diff --git a/arch/um/kernel/mem.c b/arch/um/kernel/mem.c
index 5597bd39e6b5..64fa062cc119 100644
--- a/arch/um/kernel/mem.c
+++ b/arch/um/kernel/mem.c
@@ -196,7 +196,7 @@ static void init_highmem(void)
 
 static void __init fixaddr_user_init( void)
 {
-#if CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA
+#ifdef CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA
         long size = FIXADDR_USER_END - FIXADDR_USER_START;
         pgd_t *pgd;
         pud_t *pud;
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c
index a24e3b7f4bf0..ea670fcc8af5 100644
--- a/arch/um/kernel/physmem.c
+++ b/arch/um/kernel/physmem.c
@@ -248,16 +248,6 @@ unsigned long high_physmem;
 
 extern unsigned long physmem_size;
 
-void *to_virt(unsigned long phys)
-{
-        return((void *) uml_physmem + phys);
-}
-
-unsigned long to_phys(void *virt)
-{
-        return(((unsigned long) virt) - uml_physmem);
-}
-
 int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
 {
         struct page *p, *map;
@@ -298,31 +288,6 @@ int init_maps(unsigned long physmem, unsigned long iomem, unsigned long highmem)
         return(0);
 }
 
-struct page *phys_to_page(const unsigned long phys)
-{
-        return(&mem_map[phys >> PAGE_SHIFT]);
-}
-
-struct page *__virt_to_page(const unsigned long virt)
-{
-        return(&mem_map[__pa(virt) >> PAGE_SHIFT]);
-}
-
-phys_t page_to_phys(struct page *page)
-{
-        return((page - mem_map) << PAGE_SHIFT);
-}
-
-pte_t mk_pte(struct page *page, pgprot_t pgprot)
-{
-        pte_t pte;
-
-        pte_set_val(pte, page_to_phys(page), pgprot);
-        if(pte_present(pte))
-                pte_mknewprot(pte_mknewpage(pte));
-        return(pte);
-}
-
 /* Changed during early boot */
 static unsigned long kmem_top = 0;
 
diff --git a/arch/um/kernel/skas/include/uaccess-skas.h b/arch/um/kernel/skas/include/uaccess-skas.h
index cd6c280482cb..6ee3f3902e68 100644
--- a/arch/um/kernel/skas/include/uaccess-skas.h
+++ b/arch/um/kernel/skas/include/uaccess-skas.h
@@ -18,18 +18,18 @@
           ((unsigned long) (addr) + (size) <= FIXADDR_USER_END) && \
           ((unsigned long) (addr) + (size) >= (unsigned long)(addr))))
 
-static inline int verify_area_skas(int type, const void * addr,
+static inline int verify_area_skas(int type, const void __user * addr,
                                    unsigned long size)
 {
         return(access_ok_skas(type, addr, size) ? 0 : -EFAULT);
 }
 
-extern int copy_from_user_skas(void *to, const void *from, int n);
-extern int copy_to_user_skas(void *to, const void *from, int n);
-extern int strncpy_from_user_skas(char *dst, const char *src, int count);
-extern int __clear_user_skas(void *mem, int len);
-extern int clear_user_skas(void *mem, int len);
-extern int strnlen_user_skas(const void *str, int len);
+extern int copy_from_user_skas(void *to, const void __user *from, int n);
+extern int copy_to_user_skas(void __user *to, const void *from, int n);
+extern int strncpy_from_user_skas(char *dst, const char __user *src, int count);
+extern int __clear_user_skas(void __user *mem, int len);
+extern int clear_user_skas(void __user *mem, int len);
+extern int strnlen_user_skas(const void __user *str, int len);
 
 #endif
 
diff --git a/arch/um/kernel/trap_kern.c b/arch/um/kernel/trap_kern.c
index b5fc89fe9eab..87cc6fd76ced 100644
--- a/arch/um/kernel/trap_kern.c
+++ b/arch/um/kernel/trap_kern.c
@@ -57,7 +57,8 @@ good_area:
         if(is_write && !(vma->vm_flags & VM_WRITE)) 
                 goto out;
 
-        if(!(vma->vm_flags & (VM_READ | VM_EXEC)))
+        /* Don't require VM_READ|VM_EXEC for write faults! */
+        if(!is_write && !(vma->vm_flags & (VM_READ | VM_EXEC)))
                 goto out;
 
         do {
@@ -84,8 +85,7 @@ survive:
                 pte = pte_offset_kernel(pmd, address);
         } while(!pte_present(*pte));
         err = 0;
-        *pte = pte_mkyoung(*pte);
-        if(pte_write(*pte)) *pte = pte_mkdirty(*pte);
+        WARN_ON(!pte_young(*pte) || (is_write && !pte_dirty(*pte)));
         flush_tlb_page(vma, address);
 out:
         up_read(&mm->mmap_sem);
diff --git a/arch/um/kernel/tt/include/uaccess-tt.h b/arch/um/kernel/tt/include/uaccess-tt.h
index 3fbb5fe26f49..aa6db384af80 100644
--- a/arch/um/kernel/tt/include/uaccess-tt.h
+++ b/arch/um/kernel/tt/include/uaccess-tt.h
@@ -33,7 +33,7 @@ extern unsigned long uml_physmem;
          (((unsigned long) (addr) <= ((unsigned long) (addr) + (size))) && \
           (under_task_size(addr, size) || is_stack(addr, size))))
 
-static inline int verify_area_tt(int type, const void * addr,
+static inline int verify_area_tt(int type, const void __user * addr,
                                  unsigned long size)
 {
         return(access_ok_tt(type, addr, size) ? 0 : -EFAULT);
@@ -50,12 +50,12 @@ extern int __do_clear_user(void *mem, size_t len, void **fault_addr,
 extern int __do_strnlen_user(const char *str, unsigned long n,
                              void **fault_addr, void **fault_catcher);
 
-extern int copy_from_user_tt(void *to, const void *from, int n);
-extern int copy_to_user_tt(void *to, const void *from, int n);
-extern int strncpy_from_user_tt(char *dst, const char *src, int count);
-extern int __clear_user_tt(void *mem, int len);
-extern int clear_user_tt(void *mem, int len);
-extern int strnlen_user_tt(const void *str, int len);
+extern int copy_from_user_tt(void *to, const void __user *from, int n);
+extern int copy_to_user_tt(void __user *to, const void *from, int n);
+extern int strncpy_from_user_tt(char *dst, const char __user *src, int count);
+extern int __clear_user_tt(void __user *mem, int len);
+extern int clear_user_tt(void __user *mem, int len);
+extern int strnlen_user_tt(const void __user *str, int len);
 
 #endif
 
diff --git a/arch/um/kernel/uml.lds.S b/arch/um/kernel/uml.lds.S
index b03326d391c9..af11915ce0a8 100644
--- a/arch/um/kernel/uml.lds.S
+++ b/arch/um/kernel/uml.lds.S
@@ -93,14 +93,10 @@ SECTIONS
    *(.bss)
    *(COMMON)
   }
-  _end = . ;
+  _end = .;
   PROVIDE (end = .);
-  /* Stabs debugging sections.  */
-  .stab 0 : { *(.stab) }
-  .stabstr 0 : { *(.stabstr) }
-  .stab.excl 0 : { *(.stab.excl) }
-  .stab.exclstr 0 : { *(.stab.exclstr) }
-  .stab.index 0 : { *(.stab.index) }
-  .stab.indexstr 0 : { *(.stab.indexstr) }
-  .comment 0 : { *(.comment) }
+
+  STABS_DEBUG
+
+  DWARF_DEBUG
 }
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index d3c1560e3ed8..7a1662419c0c 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -9,6 +9,9 @@ obj-y = aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \
 USER_OBJS := aio.o elf_aux.o file.o process.o signal.o start_up.o time.o tt.o \
         tty.o
 
+elf_aux.o: $(ARCH_DIR)/kernel-offsets.h
+CFLAGS_elf_aux.o += -I$(objtree)/arch/um
+
 CFLAGS_user_syms.o += -DSUBARCH_$(SUBARCH)
 
 HAVE_AIO_ABI := $(shell [ -r /usr/include/linux/aio_abi.h ] && \
diff --git a/arch/um/os-Linux/elf_aux.c b/arch/um/os-Linux/elf_aux.c
index 4cca3e9c23fe..1399520a8588 100644
--- a/arch/um/os-Linux/elf_aux.c
+++ b/arch/um/os-Linux/elf_aux.c
@@ -12,8 +12,9 @@
 #include "init.h"
 #include "elf_user.h"
 #include "mem_user.h"
+#include <kernel-offsets.h>
 
-#if ELF_CLASS == ELFCLASS32
+#if HOST_ELF_CLASS == ELFCLASS32
 typedef Elf32_auxv_t elf_auxv_t;
 #else
 typedef Elf64_auxv_t elf_auxv_t;
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index 17f305b6bade..59a1291f477e 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -9,6 +9,11 @@ USER_OBJS := $(foreach file,$(USER_OBJS),$(obj)/$(file))
 
 $(USER_OBJS) : c_flags = -Wp,-MD,$(depfile) $(USER_CFLAGS) \
         $(CFLAGS_$(notdir $@))
+$(USER_OBJS): cmd_checksrc =
+$(USER_OBJS): quiet_cmd_checksrc =
+$(USER_OBJS): cmd_force_checksrc =
+$(USER_OBJS): quiet_cmd_force_checksrc =
+
 
 # The stubs and unmap.o can't try to call mcount or update basic block data
 define unprofile
diff --git a/arch/um/sys-i386/kernel-offsets.c b/arch/um/sys-i386/kernel-offsets.c
index 9f8ecd1fdd96..a1070af2bcd8 100644
--- a/arch/um/sys-i386/kernel-offsets.c
+++ b/arch/um/sys-i386/kernel-offsets.c
@@ -2,6 +2,7 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/time.h>
+#include <linux/elf.h>
 #include <asm/page.h>
 
 #define DEFINE(sym, val) \
diff --git a/arch/um/sys-x86_64/kernel-offsets.c b/arch/um/sys-x86_64/kernel-offsets.c
index 220e875cbe29..998541eade41 100644
--- a/arch/um/sys-x86_64/kernel-offsets.c
+++ b/arch/um/sys-x86_64/kernel-offsets.c
@@ -2,6 +2,7 @@
 #include <linux/stddef.h>
 #include <linux/sched.h>
 #include <linux/time.h>
+#include <linux/elf.h>
 #include <asm/page.h>
 
 #define DEFINE(sym, val) \
diff --git a/arch/v850/Makefile b/arch/v850/Makefile
index bf38ca0ad781..8be9aacb20a7 100644
--- a/arch/v850/Makefile
+++ b/arch/v850/Makefile
@@ -51,16 +51,4 @@ root_fs_image_force: $(ROOT_FS_IMAGE)
         $(OBJCOPY) $(OBJCOPY_FLAGS_BLOB) --rename-section .data=.root,alloc,load,readonly,data,contents $< root_fs_image.o
 endif
 
-
-prepare: include/asm-$(ARCH)/asm-consts.h
-
-# Generate constants from C code for use by asm files
-arch/$(ARCH)/kernel/asm-consts.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/asm-consts.h: arch/$(ARCH)/kernel/asm-consts.s
-        $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES += include/asm-$(ARCH)/asm-consts.h \
-               arch/$(ARCH)/kernel/asm-consts.s \
-               root_fs_image.o
+CLEAN_FILES += root_fs_image.o
diff --git a/arch/v850/kernel/asm-consts.c b/arch/v850/kernel/asm-offsets.c
index 24f291369070..24f291369070 100644
--- a/arch/v850/kernel/asm-consts.c
+++ b/arch/v850/kernel/asm-offsets.c
diff --git a/arch/v850/kernel/entry.S b/arch/v850/kernel/entry.S
index 895e27b1d839..d991e4547dbb 100644
--- a/arch/v850/kernel/entry.S
+++ b/arch/v850/kernel/entry.S
@@ -22,7 +22,7 @@
 #include <asm/irq.h>
 #include <asm/errno.h>
 
-#include <asm/asm-consts.h>
+#include <asm/asm-offsets.h>
 
 
 /* Make a slightly more convenient alias for C_SYMBOL_NAME.  */
diff --git a/arch/v850/kernel/irq.c b/arch/v850/kernel/irq.c
index 336cbf21dc8f..9e85969ba976 100644
--- a/arch/v850/kernel/irq.c
+++ b/arch/v850/kernel/irq.c
@@ -67,13 +67,13 @@ static void ack_none(unsigned int irq)
 #define end_none        enable_none
 
 struct hw_interrupt_type no_irq_type = {
-        "none",
-        startup_none,
-        shutdown_none,
-        enable_none,
-        disable_none,
-        ack_none,
-        end_none
+        .typename = "none",
+        .startup = startup_none,
+        .shutdown = shutdown_none,
+        .enable = enable_none,
+        .disable = disable_none,
+        .ack = ack_none,
+        .end = end_none
 };
 
 volatile unsigned long irq_err_count, spurious_count;
diff --git a/arch/v850/kernel/setup.c b/arch/v850/kernel/setup.c
index abd48409dcca..62bdb8d29fc0 100644
--- a/arch/v850/kernel/setup.c
+++ b/arch/v850/kernel/setup.c
@@ -138,13 +138,13 @@ static void nmi_end (unsigned irq)
 }
 
 static struct hw_interrupt_type nmi_irq_type = {
-        "NMI",
-        irq_zero,               /* startup */
-        irq_nop,                /* shutdown */
-        irq_nop,                /* enable */
-        irq_nop,                /* disable */
-        irq_nop,                /* ack */
-        nmi_end,                /* end */
+        .typename = "NMI",
+        .startup = irq_zero,            /* startup */
+        .shutdown = irq_nop,            /* shutdown */
+        .enable = irq_nop,              /* enable */
+        .disable = irq_nop,             /* disable */
+        .ack = irq_nop,         /* ack */
+        .end = nmi_end,         /* end */
 };
 
 void __init init_IRQ (void)
diff --git a/arch/v850/kernel/sim.c b/arch/v850/kernel/sim.c
index e2cc5580fa2a..17049aaa8f11 100644
--- a/arch/v850/kernel/sim.c
+++ b/arch/v850/kernel/sim.c
@@ -73,13 +73,13 @@ static void irq_nop (unsigned irq) { }
 static unsigned irq_zero (unsigned irq) { return 0; }
 
 static struct hw_interrupt_type sim_irq_type = {
-        "IRQ",
-        irq_zero,               /* startup */
-        irq_nop,                /* shutdown */
-        irq_nop,                /* enable */
-        irq_nop,                /* disable */
-        irq_nop,                /* ack */
-        irq_nop,                /* end */
+        .typename = "IRQ",
+        .startup = irq_zero,            /* startup */
+        .shutdown = irq_nop,            /* shutdown */
+        .enable = irq_nop,              /* enable */
+        .disable = irq_nop,             /* disable */
+        .ack = irq_nop,         /* ack */
+        .end = irq_nop,         /* end */
 };
 
 void __init mach_init_irqs (void)
diff --git a/arch/v850/kernel/time.c b/arch/v850/kernel/time.c
index f722a268238a..ea3fd8844ff0 100644
--- a/arch/v850/kernel/time.c
+++ b/arch/v850/kernel/time.c
@@ -66,7 +66,7 @@ static irqreturn_t timer_interrupt (int irq, void *dummy, struct pt_regs *regs)
          * CMOS clock accordingly every ~11 minutes. Set_rtc_mmss() has to be
          * called as close as possible to 500 ms before the new second starts.
          */
-        if ((time_status & STA_UNSYNC) == 0 &&
+        if (ntp_synced() &&
             xtime.tv_sec > last_rtc_update + 660 &&
             (xtime.tv_nsec / 1000) >= 500000 - ((unsigned) TICK_SIZE) / 2 &&
             (xtime.tv_nsec / 1000) <= 500000 + ((unsigned) TICK_SIZE) / 2) {
@@ -169,10 +169,7 @@ int do_settimeofday(struct timespec *tv)
         xtime.tv_sec = tv->tv_sec;
         xtime.tv_nsec = tv->tv_nsec;
 
-        time_adjust = 0;                /* stop active adjtime () */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         write_sequnlock_irq (&xtime_lock);
         clock_was_set();
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 75e52c57f19c..e63323e03ea9 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -65,6 +65,10 @@ config GENERIC_IOMAP
         bool
         default y
 
+config ARCH_MAY_HAVE_PC_FDC
+        bool
+        default y
+
 source "init/Kconfig"
 
 
@@ -148,7 +152,6 @@ config X86_CPUID
           with major 203 and minors 0 to 31 for /dev/cpu/0/cpuid to
           /dev/cpu/31/cpuid.
 
-# disable it for opteron optimized builds because it pulls in ACPI_BOOT
 config X86_HT
         bool
         depends on SMP && !MK8
@@ -441,6 +444,11 @@ config ISA_DMA_API
         bool
         default y
 
+config GENERIC_PENDING_IRQ
+        bool
+        depends on GENERIC_HARDIRQS && SMP
+        default y
+
 menu "Power management options"
 
 source kernel/power/Kconfig
@@ -465,7 +473,6 @@ config PCI_DIRECT
 config PCI_MMCONFIG
         bool "Support mmconfig PCI config space access"
         depends on PCI && ACPI
-        select ACPI_BOOT
 
 config UNORDERED_IO
        bool "Unordered IO mapping access"
diff --git a/arch/x86_64/Makefile b/arch/x86_64/Makefile
index 4c6ed96d5f7c..a9cd42e61828 100644
--- a/arch/x86_64/Makefile
+++ b/arch/x86_64/Makefile
@@ -86,16 +86,6 @@ install fdimage fdimage144 fdimage288: vmlinux
 archclean:
         $(Q)$(MAKE) $(clean)=$(boot)
 
-prepare: include/asm-$(ARCH)/offset.h
-
-arch/$(ARCH)/kernel/asm-offsets.s: include/asm include/linux/version.h \
-                                   include/config/MARKER
-
-include/asm-$(ARCH)/offset.h: arch/$(ARCH)/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-CLEAN_FILES += include/asm-$(ARCH)/offset.h
-
 define archhelp
   echo  '* bzImage      - Compressed kernel image (arch/$(ARCH)/boot/bzImage)'
   echo  '  install      - Install kernel using'
diff --git a/arch/x86_64/boot/setup.S b/arch/x86_64/boot/setup.S
index ff58b2832b75..12ea0b6c52e2 100644
--- a/arch/x86_64/boot/setup.S
+++ b/arch/x86_64/boot/setup.S
@@ -81,7 +81,7 @@ start:
 # This is the setup header, and it must start at %cs:2 (old 0x9020:2)
 
                 .ascii  "HdrS"          # header signature
-                .word   0x0203          # header version number (>= 0x0105)
+                .word   0x0204          # header version number (>= 0x0105)
                                         # or else old loadlin-1.5 will fail)
 realmode_swtch: .word   0, 0            # default_switch, SETUPSEG
 start_sys_seg:  .word   SYSSEG
diff --git a/arch/x86_64/boot/tools/build.c b/arch/x86_64/boot/tools/build.c
index 18b5bac1c428..c44f5e2ec100 100644
--- a/arch/x86_64/boot/tools/build.c
+++ b/arch/x86_64/boot/tools/build.c
@@ -178,7 +178,9 @@ int main(int argc, char ** argv)
                 die("Output: seek failed");
         buf[0] = (sys_size & 0xff);
         buf[1] = ((sys_size >> 8) & 0xff);
-        if (write(1, buf, 2) != 2)
+        buf[2] = ((sys_size >> 16) & 0xff);
+        buf[3] = ((sys_size >> 24) & 0xff);
+        if (write(1, buf, 4) != 4)
                 die("Write of image length failed");
 
         return 0;                                           /* Everything is OK */
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b97a61e1c71c..bf57e2362bf4 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -135,8 +135,6 @@ CONFIG_PM_STD_PARTITION=""
 # ACPI (Advanced Configuration and Power Interface) Support
 #
 CONFIG_ACPI=y
-CONFIG_ACPI_BOOT=y
-CONFIG_ACPI_INTERPRETER=y
 CONFIG_ACPI_AC=y
 CONFIG_ACPI_BATTERY=y
 CONFIG_ACPI_BUTTON=y
@@ -151,10 +149,8 @@ CONFIG_ACPI_NUMA=y
 CONFIG_ACPI_TOSHIBA=y
 CONFIG_ACPI_BLACKLIST_YEAR=2001
 # CONFIG_ACPI_DEBUG is not set
-CONFIG_ACPI_BUS=y
 CONFIG_ACPI_EC=y
 CONFIG_ACPI_POWER=y
-CONFIG_ACPI_PCI=y
 CONFIG_ACPI_SYSTEM=y
 # CONFIG_ACPI_CONTAINER is not set
 
diff --git a/arch/x86_64/ia32/ia32_ioctl.c b/arch/x86_64/ia32/ia32_ioctl.c
index d259f8a6f811..419758f19ca4 100644
--- a/arch/x86_64/ia32/ia32_ioctl.c
+++ b/arch/x86_64/ia32/ia32_ioctl.c
@@ -24,17 +24,26 @@
 static int tiocgdev(unsigned fd, unsigned cmd,  unsigned int __user *ptr) 
 { 
 
-        struct file *file = fget(fd);
+        struct file *file;
         struct tty_struct *real_tty;
+        int fput_needed, ret;
 
+        file = fget_light(fd, &fput_needed);
         if (!file)
                 return -EBADF;
+
+        ret = -EINVAL;
         if (file->f_op->ioctl != tty_ioctl)
-                return -EINVAL; 
+                goto out;
         real_tty = (struct tty_struct *)file->private_data;
         if (!real_tty)  
-                return -EINVAL; 
-        return put_user(new_encode_dev(tty_devnum(real_tty)), ptr); 
+                goto out;
+
+        ret = put_user(new_encode_dev(tty_devnum(real_tty)), ptr); 
+
+out:
+        fput_light(file, fput_needed);
+        return ret;
 } 
 
 #define RTC_IRQP_READ32 _IOR('p', 0x0b, unsigned int)    /* Read IRQ rate   */
diff --git a/arch/x86_64/ia32/ia32entry.S b/arch/x86_64/ia32/ia32entry.S
index c45d6a05b984..5244f803203d 100644
--- a/arch/x86_64/ia32/ia32entry.S
+++ b/arch/x86_64/ia32/ia32entry.S
@@ -6,7 +6,7 @@
 
 #include <asm/dwarf2.h>
 #include <asm/calling.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/current.h>
 #include <asm/errno.h>
 #include <asm/ia32_unistd.h>    
@@ -307,7 +307,7 @@ ia32_sys_call_table:
         .quad stub32_fork
         .quad sys_read
         .quad sys_write
-        .quad sys32_open                /* 5 */
+        .quad compat_sys_open           /* 5 */
         .quad sys_close
         .quad sys32_waitpid
         .quad sys_creat
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index be996d1b691e..04d80406ce4f 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -969,32 +969,6 @@ long sys32_kill(int pid, int sig)
         return sys_kill(pid, sig);
 }
  
-asmlinkage long sys32_open(const char __user * filename, int flags, int mode)
-{
-        char * tmp;
-        int fd, error;
-
-        /* don't force O_LARGEFILE */
-        tmp = getname(filename);
-        fd = PTR_ERR(tmp);
-        if (!IS_ERR(tmp)) {
-                fd = get_unused_fd();
-                if (fd >= 0) {
-                        struct file *f = filp_open(tmp, flags, mode);
-                        error = PTR_ERR(f);
-                        if (IS_ERR(f)) {
-                                put_unused_fd(fd); 
-                                fd = error;
-                        } else {
-                                fsnotify_open(f->f_dentry);
-                                fd_install(fd, f);
-                        }
-                }
-                putname(tmp);
-        }
-        return fd;
-}
-
 extern asmlinkage long
 sys_timer_create(clockid_t which_clock,
                  struct sigevent __user *timer_event_spec,
diff --git a/arch/x86_64/ia32/vsyscall-syscall.S b/arch/x86_64/ia32/vsyscall-syscall.S
index e2aaf3de8a42..b024965bb689 100644
--- a/arch/x86_64/ia32/vsyscall-syscall.S
+++ b/arch/x86_64/ia32/vsyscall-syscall.S
@@ -3,7 +3,7 @@
  */
 
 #include <asm/ia32_unistd.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/segment.h>
 
         .text
diff --git a/arch/x86_64/ia32/vsyscall-sysenter.S b/arch/x86_64/ia32/vsyscall-sysenter.S
index 8fb8e0ff3afa..71f3de586b56 100644
--- a/arch/x86_64/ia32/vsyscall-sysenter.S
+++ b/arch/x86_64/ia32/vsyscall-sysenter.S
@@ -3,7 +3,7 @@
  */
 
 #include <asm/ia32_unistd.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 
         .text
         .section .text.vsyscall,"ax"
diff --git a/arch/x86_64/kernel/Makefile b/arch/x86_64/kernel/Makefile
index c32e198d7b2b..1579bdd0adcd 100644
--- a/arch/x86_64/kernel/Makefile
+++ b/arch/x86_64/kernel/Makefile
@@ -12,7 +12,7 @@ obj-y	:= process.o signal.o entry.o traps.o irq.o \
 obj-$(CONFIG_X86_MCE)         += mce.o
 obj-$(CONFIG_X86_MCE_INTEL)     += mce_intel.o
 obj-$(CONFIG_MTRR)              += ../../i386/kernel/cpu/mtrr/
-obj-$(CONFIG_ACPI_BOOT)         += acpi/
+obj-$(CONFIG_ACPI)              += acpi/
 obj-$(CONFIG_X86_MSR)           += msr.o
 obj-$(CONFIG_MICROCODE)         += microcode.o
 obj-$(CONFIG_X86_CPUID)         += cpuid.o
diff --git a/arch/x86_64/kernel/acpi/Makefile b/arch/x86_64/kernel/acpi/Makefile
index d2c2ee5f9a88..7da9ace890bd 100644
--- a/arch/x86_64/kernel/acpi/Makefile
+++ b/arch/x86_64/kernel/acpi/Makefile
@@ -1,3 +1,3 @@
-obj-$(CONFIG_ACPI_BOOT)         := boot.o
-boot-$(CONFIG_ACPI_BOOT)        := ../../../i386/kernel/acpi/boot.o
+obj-y                   := boot.o
+boot-y                  := ../../../i386/kernel/acpi/boot.o
 obj-$(CONFIG_ACPI_SLEEP)        += sleep.o wakeup.o
diff --git a/arch/x86_64/kernel/acpi/sleep.c b/arch/x86_64/kernel/acpi/sleep.c
index 7a275de6df22..148f6f7ea315 100644
--- a/arch/x86_64/kernel/acpi/sleep.c
+++ b/arch/x86_64/kernel/acpi/sleep.c
@@ -47,7 +47,6 @@
 #include <asm/proto.h>
 #include <asm/tlbflush.h>
 
-
 /* --------------------------------------------------------------------------
                               Low-Level Sleep Support
    -------------------------------------------------------------------------- */
@@ -77,11 +76,12 @@ static void init_low_mapping(void)
  * Create an identity mapped page table and copy the wakeup routine to
  * low memory.
  */
-int acpi_save_state_mem (void)
+int acpi_save_state_mem(void)
 {
         init_low_mapping();
 
-        memcpy((void *) acpi_wakeup_address, &wakeup_start, &wakeup_end - &wakeup_start);
+        memcpy((void *)acpi_wakeup_address, &wakeup_start,
+               &wakeup_end - &wakeup_start);
         acpi_copy_wakeup_routine(acpi_wakeup_address);
 
         return 0;
@@ -90,7 +90,7 @@ int acpi_save_state_mem (void)
 /*
  * acpi_restore_state
  */
-void acpi_restore_state_mem (void)
+void acpi_restore_state_mem(void)
 {
         set_pgd(pgd_offset(current->mm, 0UL), low_ptr);
         flush_tlb_all();
@@ -108,7 +108,8 @@ void __init acpi_reserve_bootmem(void)
 {
         acpi_wakeup_address = (unsigned long)alloc_bootmem_low(PAGE_SIZE);
         if ((&wakeup_end - &wakeup_start) > PAGE_SIZE)
-                printk(KERN_CRIT "ACPI: Wakeup code way too big, will crash on attempt to suspend\n");
+                printk(KERN_CRIT
+                       "ACPI: Wakeup code way too big, will crash on attempt to suspend\n");
 }
 
 static int __init acpi_sleep_setup(char *str)
@@ -127,6 +128,8 @@ static int __init acpi_sleep_setup(char *str)
 
 __setup("acpi_sleep=", acpi_sleep_setup);
 
-#endif /*CONFIG_ACPI_SLEEP*/
+#endif                          /*CONFIG_ACPI_SLEEP */
 
-void acpi_pci_link_exit(void) {}
+void acpi_pci_link_exit(void)
+{
+}
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index b548dea4e5b9..bb0ae18ec02b 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -85,7 +85,7 @@ int __init e820_mapped(unsigned long start, unsigned long end, unsigned type)
                 struct e820entry *ei = &e820.map[i]; 
                 if (type && ei->type != type) 
                         continue;
-                if (ei->addr >= end || ei->addr + ei->size < start) 
+                if (ei->addr >= end || ei->addr + ei->size <= start)
                         continue; 
                 return 1; 
         } 
@@ -567,7 +567,7 @@ unsigned long pci_mem_start = 0xaeedbabe;
  */
 __init void e820_setup_gap(void)
 {
-        unsigned long gapstart, gapsize;
+        unsigned long gapstart, gapsize, round;
         unsigned long last;
         int i;
         int found = 0;
@@ -604,14 +604,14 @@ __init void e820_setup_gap(void)
         }
 
         /*
-         * Start allocating dynamic PCI memory a bit into the gap,
-         * aligned up to the nearest megabyte.
-         *
-         * Question: should we try to pad it up a bit (do something
-         * like " + (gapsize >> 3)" in there too?). We now have the
-         * technology.
+         * See how much we want to round up: start off with
+         * rounding to the next 1MB area.
          */
-        pci_mem_start = (gapstart + 0xfffff) & ~0xfffff;
+        round = 0x100000;
+        while ((gapsize >> 4) > round)
+                round += round;
+        /* Fun with two's complement */
+        pci_mem_start = (gapstart + round) & -round;
 
         printk(KERN_INFO "Allocating PCI resources starting at %lx (gap: %lx:%lx)\n",
                 pci_mem_start, gapstart, gapsize);
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index 096d470e280f..3620508c8bd9 100644
--- a/arch/x86_64/kernel/entry.S
+++ b/arch/x86_64/kernel/entry.S
@@ -36,7 +36,7 @@
 #include <asm/errno.h>
 #include <asm/dwarf2.h>
 #include <asm/calling.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/msr.h>
 #include <asm/unistd.h>
 #include <asm/thread_info.h>
@@ -784,8 +784,9 @@ ENTRY(execve)
         ret
         CFI_ENDPROC
 
-ENTRY(page_fault)
+KPROBE_ENTRY(page_fault)
         errorentry do_page_fault
+        .previous .text
 
 ENTRY(coprocessor_error)
         zeroentry do_coprocessor_error
@@ -797,13 +798,14 @@ ENTRY(device_not_available)
         zeroentry math_state_restore
 
         /* runs on exception stack */
-ENTRY(debug)
+KPROBE_ENTRY(debug)
         CFI_STARTPROC
         pushq $0
         CFI_ADJUST_CFA_OFFSET 8         
         paranoidentry do_debug
         jmp paranoid_exit
         CFI_ENDPROC
+        .previous .text
 
         /* runs on exception stack */   
 ENTRY(nmi)
@@ -854,8 +856,9 @@ paranoid_schedule:
         jmp paranoid_userspace
         CFI_ENDPROC
 
-ENTRY(int3)
+KPROBE_ENTRY(int3)
         zeroentry do_int3       
+        .previous .text
 
 ENTRY(overflow)
         zeroentry do_overflow
@@ -892,8 +895,9 @@ ENTRY(stack_segment)
         jmp paranoid_exit
         CFI_ENDPROC
 
-ENTRY(general_protection)
+KPROBE_ENTRY(general_protection)
         errorentry do_general_protection
+        .previous .text
 
 ENTRY(alignment_check)
         errorentry do_alignment_check
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c
index 30c843a5efdd..b1c144f73149 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86_64/kernel/genapic.c
@@ -20,12 +20,12 @@
 #include <asm/smp.h>
 #include <asm/ipi.h>
 
-#if defined(CONFIG_ACPI_BUS)
+#if defined(CONFIG_ACPI)
 #include <acpi/acpi_bus.h>
 #endif
 
 /* which logical CPU number maps to which CPU (physical APIC ID) */
-u8 x86_cpu_to_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
+u8 x86_cpu_to_apicid[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
 EXPORT_SYMBOL(x86_cpu_to_apicid);
 u8 x86_cpu_to_log_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
 
@@ -47,7 +47,7 @@ void __init clustered_apic_check(void)
         u8 cluster_cnt[NUM_APIC_CLUSTERS];
         int num_cpus = 0;
 
-#if defined(CONFIG_ACPI_BUS)
+#if defined(CONFIG_ACPI)
         /*
          * Some x86_64 machines use physical APIC mode regardless of how many
          * procs/clusters are present (x86_64 ES7000 is an example).
diff --git a/arch/x86_64/kernel/genapic_cluster.c b/arch/x86_64/kernel/genapic_cluster.c
index 9703da7202e3..f6523dd1bc09 100644
--- a/arch/x86_64/kernel/genapic_cluster.c
+++ b/arch/x86_64/kernel/genapic_cluster.c
@@ -72,10 +72,14 @@ static void cluster_send_IPI_mask(cpumask_t mask, int vector)
 static void cluster_send_IPI_allbutself(int vector)
 {
         cpumask_t mask = cpu_online_map;
-        cpu_clear(smp_processor_id(), mask);
+        int me = get_cpu(); /* Ensure we are not preempted when we clear */
+
+        cpu_clear(me, mask);
 
         if (!cpus_empty(mask))
                 cluster_send_IPI_mask(mask, vector);
+
+        put_cpu();
 }
 
 static void cluster_send_IPI_all(int vector)
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c
index adc96282a9e2..6d57da96bf8c 100644
--- a/arch/x86_64/kernel/genapic_flat.c
+++ b/arch/x86_64/kernel/genapic_flat.c
@@ -78,8 +78,18 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector)
 
 static void flat_send_IPI_allbutself(int vector)
 {
+#ifndef CONFIG_HOTPLUG_CPU
         if (((num_online_cpus()) - 1) >= 1)
                 __send_IPI_shortcut(APIC_DEST_ALLBUT, vector,APIC_DEST_LOGICAL);
+#else
+        cpumask_t allbutme = cpu_online_map;
+        int me = get_cpu(); /* Ensure we are not preempted when we clear */
+        cpu_clear(me, allbutme);
+
+        if (!cpus_empty(allbutme))
+                flat_send_IPI_mask(allbutme, vector);
+        put_cpu();
+#endif
 }
 
 static void flat_send_IPI_all(int vector)
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index d206d7e49cf5..5f1529be1237 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -70,7 +70,7 @@ static struct irq_pin_list {
         short apic, pin, next;
 } irq_2_pin[PIN_MAP_SIZE];
 
-int vector_irq[NR_VECTORS] = { [0 ... NR_VECTORS - 1] = -1};
+int vector_irq[NR_VECTORS] __read_mostly = { [0 ... NR_VECTORS - 1] = -1};
 #ifdef CONFIG_PCI_MSI
 #define vector_to_irq(vector)   \
         (platform_legacy_irq(vector) ? vector : vector_irq[vector])
@@ -78,6 +78,54 @@ int vector_irq[NR_VECTORS] = { [0 ... NR_VECTORS - 1] = -1};
 #define vector_to_irq(vector)   (vector)
 #endif
 
+#define __DO_ACTION(R, ACTION, FINAL)                                   \
+                                                                        \
+{                                                                       \
+        int pin;                                                        \
+        struct irq_pin_list *entry = irq_2_pin + irq;                   \
+                                                                        \
+        for (;;) {                                                      \
+                unsigned int reg;                                       \
+                pin = entry->pin;                                       \
+                if (pin == -1)                                          \
+                        break;                                          \
+                reg = io_apic_read(entry->apic, 0x10 + R + pin*2);      \
+                reg ACTION;                                             \
+                io_apic_modify(entry->apic, reg);                       \
+                if (!entry->next)                                       \
+                        break;                                          \
+                entry = irq_2_pin + entry->next;                        \
+        }                                                               \
+        FINAL;                                                          \
+}
+
+#ifdef CONFIG_SMP
+static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
+{
+        unsigned long flags;
+        unsigned int dest;
+        cpumask_t tmp;
+
+        cpus_and(tmp, mask, cpu_online_map);
+        if (cpus_empty(tmp))
+                tmp = TARGET_CPUS;
+
+        cpus_and(mask, tmp, CPU_MASK_ALL);
+
+        dest = cpu_mask_to_apicid(mask);
+
+        /*
+         * Only the high 8 bits are valid.
+         */
+        dest = SET_APIC_LOGICAL_ID(dest);
+
+        spin_lock_irqsave(&ioapic_lock, flags);
+        __DO_ACTION(1, = dest, )
+        set_irq_info(irq, mask);
+        spin_unlock_irqrestore(&ioapic_lock, flags);
+}
+#endif
+
 /*
  * The common case is 1:1 IRQ<->pin mappings. Sometimes there are
  * shared ISA-space IRQs, so we have to support them. We are super
@@ -101,26 +149,6 @@ static void add_pin_to_irq(unsigned int irq, int apic, int pin)
         entry->pin = pin;
 }
 
-#define __DO_ACTION(R, ACTION, FINAL)                                   \
-                                                                        \
-{                                                                       \
-        int pin;                                                        \
-        struct irq_pin_list *entry = irq_2_pin + irq;                   \
-                                                                        \
-        for (;;) {                                                      \
-                unsigned int reg;                                       \
-                pin = entry->pin;                                       \
-                if (pin == -1)                                          \
-                        break;                                          \
-                reg = io_apic_read(entry->apic, 0x10 + R + pin*2);      \
-                reg ACTION;                                             \
-                io_apic_modify(entry->apic, reg);                       \
-                if (!entry->next)                                       \
-                        break;                                          \
-                entry = irq_2_pin + entry->next;                        \
-        }                                                               \
-        FINAL;                                                          \
-}
 
 #define DO_ACTION(name,R,ACTION, FINAL)                                 \
                                                                         \
@@ -655,7 +683,7 @@ static inline int IO_APIC_irq_trigger(int irq)
 }
 
 /* irq_vectors is indexed by the sum of all RTEs in all I/O APICs. */
-u8 irq_vector[NR_IRQ_VECTORS] = { FIRST_DEVICE_VECTOR , 0 };
+u8 irq_vector[NR_IRQ_VECTORS] __read_mostly = { FIRST_DEVICE_VECTOR , 0 };
 
 int assign_irq_vector(int irq)
 {
@@ -767,6 +795,7 @@ static void __init setup_IO_APIC_irqs(void)
                 spin_lock_irqsave(&ioapic_lock, flags);
                 io_apic_write(apic, 0x11+2*pin, *(((int *)&entry)+1));
                 io_apic_write(apic, 0x10+2*pin, *(((int *)&entry)+0));
+                set_native_irq_info(irq, TARGET_CPUS);
                 spin_unlock_irqrestore(&ioapic_lock, flags);
         }
         }
@@ -1138,9 +1167,9 @@ void disable_IO_APIC(void)
         clear_IO_APIC();
 
         /*
-         * If the i82559 is routed through an IOAPIC
+         * If the i8259 is routed through an IOAPIC
          * Put that IOAPIC in virtual wire mode
-         * so legacy interrups can be delivered.
+         * so legacy interrupts can be delivered.
          */
         pin = find_isa_irq_pin(0, mp_ExtINT);
         if (pin != -1) {
@@ -1314,6 +1343,7 @@ static unsigned int startup_edge_ioapic_irq(unsigned int irq)
  */
 static void ack_edge_ioapic_irq(unsigned int irq)
 {
+        move_irq(irq);
         if ((irq_desc[irq].status & (IRQ_PENDING | IRQ_DISABLED))
                                         == (IRQ_PENDING | IRQ_DISABLED))
                 mask_IO_APIC_irq(irq);
@@ -1343,26 +1373,10 @@ static unsigned int startup_level_ioapic_irq (unsigned int irq)
 
 static void end_level_ioapic_irq (unsigned int irq)
 {
+        move_irq(irq);
         ack_APIC_irq();
 }
 
-static void set_ioapic_affinity_irq(unsigned int irq, cpumask_t mask)
-{
-        unsigned long flags;
-        unsigned int dest;
-
-        dest = cpu_mask_to_apicid(mask);
-
-        /*
-         * Only the high 8 bits are valid.
-         */
-        dest = SET_APIC_LOGICAL_ID(dest);
-
-        spin_lock_irqsave(&ioapic_lock, flags);
-        __DO_ACTION(1, = dest, )
-        spin_unlock_irqrestore(&ioapic_lock, flags);
-}
-
 #ifdef CONFIG_PCI_MSI
 static unsigned int startup_edge_ioapic_vector(unsigned int vector)
 {
@@ -1375,6 +1389,7 @@ static void ack_edge_ioapic_vector(unsigned int vector)
 {
         int irq = vector_to_irq(vector);
 
+        move_native_irq(vector);
         ack_edge_ioapic_irq(irq);
 }
 
@@ -1389,6 +1404,7 @@ static void end_level_ioapic_vector (unsigned int vector)
 {
         int irq = vector_to_irq(vector);
 
+        move_native_irq(vector);
         end_level_ioapic_irq(irq);
 }
 
@@ -1406,14 +1422,17 @@ static void unmask_IO_APIC_vector (unsigned int vector)
         unmask_IO_APIC_irq(irq);
 }
 
+#ifdef CONFIG_SMP
 static void set_ioapic_affinity_vector (unsigned int vector,
                                         cpumask_t cpu_mask)
 {
         int irq = vector_to_irq(vector);
 
+        set_native_irq_info(vector, cpu_mask);
         set_ioapic_affinity_irq(irq, cpu_mask);
 }
-#endif
+#endif // CONFIG_SMP
+#endif // CONFIG_PCI_MSI
 
 /*
  * Level and edge triggered IO-APIC interrupts need different handling,
@@ -1424,7 +1443,7 @@ static void set_ioapic_affinity_vector (unsigned int vector,
  * races.
  */
 
-static struct hw_interrupt_type ioapic_edge_type = {
+static struct hw_interrupt_type ioapic_edge_type __read_mostly = {
         .typename = "IO-APIC-edge",
         .startup        = startup_edge_ioapic,
         .shutdown       = shutdown_edge_ioapic,
@@ -1432,10 +1451,12 @@ static struct hw_interrupt_type ioapic_edge_type = {
         .disable        = disable_edge_ioapic,
         .ack            = ack_edge_ioapic,
         .end            = end_edge_ioapic,
+#ifdef CONFIG_SMP
         .set_affinity = set_ioapic_affinity,
+#endif
 };
 
-static struct hw_interrupt_type ioapic_level_type = {
+static struct hw_interrupt_type ioapic_level_type __read_mostly = {
         .typename = "IO-APIC-level",
         .startup        = startup_level_ioapic,
         .shutdown       = shutdown_level_ioapic,
@@ -1443,7 +1464,9 @@ static struct hw_interrupt_type ioapic_level_type = {
         .disable        = disable_level_ioapic,
         .ack            = mask_and_ack_level_ioapic,
         .end            = end_level_ioapic,
+#ifdef CONFIG_SMP
         .set_affinity = set_ioapic_affinity,
+#endif
 };
 
 static inline void init_IO_APIC_traps(void)
@@ -1506,7 +1529,7 @@ static void ack_lapic_irq (unsigned int irq)
 
 static void end_lapic_irq (unsigned int i) { /* nothing */ }
 
-static struct hw_interrupt_type lapic_irq_type = {
+static struct hw_interrupt_type lapic_irq_type __read_mostly = {
         .typename = "local-APIC-edge",
         .startup = NULL, /* startup_irq() not used for IRQ0 */
         .shutdown = NULL, /* shutdown_irq() not used for IRQ0 */
@@ -1841,7 +1864,7 @@ device_initcall(ioapic_init_sysfs);
                           ACPI-based IOAPIC Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 #define IO_APIC_MAX_ID          0xFE
 
@@ -1918,12 +1941,13 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         spin_lock_irqsave(&ioapic_lock, flags);
         io_apic_write(ioapic, 0x11+2*pin, *(((int *)&entry)+1));
         io_apic_write(ioapic, 0x10+2*pin, *(((int *)&entry)+0));
+        set_native_irq_info(use_pci_vector() ?  entry.vector : irq, TARGET_CPUS);
         spin_unlock_irqrestore(&ioapic_lock, flags);
 
         return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
 
 
 /*
@@ -1931,6 +1955,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
  * we need to reprogram the ioredtbls to cater for the cpus which have come online
  * so mask in all cases should simply be TARGET_CPUS
  */
+#ifdef CONFIG_SMP
 void __init setup_ioapic_dest(void)
 {
         int pin, ioapic, irq, irq_entry;
@@ -1949,3 +1974,4 @@ void __init setup_ioapic_dest(void)
 
         }
 }
+#endif
diff --git a/arch/x86_64/kernel/kprobes.c b/arch/x86_64/kernel/kprobes.c
index 5c6dc7051482..df08c43276a0 100644
--- a/arch/x86_64/kernel/kprobes.c
+++ b/arch/x86_64/kernel/kprobes.c
@@ -74,7 +74,7 @@ static inline int is_IF_modifier(kprobe_opcode_t *insn)
         return 0;
 }
 
-int arch_prepare_kprobe(struct kprobe *p)
+int __kprobes arch_prepare_kprobe(struct kprobe *p)
 {
         /* insn: must be on special executable page on x86_64. */
         up(&kprobe_mutex);
@@ -189,7 +189,7 @@ static inline s32 *is_riprel(u8 *insn)
         return NULL;
 }
 
-void arch_copy_kprobe(struct kprobe *p)
+void __kprobes arch_copy_kprobe(struct kprobe *p)
 {
         s32 *ripdisp;
         memcpy(p->ainsn.insn, p->addr, MAX_INSN_SIZE);
@@ -215,21 +215,21 @@ void arch_copy_kprobe(struct kprobe *p)
         p->opcode = *p->addr;
 }
 
-void arch_arm_kprobe(struct kprobe *p)
+void __kprobes arch_arm_kprobe(struct kprobe *p)
 {
         *p->addr = BREAKPOINT_INSTRUCTION;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_disarm_kprobe(struct kprobe *p)
+void __kprobes arch_disarm_kprobe(struct kprobe *p)
 {
         *p->addr = p->opcode;
         flush_icache_range((unsigned long) p->addr,
                            (unsigned long) p->addr + sizeof(kprobe_opcode_t));
 }
 
-void arch_remove_kprobe(struct kprobe *p)
+void __kprobes arch_remove_kprobe(struct kprobe *p)
 {
         up(&kprobe_mutex);
         free_insn_slot(p->ainsn.insn);
@@ -261,7 +261,7 @@ static inline void set_current_kprobe(struct kprobe *p, struct pt_regs *regs)
                 kprobe_saved_rflags &= ~IF_MASK;
 }
 
-static void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
 {
         regs->eflags |= TF_MASK;
         regs->eflags &= ~IF_MASK;
@@ -272,7 +272,8 @@ static void prepare_singlestep(struct kprobe *p, struct pt_regs *regs)
                 regs->rip = (unsigned long)p->ainsn.insn;
 }
 
-void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
+void __kprobes arch_prepare_kretprobe(struct kretprobe *rp,
+                                      struct pt_regs *regs)
 {
         unsigned long *sara = (unsigned long *)regs->rsp;
         struct kretprobe_instance *ri;
@@ -295,7 +296,7 @@ void arch_prepare_kretprobe(struct kretprobe *rp, struct pt_regs *regs)
  * Interrupts are disabled on entry as trap3 is an interrupt gate and they
  * remain disabled thorough out this function.
  */
-int kprobe_handler(struct pt_regs *regs)
+int __kprobes kprobe_handler(struct pt_regs *regs)
 {
         struct kprobe *p;
         int ret = 0;
@@ -310,7 +311,8 @@ int kprobe_handler(struct pt_regs *regs)
                    Disarm the probe we just hit, and ignore it. */
                 p = get_kprobe(addr);
                 if (p) {
-                        if (kprobe_status == KPROBE_HIT_SS) {
+                        if (kprobe_status == KPROBE_HIT_SS &&
+                                *p->ainsn.insn == BREAKPOINT_INSTRUCTION) {
                                 regs->eflags &= ~TF_MASK;
                                 regs->eflags |= kprobe_saved_rflags;
                                 unlock_kprobes();
@@ -360,7 +362,10 @@ int kprobe_handler(struct pt_regs *regs)
                          * either a probepoint or a debugger breakpoint
                          * at this address.  In either case, no further
                          * handling of this interrupt is appropriate.
+                         * Back up over the (now missing) int3 and run
+                         * the original instruction.
                          */
+                        regs->rip = (unsigned long)addr;
                         ret = 1;
                 }
                 /* Not one of ours: let kernel handle it */
@@ -399,7 +404,7 @@ no_kprobe:
 /*
  * Called when we hit the probe point at kretprobe_trampoline
  */
-int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct kretprobe_instance *ri = NULL;
         struct hlist_head *head;
@@ -478,7 +483,7 @@ int trampoline_probe_handler(struct kprobe *p, struct pt_regs *regs)
  * that is atop the stack is the address following the copied instruction.
  * We need to make it the address following the original instruction.
  */
-static void resume_execution(struct kprobe *p, struct pt_regs *regs)
+static void __kprobes resume_execution(struct kprobe *p, struct pt_regs *regs)
 {
         unsigned long *tos = (unsigned long *)regs->rsp;
         unsigned long next_rip = 0;
@@ -536,7 +541,7 @@ static void resume_execution(struct kprobe *p, struct pt_regs *regs)
  * Interrupts are disabled on entry as trap1 is an interrupt gate and they
  * remain disabled thoroughout this function.  And we hold kprobe lock.
  */
-int post_kprobe_handler(struct pt_regs *regs)
+int __kprobes post_kprobe_handler(struct pt_regs *regs)
 {
         if (!kprobe_running())
                 return 0;
@@ -571,7 +576,7 @@ out:
 }
 
 /* Interrupts disabled, kprobe_lock held. */
-int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
+int __kprobes kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 {
         if (current_kprobe->fault_handler
             && current_kprobe->fault_handler(current_kprobe, regs, trapnr))
@@ -590,8 +595,8 @@ int kprobe_fault_handler(struct pt_regs *regs, int trapnr)
 /*
  * Wrapper routine for handling exceptions.
  */
-int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
-                             void *data)
+int __kprobes kprobe_exceptions_notify(struct notifier_block *self,
+                                       unsigned long val, void *data)
 {
         struct die_args *args = (struct die_args *)data;
         switch (val) {
@@ -619,7 +624,7 @@ int kprobe_exceptions_notify(struct notifier_block *self, unsigned long val,
         return NOTIFY_DONE;
 }
 
-int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
 {
         struct jprobe *jp = container_of(p, struct jprobe, kp);
         unsigned long addr;
@@ -640,7 +645,7 @@ int setjmp_pre_handler(struct kprobe *p, struct pt_regs *regs)
         return 1;
 }
 
-void jprobe_return(void)
+void __kprobes jprobe_return(void)
 {
         preempt_enable_no_resched();
         asm volatile ("       xchg   %%rbx,%%rsp     \n"
@@ -651,7 +656,7 @@ void jprobe_return(void)
                       (jprobe_saved_rsp):"memory");
 }
 
-int longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
+int __kprobes longjmp_break_handler(struct kprobe *p, struct pt_regs *regs)
 {
         u8 *addr = (u8 *) (regs->rip - 1);
         unsigned long stack_addr = (unsigned long)jprobe_saved_rsp;
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 79c362d03e2e..8d8ed6ae1d0c 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -74,7 +74,7 @@ static unsigned int num_processors = 0;
 physid_mask_t phys_cpu_present_map = PHYSID_MASK_NONE;
 
 /* ACPI MADT entry parsing functions */
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 extern struct acpi_boot_flags acpi_boot;
 #ifdef CONFIG_X86_LOCAL_APIC
 extern int acpi_parse_lapic (acpi_table_entry_header *header);
@@ -84,7 +84,7 @@ extern int acpi_parse_lapic_nmi (acpi_table_entry_header *header);
 #ifdef CONFIG_X86_IO_APIC
 extern int acpi_parse_ioapic (acpi_table_entry_header *header);
 #endif /*CONFIG_X86_IO_APIC*/
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /*CONFIG_ACPI*/
 
 u8 bios_cpu_apicid[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
 
@@ -519,8 +519,6 @@ void __init get_smp_config (void)
         struct intel_mp_floating *mpf = mpf_found;
 
         /*
-         * ACPI may be used to obtain the entire SMP configuration or just to 
-         * enumerate/configure processors (CONFIG_ACPI_BOOT).  Note that 
          * ACPI supports both logical (e.g. Hyper-Threading) and physical 
          * processors, where MPS only supports physical.
          */
@@ -673,7 +671,7 @@ void __init find_smp_config (void)
                             ACPI-based MP Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 void __init mp_register_lapic_address (
         u64                     address)
@@ -929,11 +927,9 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
         if (acpi_irq_model != ACPI_IRQ_MODEL_IOAPIC)
                 return gsi;
 
-#ifdef CONFIG_ACPI_BUS
         /* Don't set up the ACPI SCI because it's already set up */
         if (acpi_fadt.sci_int == gsi)
                 return gsi;
-#endif
 
         ioapic = mp_find_ioapic(gsi);
         if (ioapic < 0) {
@@ -973,13 +969,11 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
                 if (gsi < MAX_GSI_NUM) {
                         if (gsi > 15)
                                 gsi = pci_irq++;
-#ifdef CONFIG_ACPI_BUS
                         /*
                          * Don't assign IRQ used by ACPI SCI
                          */
                         if (gsi == acpi_fadt.sci_int)
                                 gsi = pci_irq++;
-#endif
                         gsi_to_irq[irq] = gsi;
                 } else {
                         printk(KERN_ERR "GSI %u is too high\n", gsi);
@@ -994,4 +988,4 @@ int mp_register_gsi(u32 gsi, int edge_level, int active_high_low)
 }
 
 #endif /*CONFIG_X86_IO_APIC*/
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /*CONFIG_ACPI*/
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 64a8e05d5811..caf164959e19 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -463,6 +463,8 @@ void touch_nmi_watchdog (void)
          */
         for (i = 0; i < NR_CPUS; i++)
                 per_cpu(nmi_touch, i) = 1;
+
+        touch_softlockup_watchdog();
 }
 
 void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason)
@@ -522,14 +524,14 @@ asmlinkage void do_nmi(struct pt_regs * regs, long error_code)
 
         nmi_enter();
         add_pda(__nmi_count,1);
-        if (!nmi_callback(regs, cpu))
+        if (!rcu_dereference(nmi_callback)(regs, cpu))
                 default_do_nmi(regs);
         nmi_exit();
 }
 
 void set_nmi_callback(nmi_callback_t callback)
 {
-        nmi_callback = callback;
+        rcu_assign_pointer(nmi_callback, callback);
 }
 
 void unset_nmi_callback(void)
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 7577f9d7a75d..8661f82ac70b 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -310,6 +310,7 @@ void __show_regs(struct pt_regs * regs)
 
 void show_regs(struct pt_regs *regs)
 {
+        printk("CPU %d:", smp_processor_id());
         __show_regs(regs);
         show_trace(&regs->rsp);
 }
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 116a491e2961..9aec524be3eb 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -65,13 +65,13 @@
  * Machine setup..
  */
 
-struct cpuinfo_x86 boot_cpu_data;
+struct cpuinfo_x86 boot_cpu_data __read_mostly;
 
 unsigned long mmu_cr4_features;
 
 int acpi_disabled;
 EXPORT_SYMBOL(acpi_disabled);
-#ifdef  CONFIG_ACPI_BOOT
+#ifdef  CONFIG_ACPI
 extern int __initdata acpi_ht;
 extern acpi_interrupt_flags     acpi_sci_flags;
 int __initdata acpi_force = 0;
@@ -294,7 +294,7 @@ static __init void parse_cmdline_early (char ** cmdline_p)
                         maxcpus = simple_strtoul(from + 8, NULL, 0);
                 }
 #endif
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
                 /* "acpi=off" disables both ACPI table parsing and interpreter init */
                 if (!memcmp(from, "acpi=off", 8))
                         disable_acpi();
@@ -566,7 +566,7 @@ void __init setup_arch(char **cmdline_p)
 
         init_memory_mapping(0, (end_pfn_map << PAGE_SHIFT));
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /*
          * Initialize the ACPI boot-time table parser (gets the RSDP and SDT).
          * Call this early for SRAT node setup.
@@ -658,7 +658,7 @@ void __init setup_arch(char **cmdline_p)
 
         check_ioapic();
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
         /*
          * Read APIC and some other early information from ACPI tables.
          */
@@ -929,7 +929,7 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
         c->x86_num_cores = intel_num_cpu_cores(c);
 }
 
-void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
+static void __cpuinit get_cpu_vendor(struct cpuinfo_x86 *c)
 {
         char *v = c->x86_vendor_id;
 
diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c
index 34082c1cc41e..e3ffcacc8c90 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -36,7 +36,7 @@ struct desc_ptr idt_descr = { 256 * 16, (unsigned long) idt_table };
 
 char boot_cpu_stack[IRQSTACKSIZE] __attribute__((section(".bss.page_aligned")));
 
-unsigned long __supported_pte_mask = ~0UL;
+unsigned long __supported_pte_mask __read_mostly = ~0UL;
 static int do_not_nx __initdata = 0;
 
 /* noexec=on|off
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index fa25e39fe54d..4fb34b5cb1f9 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -62,13 +62,13 @@
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
 /* Package ID of each logical CPU */
-u8 phys_proc_id[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
-u8 cpu_core_id[NR_CPUS] = { [0 ... NR_CPUS-1] = BAD_APICID };
+u8 phys_proc_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
+u8 cpu_core_id[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = BAD_APICID };
 EXPORT_SYMBOL(phys_proc_id);
 EXPORT_SYMBOL(cpu_core_id);
 
 /* Bitmask of currently online CPUs */
-cpumask_t cpu_online_map;
+cpumask_t cpu_online_map __read_mostly;
 
 EXPORT_SYMBOL(cpu_online_map);
 
@@ -88,8 +88,8 @@ struct cpuinfo_x86 cpu_data[NR_CPUS] __cacheline_aligned;
 /* Set when the idlers are all forked */
 int smp_threads_ready;
 
-cpumask_t cpu_sibling_map[NR_CPUS] __cacheline_aligned;
-cpumask_t cpu_core_map[NR_CPUS] __cacheline_aligned;
+cpumask_t cpu_sibling_map[NR_CPUS] __read_mostly;
+cpumask_t cpu_core_map[NR_CPUS] __read_mostly;
 EXPORT_SYMBOL(cpu_core_map);
 
 /*
@@ -894,23 +894,6 @@ static __init void disable_smp(void)
         cpu_set(0, cpu_core_map[0]);
 }
 
-/*
- * Handle user cpus=... parameter.
- */
-static __init void enforce_max_cpus(unsigned max_cpus)
-{
-        int i, k;
-        k = 0;
-        for (i = 0; i < NR_CPUS; i++) {
-                if (!cpu_possible(i))
-                        continue;
-                if (++k > max_cpus) {
-                        cpu_clear(i, cpu_possible_map);
-                        cpu_clear(i, cpu_present_map);
-                }
-        }
-}
-
 #ifdef CONFIG_HOTPLUG_CPU
 /*
  * cpu_possible_map should be static, it cannot change as cpu's
@@ -999,8 +982,6 @@ void __init smp_prepare_cpus(unsigned int max_cpus)
         current_cpu_data = boot_cpu_data;
         current_thread_info()->cpu = 0;  /* needed? */
 
-        enforce_max_cpus(max_cpus);
-
 #ifdef CONFIG_HOTPLUG_CPU
         prefill_possible_map();
 #endif
diff --git a/arch/x86_64/kernel/suspend_asm.S b/arch/x86_64/kernel/suspend_asm.S
index 53f8e1659511..4d659e97df10 100644
--- a/arch/x86_64/kernel/suspend_asm.S
+++ b/arch/x86_64/kernel/suspend_asm.S
@@ -14,7 +14,7 @@
 #include <linux/linkage.h>
 #include <asm/segment.h>
 #include <asm/page.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 
 ENTRY(swsusp_arch_suspend)
 
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c
index 66bf6ddeb0c3..7b6abe058253 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -176,10 +176,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
 
         write_sequnlock_irq(&xtime_lock);
         clock_was_set();
@@ -471,7 +468,7 @@ static irqreturn_t timer_interrupt(int irq, void *dev_id, struct pt_regs *regs)
  * off) isn't likely to go away much sooner anyway.
  */
 
-        if ((~time_status & STA_UNSYNC) && xtime.tv_sec > rtc_update &&
+        if (ntp_synced() && xtime.tv_sec > rtc_update &&
                 abs(xtime.tv_nsec - 500000000) <= tick_nsec / 2) {
                 set_rtc_mmss(xtime.tv_sec);
                 rtc_update = xtime.tv_sec + 660;
@@ -1041,6 +1038,7 @@ static int timer_resume(struct sys_device *dev)
         write_sequnlock_irqrestore(&xtime_lock,flags);
         jiffies += sleep_length;
         wall_jiffies += sleep_length;
+        touch_softlockup_watchdog();
         return 0;
 }
 
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index 6ead433a3885..f238d6078a5a 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -29,6 +29,7 @@
 #include <linux/module.h>
 #include <linux/moduleparam.h>
 #include <linux/nmi.h>
+#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -419,8 +420,9 @@ void die_nmi(char *str, struct pt_regs *regs)
         do_exit(SIGSEGV);
 }
 
-static void do_trap(int trapnr, int signr, char *str, 
-                           struct pt_regs * regs, long error_code, siginfo_t *info)
+static void __kprobes do_trap(int trapnr, int signr, char *str,
+                              struct pt_regs * regs, long error_code,
+                              siginfo_t *info)
 {
         conditional_sti(regs);
 
@@ -504,7 +506,8 @@ DO_ERROR(18, SIGSEGV, "reserved", reserved)
 DO_ERROR(12, SIGBUS,  "stack segment", stack_segment)
 DO_ERROR( 8, SIGSEGV, "double fault", double_fault)
 
-asmlinkage void do_general_protection(struct pt_regs * regs, long error_code)
+asmlinkage void __kprobes do_general_protection(struct pt_regs * regs,
+                                                long error_code)
 {
         conditional_sti(regs);
 
@@ -622,7 +625,7 @@ asmlinkage void default_do_nmi(struct pt_regs *regs)
                 io_check_error(reason, regs);
 }
 
-asmlinkage void do_int3(struct pt_regs * regs, long error_code)
+asmlinkage void __kprobes do_int3(struct pt_regs * regs, long error_code)
 {
         if (notify_die(DIE_INT3, "int3", regs, error_code, 3, SIGTRAP) == NOTIFY_STOP) {
                 return;
@@ -653,7 +656,8 @@ asmlinkage struct pt_regs *sync_regs(struct pt_regs *eregs)
 }
 
 /* runs on IST stack. */
-asmlinkage void do_debug(struct pt_regs * regs, unsigned long error_code)
+asmlinkage void __kprobes do_debug(struct pt_regs * regs,
+                                   unsigned long error_code)
 {
         unsigned long condition;
         struct task_struct *tsk = current;
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index 2a94f9b60b2d..6dd642cad2ef 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -21,6 +21,7 @@ SECTIONS
         *(.text)
         SCHED_TEXT
         LOCK_TEXT
+        KPROBES_TEXT
         *(.fixup)
         *(.gnu.warning)
         } = 0x9090
@@ -193,20 +194,7 @@ SECTIONS
 #endif
         }
 
-  /* DWARF 2 */
-  .debug_info     0 : { *(.debug_info) }
-  .debug_abbrev   0 : { *(.debug_abbrev) }
-  .debug_line     0 : { *(.debug_line) }
-  .debug_frame    0 : { *(.debug_frame) }
-  .debug_str      0 : { *(.debug_str) }
-  .debug_loc      0 : { *(.debug_loc) }
-  .debug_macinfo  0 : { *(.debug_macinfo) }
-  /* SGI/MIPS DWARF 2 extensions */
-  .debug_weaknames 0 : { *(.debug_weaknames) }
-  .debug_funcnames 0 : { *(.debug_funcnames) }
-  .debug_typenames 0 : { *(.debug_typenames) }
-  .debug_varnames  0 : { *(.debug_varnames) }
-
-
-  .comment 0 : { *(.comment) }
+  STABS_DEBUG
+
+  DWARF_DEBUG
 }
diff --git a/arch/x86_64/lib/copy_user.S b/arch/x86_64/lib/copy_user.S
index bd556c804248..dfa358b05c89 100644
--- a/arch/x86_64/lib/copy_user.S
+++ b/arch/x86_64/lib/copy_user.S
@@ -7,7 +7,7 @@
 #define FIX_ALIGNMENT 1
                 
         #include <asm/current.h>
-        #include <asm/offset.h>
+        #include <asm/asm-offsets.h>
         #include <asm/thread_info.h>
         #include <asm/cpufeature.h>
 
diff --git a/arch/x86_64/lib/getuser.S b/arch/x86_64/lib/getuser.S
index f80bafee8669..3844d5e885a4 100644
--- a/arch/x86_64/lib/getuser.S
+++ b/arch/x86_64/lib/getuser.S
@@ -29,7 +29,7 @@
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/errno.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
         .text
diff --git a/arch/x86_64/lib/putuser.S b/arch/x86_64/lib/putuser.S
index 5828b8191667..7f5593974e2d 100644
--- a/arch/x86_64/lib/putuser.S
+++ b/arch/x86_64/lib/putuser.S
@@ -27,7 +27,7 @@
 #include <linux/linkage.h>
 #include <asm/page.h>
 #include <asm/errno.h>
-#include <asm/offset.h>
+#include <asm/asm-offsets.h>
 #include <asm/thread_info.h>
 
         .text
diff --git a/arch/x86_64/mm/fault.c b/arch/x86_64/mm/fault.c
index ca914c3bd49c..816732d8858c 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -23,6 +23,7 @@
 #include <linux/vt_kern.h>              /* For unblank_screen() */
 #include <linux/compiler.h>
 #include <linux/module.h>
+#include <linux/kprobes.h>
 
 #include <asm/system.h>
 #include <asm/uaccess.h>
@@ -294,7 +295,8 @@ int exception_trace = 1;
  *      bit 2 == 0 means kernel, 1 means user-mode
  *      bit 3 == 1 means fault was an instruction fetch
  */
-asmlinkage void do_page_fault(struct pt_regs *regs, unsigned long error_code)
+asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
+                                        unsigned long error_code)
 {
         struct task_struct *tsk;
         struct mm_struct *mm;
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 6a156f5692ae..04f7a33e144c 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -22,14 +22,14 @@
 #define Dprintk(x...)
 #endif
 
-struct pglist_data *node_data[MAX_NUMNODES];
+struct pglist_data *node_data[MAX_NUMNODES] __read_mostly;
 bootmem_data_t plat_node_bdata[MAX_NUMNODES];
 
 int memnode_shift;
 u8  memnodemap[NODEMAPSIZE];
 
-unsigned char cpu_to_node[NR_CPUS] = { [0 ... NR_CPUS-1] = NUMA_NO_NODE };
-cpumask_t     node_to_cpumask[MAX_NUMNODES];
+unsigned char cpu_to_node[NR_CPUS] __read_mostly = { [0 ... NR_CPUS-1] = NUMA_NO_NODE };
+cpumask_t     node_to_cpumask[MAX_NUMNODES] __read_mostly;
 
 int numa_off __initdata;
 
diff --git a/arch/x86_64/pci/Makefile b/arch/x86_64/pci/Makefile
index 37c92e841dec..bb34e5ef916c 100644
--- a/arch/x86_64/pci/Makefile
+++ b/arch/x86_64/pci/Makefile
@@ -8,7 +8,7 @@ CFLAGS += -Iarch/i386/pci
 obj-y           := i386.o
 obj-$(CONFIG_PCI_DIRECT)+= direct.o
 obj-y           += fixup.o
-obj-$(CONFIG_ACPI_PCI)  += acpi.o
+obj-$(CONFIG_ACPI)      += acpi.o
 obj-y                   += legacy.o irq.o common.o
 # mmconfig has a 64bit special
 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
diff --git a/arch/x86_64/pci/Makefile-BUS b/arch/x86_64/pci/Makefile-BUS
index 291985f0d2e4..4f0c05abd408 100644
--- a/arch/x86_64/pci/Makefile-BUS
+++ b/arch/x86_64/pci/Makefile-BUS
@@ -8,7 +8,7 @@ CFLAGS += -I arch/i386/pci
 obj-y           := i386.o
 obj-$(CONFIG_PCI_DIRECT)+= direct.o
 obj-y           += fixup.o
-obj-$(CONFIG_ACPI_PCI)  += acpi.o
+obj-$(CONFIG_ACPI)      += acpi.o
 obj-y                   += legacy.o irq.o common.o
 # mmconfig has a 64bit special
 obj-$(CONFIG_PCI_MMCONFIG) += mmconfig.o
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 27847e4ffcbf..67ef4cd173b9 100644
--- a/arch/xtensa/Makefile
+++ b/arch/xtensa/Makefile
@@ -66,13 +66,7 @@ boot		:= arch/xtensa/boot
 
 archinc         := include/asm-xtensa
 
-arch/xtensa/kernel/asm-offsets.s: \
-        arch/xtensa/kernel/asm-offsets.c $(archinc)/.platform
-
-include/asm-xtensa/offsets.h: arch/xtensa/kernel/asm-offsets.s
-        $(call filechk,gen-asm-offsets)
-
-prepare: $(archinc)/.platform $(archinc)/offsets.h
+prepare: $(archinc)/.platform
 
 # Update machine cpu and platform symlinks if something which affects
 # them changed.
@@ -94,7 +88,7 @@ bzImage : zImage
 zImage zImage.initrd: vmlinux
         $(Q)$(MAKE) $(build)=$(boot) $@
 
-CLEAN_FILES     += arch/xtensa/vmlinux.lds $(archinc)/offset.h \
+CLEAN_FILES     += arch/xtensa/vmlinux.lds                      \
                    $(archinc)/platform $(archinc)/xtensa/config \
                    $(archinc)/.platform
 
diff --git a/arch/xtensa/kernel/align.S b/arch/xtensa/kernel/align.S
index 74b1e90ef08c..a4956578a24d 100644
--- a/arch/xtensa/kernel/align.S
+++ b/arch/xtensa/kernel/align.S
@@ -19,7 +19,7 @@
 #include <asm/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/current.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/page.h>
diff --git a/arch/xtensa/kernel/entry.S b/arch/xtensa/kernel/entry.S
index c64a01f71de6..5c018c503dfa 100644
--- a/arch/xtensa/kernel/entry.S
+++ b/arch/xtensa/kernel/entry.S
@@ -14,7 +14,7 @@
  */
 
 #include <linux/linkage.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/processor.h>
 #include <asm/thread_info.h>
 #include <asm/uaccess.h>
diff --git a/arch/xtensa/kernel/process.c b/arch/xtensa/kernel/process.c
index 4099703b14be..c83bb0d41787 100644
--- a/arch/xtensa/kernel/process.c
+++ b/arch/xtensa/kernel/process.c
@@ -43,7 +43,7 @@
 #include <asm/mmu.h>
 #include <asm/irq.h>
 #include <asm/atomic.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/coprocessor.h>
 
 extern void ret_from_fork(void);
diff --git a/arch/xtensa/kernel/time.c b/arch/xtensa/kernel/time.c
index e07287db5a40..1ac7d5ce7456 100644
--- a/arch/xtensa/kernel/time.c
+++ b/arch/xtensa/kernel/time.c
@@ -122,10 +122,7 @@ int do_settimeofday(struct timespec *tv)
         set_normalized_timespec(&xtime, sec, nsec);
         set_normalized_timespec(&wall_to_monotonic, wtm_sec, wtm_nsec);
 
-        time_adjust = 0;                /* stop active adjtime() */
-        time_status |= STA_UNSYNC;
-        time_maxerror = NTP_PHASE_LIMIT;
-        time_esterror = NTP_PHASE_LIMIT;
+        ntp_clear();
         write_sequnlock_irq(&xtime_lock);
         return 0;
 }
@@ -184,7 +181,7 @@ again:
                 next += CCOUNT_PER_JIFFY;
                 do_timer (regs); /* Linux handler in kernel/timer.c */
 
-                if ((time_status & STA_UNSYNC) == 0 &&
+                if (ntp_synced() &&
                     xtime.tv_sec - last_rtc_update >= 659 &&
                     abs((xtime.tv_nsec/1000)-(1000000-1000000/HZ))<5000000/HZ &&
                     jiffies - wall_jiffies == 1) {
diff --git a/arch/xtensa/kernel/vectors.S b/arch/xtensa/kernel/vectors.S
index 81808f0c6742..0e74397bfa2b 100644
--- a/arch/xtensa/kernel/vectors.S
+++ b/arch/xtensa/kernel/vectors.S
@@ -46,7 +46,7 @@
 #include <asm/ptrace.h>
 #include <asm/ptrace.h>
 #include <asm/current.h>
-#include <asm/offsets.h>
+#include <asm/asm-offsets.h>
 #include <asm/pgtable.h>
 #include <asm/processor.h>
 #include <asm/page.h>