Merge /spare/repo/linux-2.6/

465 files changed, 8083 insertions, 5966 deletions

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/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 0f2899b4159d..11fff042aa81 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -326,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..130e6228b587 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -175,10 +175,10 @@ else
 endif
         @touch $@
 
-prepare: maketools include/asm-arm/.arch
+archprepare: 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/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/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/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/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-ixp2000/core.c b/arch/arm/mach-ixp2000/core.c
index 098c817a7fb8..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,
         },
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 afd5d67e4ae7..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
  *
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/corgi.c b/arch/arm/mach-pxa/corgi.c
index 29185acdd9e1..07b5dd453565 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -131,27 +131,12 @@ static struct platform_device corgits_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 struct pxamci_platform_data corgi_mci_platform_data;
 
-static void mmc_detect_callback(unsigned long data)
-{
-        mmc_detect_change(mmc_detect.devid);
-}
-
-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;
 
@@ -161,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");
@@ -198,7 +181,6 @@ static int corgi_mci_get_ro(struct device *dev)
 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 = {
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/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-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-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/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/Makefile b/arch/arm26/Makefile
index e9cb8ef4f3fb..844a9e46886e 100644
--- a/arch/arm26/Makefile
+++ b/arch/arm26/Makefile
@@ -49,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
         
@@ -94,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/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..ea65d585cf5e 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
+archprepare: $(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-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/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/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/i386/Kconfig b/arch/i386/Kconfig
index 5d51b38bd70d..b22f003eaa6d 100644
--- a/arch/i386/Kconfig
+++ b/arch/i386/Kconfig
@@ -1212,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"
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/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..1ae2aeeda18b 100644
--- a/arch/i386/kernel/acpi/earlyquirk.c
+++ b/arch/i386/kernel/acpi/earlyquirk.c
@@ -7,45 +7,55 @@
 #include <linux/pci.h>
 #include <asm/pci-direct.h>
 #include <asm/acpi.h>
+#include <asm/apic.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;
         }
+#ifdef CONFIG_X86_LOCAL_APIC
+        /*
+         * ATI IXP chipsets get double timer interrupts.
+         * For now just do this for all ATI chipsets.
+         * FIXME: this needs to be checked for the non ACPI case too.
+         */
+        if (vendor == PCI_VENDOR_ID_ATI)
+                disable_timer_pin_1 = 1;
+#endif
         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/entry.S b/arch/i386/kernel/entry.S
index 3aad03839660..9e24f7b207ee 100644
--- a/arch/i386/kernel/entry.S
+++ b/arch/i386/kernel/entry.S
@@ -319,7 +319,7 @@ work_notifysig:				# deal with pending signals and
                                         # vm86-space
         xorl %edx, %edx
         call do_notify_resume
-        jmp restore_all
+        jmp resume_userspace
 
         ALIGN
 work_notifysig_v86:
@@ -329,7 +329,7 @@ work_notifysig_v86:
         movl %eax, %esp
         xorl %edx, %edx
         call do_notify_resume
-        jmp restore_all
+        jmp resume_userspace
 
         # perform syscall exit tracing
         ALIGN
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 0e727e6da5c9..378313b0cce9 100644
--- a/arch/i386/kernel/io_apic.c
+++ b/arch/i386/kernel/io_apic.c
@@ -60,6 +60,8 @@ int sis_apic_bug = -1;
  */
 int nr_ioapic_registers[MAX_IO_APICS];
 
+int disable_timer_pin_1 __initdata;
+
 /*
  * Rough estimation of how many shared IRQs there are, can
  * be changed anytime.
@@ -573,8 +575,7 @@ static int balanced_irq(void *unused)
         }
 
         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)) {
@@ -1634,9 +1635,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) {
@@ -2212,6 +2213,8 @@ static inline void check_timer(void)
                                 setup_nmi();
                                 enable_8259A_irq(0);
                         }
+                        if (disable_timer_pin_1 > 0)
+                                clear_IO_APIC_pin(0, pin1);
                         return;
                 }
                 clear_IO_APIC_pin(0, pin1);
@@ -2423,7 +2426,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)
 {
@@ -2577,4 +2580,4 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
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/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 e29fd5aeaf8e..dc39ca6a7eca 100644
--- a/arch/i386/kernel/setup.c
+++ b/arch/i386/kernel/setup.c
@@ -87,14 +87,14 @@ 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();
@@ -850,11 +851,16 @@ static void __init parse_cmdline_early (char ** cmdline_p)
 #endif
 
 #ifdef CONFIG_X86_LOCAL_APIC
+                if (!memcmp(from, "disable_timer_pin_1", 19))
+                        disable_timer_pin_1 = 1;
+                if (!memcmp(from, "enable_timer_pin_1", 18))
+                        disable_timer_pin_1 = -1;
+
                 /* disable IO-APIC */
                 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 +1305,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 +1350,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 +1585,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/srat.c b/arch/i386/kernel/srat.c
index 7b3b27d64409..516bf5653b02 100644
--- a/arch/i386/kernel/srat.c
+++ b/arch/i386/kernel/srat.c
@@ -213,12 +213,18 @@ static __init void node_read_chunk(int nid, struct node_memory_chunk_s *memory_c
                 node_end_pfn[nid] = memory_chunk->end_pfn;
 }
 
+static u8 pxm_to_nid_map[MAX_PXM_DOMAINS];/* _PXM to logical node ID map */
+
+int pxm_to_node(int pxm)
+{
+        return pxm_to_nid_map[pxm];
+}
+
 /* Parse the ACPI Static Resource Affinity Table */
 static int __init acpi20_parse_srat(struct acpi_table_srat *sratp)
 {
         u8 *start, *end, *p;
         int i, j, nid;
-        u8 pxm_to_nid_map[MAX_PXM_DOMAINS];/* _PXM to logical node ID map */
         u8 nid_to_pxm_map[MAX_NUMNODES];/* logical node ID to _PXM map */
 
         start = (u8 *)(&(sratp->reserved) + 1); /* skip header */
diff --git a/arch/i386/kernel/time.c b/arch/i386/kernel/time.c
index eefea7c55008..2883a4d4f01f 100644
--- a/arch/i386/kernel/time.c
+++ b/arch/i386/kernel/time.c
@@ -329,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)
 {
diff --git a/arch/i386/kernel/vmlinux.lds.S b/arch/i386/kernel/vmlinux.lds.S
index 13b9c62cbbb4..4710195b6b74 100644
--- a/arch/i386/kernel/vmlinux.lds.S
+++ b/arch/i386/kernel/vmlinux.lds.S
@@ -144,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-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/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/acpi.c b/arch/i386/pci/acpi.c
index 42913f43feb0..2941674f35eb 100644
--- a/arch/i386/pci/acpi.c
+++ b/arch/i386/pci/acpi.c
@@ -3,16 +3,31 @@
 #include <linux/init.h>
 #include <linux/irq.h>
 #include <asm/hw_irq.h>
+#include <asm/numa.h>
 #include "pci.h"
 
 struct pci_bus * __devinit pci_acpi_scan_root(struct acpi_device *device, int domain, int busnum)
 {
+        struct pci_bus *bus;
+
         if (domain != 0) {
                 printk(KERN_WARNING "PCI: Multiple domains not supported\n");
                 return NULL;
         }
 
-        return pcibios_scan_root(busnum);
+        bus = pcibios_scan_root(busnum);
+#ifdef CONFIG_ACPI_NUMA
+        if (bus != NULL) {
+                int pxm = acpi_get_pxm(device->handle);
+                if (pxm >= 0) {
+                        bus->sysdata = (void *)(unsigned long)pxm_to_node(pxm);
+                        printk("bus %d -> pxm %d -> node %ld\n",
+                                busnum, pxm, (long)(bus->sysdata));
+                }
+        }
+#endif
+        
+        return bus;
 }
 
 extern int pci_routeirq;
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/pci/mmconfig.c b/arch/i386/pci/mmconfig.c
index 60f0e7a1162a..dfbf80cff834 100644
--- a/arch/i386/pci/mmconfig.c
+++ b/arch/i386/pci/mmconfig.c
@@ -127,13 +127,6 @@ static int __init pci_mmcfg_init(void)
             (pci_mmcfg_config[0].base_address == 0))
                 goto out;
 
-        /* Kludge for now. Don't use mmconfig on AMD systems because
-           those have some busses where mmconfig doesn't work,
-           and we don't parse ACPI MCFG well enough to handle that. 
-           Remove when proper handling is added. */
-        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-                goto out; 
-
         printk(KERN_INFO "PCI: Using MMCONFIG\n");
         raw_pci_ops = &pci_mmcfg;
         pci_probe = (pci_probe & ~PCI_PROBE_MASK) | PCI_PROBE_MMCONF;
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 17b5dbf8c311..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"
diff --git a/arch/ia64/Makefile b/arch/ia64/Makefile
index f9bd88ada708..70f8ed2748d1 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
+archprepare:  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/boot/boot_head.S b/arch/ia64/hp/sim/boot/boot_head.S
index 1c8c7e6a9a5e..a9bd71ac78e2 100644
--- a/arch/ia64/hp/sim/boot/boot_head.S
+++ b/arch/ia64/hp/sim/boot/boot_head.S
@@ -4,6 +4,7 @@
  */
 
 #include <asm/asmmacro.h>
+#include <asm/pal.h>
 
         .bss
         .align 16
@@ -49,7 +50,11 @@ GLOBAL_ENTRY(jmp_to_kernel)
         br.sptk.few b7
 END(jmp_to_kernel)
 
-
+/*
+ * r28 contains the index of the PAL function
+ * r29--31 the args
+ * Return values in ret0--3 (r8--11)
+ */
 GLOBAL_ENTRY(pal_emulator_static)
         mov r8=-1
         mov r9=256
@@ -62,7 +67,7 @@ GLOBAL_ENTRY(pal_emulator_static)
         cmp.gtu p6,p7=r9,r28
 (p6)    br.cond.sptk.few stacked
         ;;
-static: cmp.eq p6,p7=6,r28              /* PAL_PTCE_INFO */
+static: cmp.eq p6,p7=PAL_PTCE_INFO,r28
 (p7)    br.cond.sptk.few 1f
         ;;
         mov r8=0                        /* status = 0 */
@@ -70,21 +75,21 @@ static:	cmp.eq p6,p7=6,r28		/* PAL_PTCE_INFO */
         movl r10=0x0000000200000003     /* count[0], count[1] */
         movl r11=0x1000000000002000     /* stride[0], stride[1] */
         br.cond.sptk.few rp
-1:      cmp.eq p6,p7=14,r28             /* PAL_FREQ_RATIOS */
+1:      cmp.eq p6,p7=PAL_FREQ_RATIOS,r28
 (p7)    br.cond.sptk.few 1f
         mov r8=0                        /* status = 0 */
         movl r9 =0x100000064            /* proc_ratio (1/100) */
         movl r10=0x100000100            /* bus_ratio<<32 (1/256) */
         movl r11=0x100000064            /* itc_ratio<<32 (1/100) */
         ;;
-1:      cmp.eq p6,p7=19,r28             /* PAL_RSE_INFO */
+1:      cmp.eq p6,p7=PAL_RSE_INFO,r28
 (p7)    br.cond.sptk.few 1f
         mov r8=0                        /* status = 0 */
         mov r9=96                       /* num phys stacked */
         mov r10=0                       /* hints */
         mov r11=0
         br.cond.sptk.few rp
-1:      cmp.eq p6,p7=1,r28              /* PAL_CACHE_FLUSH */
+1:      cmp.eq p6,p7=PAL_CACHE_FLUSH,r28                /* PAL_CACHE_FLUSH */
 (p7)    br.cond.sptk.few 1f
         mov r9=ar.lc
         movl r8=524288                  /* flush 512k million cache lines (16MB) */
@@ -102,7 +107,7 @@ static:	cmp.eq p6,p7=6,r28		/* PAL_PTCE_INFO */
         mov ar.lc=r9
         mov r8=r0
         ;;
-1:      cmp.eq p6,p7=15,r28             /* PAL_PERF_MON_INFO */
+1:      cmp.eq p6,p7=PAL_PERF_MON_INFO,r28
 (p7)    br.cond.sptk.few 1f
         mov r8=0                        /* status = 0 */
         movl r9 =0x08122f04             /* generic=4 width=47 retired=8 cycles=18 */
@@ -138,6 +143,20 @@ static:	cmp.eq p6,p7=6,r28		/* PAL_PTCE_INFO */
         st8 [r29]=r0,16                 /* clear remaining bits  */
         st8 [r18]=r0,16                 /* clear remaining bits  */
         ;;
+1:      cmp.eq p6,p7=PAL_VM_SUMMARY,r28
+(p7)    br.cond.sptk.few 1f
+        mov     r8=0                    /* status = 0  */
+        movl    r9=0x2044040020F1865    /* num_tc_levels=2, num_unique_tcs=4 */
+                                        /* max_itr_entry=64, max_dtr_entry=64 */
+                                        /* hash_tag_id=2, max_pkr=15 */
+                                        /* key_size=24, phys_add_size=50, vw=1 */
+        movl    r10=0x183C              /* rid_size=24, impl_va_msb=60 */
+        ;;
+1:      cmp.eq p6,p7=PAL_MEM_ATTRIB,r28
+(p7)    br.cond.sptk.few 1f
+        mov     r8=0                    /* status = 0 */
+        mov     r9=0x80|0x01            /* NatPage|WB */
+        ;;
 1:      br.cond.sptk.few rp
 stacked:
         br.ret.sptk.few rp
diff --git a/arch/ia64/ia32/ia32_entry.S b/arch/ia64/ia32/ia32_entry.S
index 0708edb06cc4..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>
 
diff --git a/arch/ia64/ia32/sys_ia32.c b/arch/ia64/ia32/sys_ia32.c
index e29a8a55486a..3fa67ecebc83 100644
--- a/arch/ia64/ia32/sys_ia32.c
+++ b/arch/ia64/ia32/sys_ia32.c
@@ -2327,7 +2327,7 @@ sys32_sendfile (int out_fd, int in_fd, int __user *offset, unsigned int count)
         ret = sys_sendfile(out_fd, in_fd, offset ? (off_t __user *) &of : NULL, count);
         set_fs(old_fs);
 
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
 
         return ret;
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/asm-offsets.c b/arch/ia64/kernel/asm-offsets.c
index 7d1ae2982c53..f6a234289341 100644
--- a/arch/ia64/kernel/asm-offsets.c
+++ b/arch/ia64/kernel/asm-offsets.c
@@ -211,17 +211,41 @@ void foo(void)
 #endif
 
         BLANK();
-        DEFINE(IA64_MCA_CPU_PROC_STATE_DUMP_OFFSET,
-               offsetof (struct ia64_mca_cpu, proc_state_dump));
-        DEFINE(IA64_MCA_CPU_STACK_OFFSET,
-               offsetof (struct ia64_mca_cpu, stack));
-        DEFINE(IA64_MCA_CPU_STACKFRAME_OFFSET,
-               offsetof (struct ia64_mca_cpu, stackframe));
-        DEFINE(IA64_MCA_CPU_RBSTORE_OFFSET,
-               offsetof (struct ia64_mca_cpu, rbstore));
+        DEFINE(IA64_MCA_CPU_MCA_STACK_OFFSET,
+               offsetof (struct ia64_mca_cpu, mca_stack));
         DEFINE(IA64_MCA_CPU_INIT_STACK_OFFSET,
                offsetof (struct ia64_mca_cpu, init_stack));
         BLANK();
+        DEFINE(IA64_SAL_OS_STATE_COMMON_OFFSET,
+               offsetof (struct ia64_sal_os_state, sal_ra));
+        DEFINE(IA64_SAL_OS_STATE_OS_GP_OFFSET,
+               offsetof (struct ia64_sal_os_state, os_gp));
+        DEFINE(IA64_SAL_OS_STATE_PAL_MIN_STATE_OFFSET,
+               offsetof (struct ia64_sal_os_state, pal_min_state));
+        DEFINE(IA64_SAL_OS_STATE_PROC_STATE_PARAM_OFFSET,
+               offsetof (struct ia64_sal_os_state, proc_state_param));
+        DEFINE(IA64_SAL_OS_STATE_SIZE,
+               sizeof (struct ia64_sal_os_state));
+        DEFINE(IA64_PMSA_GR_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_gr));
+        DEFINE(IA64_PMSA_BANK1_GR_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_bank1_gr));
+        DEFINE(IA64_PMSA_PR_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_pr));
+        DEFINE(IA64_PMSA_BR0_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_br0));
+        DEFINE(IA64_PMSA_RSC_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_rsc));
+        DEFINE(IA64_PMSA_IIP_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_iip));
+        DEFINE(IA64_PMSA_IPSR_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_ipsr));
+        DEFINE(IA64_PMSA_IFS_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_ifs));
+        DEFINE(IA64_PMSA_XIP_OFFSET,
+               offsetof (struct pal_min_state_area_s, pmsa_xip));
+        BLANK();
+
         /* used by fsys_gettimeofday in arch/ia64/kernel/fsys.S */
         DEFINE(IA64_TIME_INTERPOLATOR_ADDRESS_OFFSET, offsetof (struct time_interpolator, addr));
         DEFINE(IA64_TIME_INTERPOLATOR_SOURCE_OFFSET, offsetof (struct time_interpolator, source));
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/ivt.S b/arch/ia64/kernel/ivt.S
index 3bb3a13c4047..c13ca0d49c4a 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>
@@ -69,7 +69,6 @@
 # define DBG_FAULT(i)
 #endif
 
-#define MINSTATE_VIRT   /* needed by minstate.h */
 #include "minstate.h"
 
 #define FAULT(n)                                                                        \
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index 4ebbf3974381..6dc726ad7137 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -48,6 +48,9 @@
  *            Delete dead variables and functions.
  *            Reorder to remove the need for forward declarations and to consolidate
  *            related code.
+ *
+ * 2005-08-12 Keith Owens <kaos@sgi.com>
+ *            Convert MCA/INIT handlers to use per event stacks and SAL/OS state.
  */
 #include <linux/config.h>
 #include <linux/types.h>
@@ -77,6 +80,8 @@
 #include <asm/irq.h>
 #include <asm/hw_irq.h>
 
+#include "entry.h"
+
 #if defined(IA64_MCA_DEBUG_INFO)
 # define IA64_MCA_DEBUG(fmt...) printk(fmt)
 #else
@@ -84,9 +89,7 @@
 #endif
 
 /* Used by mca_asm.S */
-ia64_mca_sal_to_os_state_t      ia64_sal_to_os_handoff_state;
-ia64_mca_os_to_sal_state_t      ia64_os_to_sal_handoff_state;
-u64                             ia64_mca_serialize;
+u32                             ia64_mca_serialize;
 DEFINE_PER_CPU(u64, ia64_mca_data); /* == __per_cpu_mca[smp_processor_id()] */
 DEFINE_PER_CPU(u64, ia64_mca_per_cpu_pte); /* PTE to map per-CPU area */
 DEFINE_PER_CPU(u64, ia64_mca_pal_pte);      /* PTE to map PAL code */
@@ -95,8 +98,10 @@ DEFINE_PER_CPU(u64, ia64_mca_pal_base);    /* vaddr PAL code granule */
 unsigned long __per_cpu_mca[NR_CPUS];
 
 /* In mca_asm.S */
-extern void                     ia64_monarch_init_handler (void);
-extern void                     ia64_slave_init_handler (void);
+extern void                     ia64_os_init_dispatch_monarch (void);
+extern void                     ia64_os_init_dispatch_slave (void);
+
+static int monarch_cpu = -1;
 
 static ia64_mc_info_t           ia64_mc_info;
 
@@ -234,7 +239,8 @@ ia64_log_get(int sal_info_type, u8 **buffer, int irq_safe)
  *  This function retrieves a specified error record type from SAL
  *  and wakes up any processes waiting for error records.
  *
- *  Inputs  :   sal_info_type   (Type of error record MCA/CMC/CPE/INIT)
+ *  Inputs  :   sal_info_type   (Type of error record MCA/CMC/CPE)
+ *              FIXME: remove MCA and irq_safe.
  */
 static void
 ia64_mca_log_sal_error_record(int sal_info_type)
@@ -242,7 +248,7 @@ ia64_mca_log_sal_error_record(int sal_info_type)
         u8 *buffer;
         sal_log_record_header_t *rh;
         u64 size;
-        int irq_safe = sal_info_type != SAL_INFO_TYPE_MCA && sal_info_type != SAL_INFO_TYPE_INIT;
+        int irq_safe = sal_info_type != SAL_INFO_TYPE_MCA;
 #ifdef IA64_MCA_DEBUG_INFO
         static const char * const rec_name[] = { "MCA", "INIT", "CMC", "CPE" };
 #endif
@@ -330,191 +336,6 @@ ia64_mca_cpe_int_handler (int cpe_irq, void *arg, struct pt_regs *ptregs)
 
 #endif /* CONFIG_ACPI */
 
-static void
-show_min_state (pal_min_state_area_t *minstate)
-{
-        u64 iip = minstate->pmsa_iip + ((struct ia64_psr *)(&minstate->pmsa_ipsr))->ri;
-        u64 xip = minstate->pmsa_xip + ((struct ia64_psr *)(&minstate->pmsa_xpsr))->ri;
-
-        printk("NaT bits\t%016lx\n", minstate->pmsa_nat_bits);
-        printk("pr\t\t%016lx\n", minstate->pmsa_pr);
-        printk("b0\t\t%016lx ", minstate->pmsa_br0); print_symbol("%s\n", minstate->pmsa_br0);
-        printk("ar.rsc\t\t%016lx\n", minstate->pmsa_rsc);
-        printk("cr.iip\t\t%016lx ", iip); print_symbol("%s\n", iip);
-        printk("cr.ipsr\t\t%016lx\n", minstate->pmsa_ipsr);
-        printk("cr.ifs\t\t%016lx\n", minstate->pmsa_ifs);
-        printk("xip\t\t%016lx ", xip); print_symbol("%s\n", xip);
-        printk("xpsr\t\t%016lx\n", minstate->pmsa_xpsr);
-        printk("xfs\t\t%016lx\n", minstate->pmsa_xfs);
-        printk("b1\t\t%016lx ", minstate->pmsa_br1);
-        print_symbol("%s\n", minstate->pmsa_br1);
-
-        printk("\nstatic registers r0-r15:\n");
-        printk(" r0- 3 %016lx %016lx %016lx %016lx\n",
-               0UL, minstate->pmsa_gr[0], minstate->pmsa_gr[1], minstate->pmsa_gr[2]);
-        printk(" r4- 7 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_gr[3], minstate->pmsa_gr[4],
-               minstate->pmsa_gr[5], minstate->pmsa_gr[6]);
-        printk(" r8-11 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_gr[7], minstate->pmsa_gr[8],
-               minstate->pmsa_gr[9], minstate->pmsa_gr[10]);
-        printk("r12-15 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_gr[11], minstate->pmsa_gr[12],
-               minstate->pmsa_gr[13], minstate->pmsa_gr[14]);
-
-        printk("\nbank 0:\n");
-        printk("r16-19 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank0_gr[0], minstate->pmsa_bank0_gr[1],
-               minstate->pmsa_bank0_gr[2], minstate->pmsa_bank0_gr[3]);
-        printk("r20-23 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank0_gr[4], minstate->pmsa_bank0_gr[5],
-               minstate->pmsa_bank0_gr[6], minstate->pmsa_bank0_gr[7]);
-        printk("r24-27 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank0_gr[8], minstate->pmsa_bank0_gr[9],
-               minstate->pmsa_bank0_gr[10], minstate->pmsa_bank0_gr[11]);
-        printk("r28-31 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank0_gr[12], minstate->pmsa_bank0_gr[13],
-               minstate->pmsa_bank0_gr[14], minstate->pmsa_bank0_gr[15]);
-
-        printk("\nbank 1:\n");
-        printk("r16-19 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank1_gr[0], minstate->pmsa_bank1_gr[1],
-               minstate->pmsa_bank1_gr[2], minstate->pmsa_bank1_gr[3]);
-        printk("r20-23 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank1_gr[4], minstate->pmsa_bank1_gr[5],
-               minstate->pmsa_bank1_gr[6], minstate->pmsa_bank1_gr[7]);
-        printk("r24-27 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank1_gr[8], minstate->pmsa_bank1_gr[9],
-               minstate->pmsa_bank1_gr[10], minstate->pmsa_bank1_gr[11]);
-        printk("r28-31 %016lx %016lx %016lx %016lx\n",
-               minstate->pmsa_bank1_gr[12], minstate->pmsa_bank1_gr[13],
-               minstate->pmsa_bank1_gr[14], minstate->pmsa_bank1_gr[15]);
-}
-
-static void
-fetch_min_state (pal_min_state_area_t *ms, struct pt_regs *pt, struct switch_stack *sw)
-{
-        u64 *dst_banked, *src_banked, bit, shift, nat_bits;
-        int i;
-
-        /*
-         * First, update the pt-regs and switch-stack structures with the contents stored
-         * in the min-state area:
-         */
-        if (((struct ia64_psr *) &ms->pmsa_ipsr)->ic == 0) {
-                pt->cr_ipsr = ms->pmsa_xpsr;
-                pt->cr_iip = ms->pmsa_xip;
-                pt->cr_ifs = ms->pmsa_xfs;
-        } else {
-                pt->cr_ipsr = ms->pmsa_ipsr;
-                pt->cr_iip = ms->pmsa_iip;
-                pt->cr_ifs = ms->pmsa_ifs;
-        }
-        pt->ar_rsc = ms->pmsa_rsc;
-        pt->pr = ms->pmsa_pr;
-        pt->r1 = ms->pmsa_gr[0];
-        pt->r2 = ms->pmsa_gr[1];
-        pt->r3 = ms->pmsa_gr[2];
-        sw->r4 = ms->pmsa_gr[3];
-        sw->r5 = ms->pmsa_gr[4];
-        sw->r6 = ms->pmsa_gr[5];
-        sw->r7 = ms->pmsa_gr[6];
-        pt->r8 = ms->pmsa_gr[7];
-        pt->r9 = ms->pmsa_gr[8];
-        pt->r10 = ms->pmsa_gr[9];
-        pt->r11 = ms->pmsa_gr[10];
-        pt->r12 = ms->pmsa_gr[11];
-        pt->r13 = ms->pmsa_gr[12];
-        pt->r14 = ms->pmsa_gr[13];
-        pt->r15 = ms->pmsa_gr[14];
-        dst_banked = &pt->r16;          /* r16-r31 are contiguous in struct pt_regs */
-        src_banked = ms->pmsa_bank1_gr;
-        for (i = 0; i < 16; ++i)
-                dst_banked[i] = src_banked[i];
-        pt->b0 = ms->pmsa_br0;
-        sw->b1 = ms->pmsa_br1;
-
-        /* construct the NaT bits for the pt-regs structure: */
-#       define PUT_NAT_BIT(dst, addr)                                   \
-        do {                                                            \
-                bit = nat_bits & 1; nat_bits >>= 1;                     \
-                shift = ((unsigned long) addr >> 3) & 0x3f;             \
-                dst = ((dst) & ~(1UL << shift)) | (bit << shift);       \
-        } while (0)
-
-        /* Rotate the saved NaT bits such that bit 0 corresponds to pmsa_gr[0]: */
-        shift = ((unsigned long) &ms->pmsa_gr[0] >> 3) & 0x3f;
-        nat_bits = (ms->pmsa_nat_bits >> shift) | (ms->pmsa_nat_bits << (64 - shift));
-
-        PUT_NAT_BIT(sw->caller_unat, &pt->r1);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r2);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r3);
-        PUT_NAT_BIT(sw->ar_unat, &sw->r4);
-        PUT_NAT_BIT(sw->ar_unat, &sw->r5);
-        PUT_NAT_BIT(sw->ar_unat, &sw->r6);
-        PUT_NAT_BIT(sw->ar_unat, &sw->r7);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r8);  PUT_NAT_BIT(sw->caller_unat, &pt->r9);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r10); PUT_NAT_BIT(sw->caller_unat, &pt->r11);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r12); PUT_NAT_BIT(sw->caller_unat, &pt->r13);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r14); PUT_NAT_BIT(sw->caller_unat, &pt->r15);
-        nat_bits >>= 16;        /* skip over bank0 NaT bits */
-        PUT_NAT_BIT(sw->caller_unat, &pt->r16); PUT_NAT_BIT(sw->caller_unat, &pt->r17);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r18); PUT_NAT_BIT(sw->caller_unat, &pt->r19);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r20); PUT_NAT_BIT(sw->caller_unat, &pt->r21);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r22); PUT_NAT_BIT(sw->caller_unat, &pt->r23);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r24); PUT_NAT_BIT(sw->caller_unat, &pt->r25);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r26); PUT_NAT_BIT(sw->caller_unat, &pt->r27);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r28); PUT_NAT_BIT(sw->caller_unat, &pt->r29);
-        PUT_NAT_BIT(sw->caller_unat, &pt->r30); PUT_NAT_BIT(sw->caller_unat, &pt->r31);
-}
-
-static void
-init_handler_platform (pal_min_state_area_t *ms,
-                       struct pt_regs *pt, struct switch_stack *sw)
-{
-        struct unw_frame_info info;
-
-        /* if a kernel debugger is available call it here else just dump the registers */
-
-        /*
-         * Wait for a bit.  On some machines (e.g., HP's zx2000 and zx6000, INIT can be
-         * generated via the BMC's command-line interface, but since the console is on the
-         * same serial line, the user will need some time to switch out of the BMC before
-         * the dump begins.
-         */
-        printk("Delaying for 5 seconds...\n");
-        udelay(5*1000000);
-        show_min_state(ms);
-
-        printk("Backtrace of current task (pid %d, %s)\n", current->pid, current->comm);
-        fetch_min_state(ms, pt, sw);
-        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
-        {
-                struct task_struct *g, *t;
-                do_each_thread (g, t) {
-                        if (t == current)
-                                continue;
-
-                        printk("\nBacktrace of pid %d (%s)\n", t->pid, t->comm);
-                        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 */
-}
-
 #ifdef CONFIG_ACPI
 /*
  * ia64_mca_register_cpev
@@ -657,42 +478,6 @@ ia64_mca_cmc_vector_enable_keventd(void *unused)
 }
 
 /*
- * ia64_mca_wakeup_ipi_wait
- *
- *      Wait for the inter-cpu interrupt to be sent by the
- *      monarch processor once it is done with handling the
- *      MCA.
- *
- *  Inputs  :   None
- *  Outputs :   None
- */
-static void
-ia64_mca_wakeup_ipi_wait(void)
-{
-        int     irr_num = (IA64_MCA_WAKEUP_VECTOR >> 6);
-        int     irr_bit = (IA64_MCA_WAKEUP_VECTOR & 0x3f);
-        u64     irr = 0;
-
-        do {
-                switch(irr_num) {
-                      case 0:
-                        irr = ia64_getreg(_IA64_REG_CR_IRR0);
-                        break;
-                      case 1:
-                        irr = ia64_getreg(_IA64_REG_CR_IRR1);
-                        break;
-                      case 2:
-                        irr = ia64_getreg(_IA64_REG_CR_IRR2);
-                        break;
-                      case 3:
-                        irr = ia64_getreg(_IA64_REG_CR_IRR3);
-                        break;
-                }
-                cpu_relax();
-        } while (!(irr & (1UL << irr_bit))) ;
-}
-
-/*
  * ia64_mca_wakeup
  *
  *      Send an inter-cpu interrupt to wake-up a particular cpu
@@ -757,11 +542,9 @@ ia64_mca_rendez_int_handler(int rendez_irq, void *arg, struct pt_regs *ptregs)
          */
         ia64_sal_mc_rendez();
 
-        /* Wait for the wakeup IPI from the monarch
-         * This waiting is done by polling on the wakeup-interrupt
-         * vector bit in the processor's IRRs
-         */
-        ia64_mca_wakeup_ipi_wait();
+        /* Wait for the monarch cpu to exit. */
+        while (monarch_cpu != -1)
+               cpu_relax();     /* spin until monarch leaves */
 
         /* Enable all interrupts */
         local_irq_restore(flags);
@@ -789,53 +572,13 @@ ia64_mca_wakeup_int_handler(int wakeup_irq, void *arg, struct pt_regs *ptregs)
         return IRQ_HANDLED;
 }
 
-/*
- * ia64_return_to_sal_check
- *
- *      This is function called before going back from the OS_MCA handler
- *      to the OS_MCA dispatch code which finally takes the control back
- *      to the SAL.
- *      The main purpose of this routine is to setup the OS_MCA to SAL
- *      return state which can be used by the OS_MCA dispatch code
- *      just before going back to SAL.
- *
- *  Inputs  :   None
- *  Outputs :   None
- */
-
-static void
-ia64_return_to_sal_check(int recover)
-{
-
-        /* Copy over some relevant stuff from the sal_to_os_mca_handoff
-         * so that it can be used at the time of os_mca_to_sal_handoff
-         */
-        ia64_os_to_sal_handoff_state.imots_sal_gp =
-                ia64_sal_to_os_handoff_state.imsto_sal_gp;
-
-        ia64_os_to_sal_handoff_state.imots_sal_check_ra =
-                ia64_sal_to_os_handoff_state.imsto_sal_check_ra;
-
-        if (recover)
-                ia64_os_to_sal_handoff_state.imots_os_status = IA64_MCA_CORRECTED;
-        else
-                ia64_os_to_sal_handoff_state.imots_os_status = IA64_MCA_COLD_BOOT;
-
-        /* Default = tell SAL to return to same context */
-        ia64_os_to_sal_handoff_state.imots_context = IA64_MCA_SAME_CONTEXT;
-
-        ia64_os_to_sal_handoff_state.imots_new_min_state =
-                (u64 *)ia64_sal_to_os_handoff_state.pal_min_state;
-
-}
-
 /* Function pointer for extra MCA recovery */
 int (*ia64_mca_ucmc_extension)
-        (void*,ia64_mca_sal_to_os_state_t*,ia64_mca_os_to_sal_state_t*)
+        (void*,struct ia64_sal_os_state*)
         = NULL;
 
 int
-ia64_reg_MCA_extension(void *fn)
+ia64_reg_MCA_extension(int (*fn)(void *, struct ia64_sal_os_state *))
 {
         if (ia64_mca_ucmc_extension)
                 return 1;
@@ -854,8 +597,321 @@ ia64_unreg_MCA_extension(void)
 EXPORT_SYMBOL(ia64_reg_MCA_extension);
 EXPORT_SYMBOL(ia64_unreg_MCA_extension);
 
+
+static inline void
+copy_reg(const u64 *fr, u64 fnat, u64 *tr, u64 *tnat)
+{
+        u64 fslot, tslot, nat;
+        *tr = *fr;
+        fslot = ((unsigned long)fr >> 3) & 63;
+        tslot = ((unsigned long)tr >> 3) & 63;
+        *tnat &= ~(1UL << tslot);
+        nat = (fnat >> fslot) & 1;
+        *tnat |= (nat << tslot);
+}
+
+/* On entry to this routine, we are running on the per cpu stack, see
+ * mca_asm.h.  The original stack has not been touched by this event.  Some of
+ * the original stack's registers will be in the RBS on this stack.  This stack
+ * also contains a partial pt_regs and switch_stack, the rest of the data is in
+ * PAL minstate.
+ *
+ * The first thing to do is modify the original stack to look like a blocked
+ * task so we can run backtrace on the original task.  Also mark the per cpu
+ * stack as current to ensure that we use the correct task state, it also means
+ * that we can do backtrace on the MCA/INIT handler code itself.
+ */
+
+static task_t *
+ia64_mca_modify_original_stack(struct pt_regs *regs,
+                const struct switch_stack *sw,
+                struct ia64_sal_os_state *sos,
+                const char *type)
+{
+        char *p, comm[sizeof(current->comm)];
+        ia64_va va;
+        extern char ia64_leave_kernel[];        /* Need asm address, not function descriptor */
+        const pal_min_state_area_t *ms = sos->pal_min_state;
+        task_t *previous_current;
+        struct pt_regs *old_regs;
+        struct switch_stack *old_sw;
+        unsigned size = sizeof(struct pt_regs) +
+                        sizeof(struct switch_stack) + 16;
+        u64 *old_bspstore, *old_bsp;
+        u64 *new_bspstore, *new_bsp;
+        u64 old_unat, old_rnat, new_rnat, nat;
+        u64 slots, loadrs = regs->loadrs;
+        u64 r12 = ms->pmsa_gr[12-1], r13 = ms->pmsa_gr[13-1];
+        u64 ar_bspstore = regs->ar_bspstore;
+        u64 ar_bsp = regs->ar_bspstore + (loadrs >> 16);
+        const u64 *bank;
+        const char *msg;
+        int cpu = smp_processor_id();
+
+        previous_current = curr_task(cpu);
+        set_curr_task(cpu, current);
+        if ((p = strchr(current->comm, ' ')))
+                *p = '\0';
+
+        /* Best effort attempt to cope with MCA/INIT delivered while in
+         * physical mode.
+         */
+        regs->cr_ipsr = ms->pmsa_ipsr;
+        if (ia64_psr(regs)->dt == 0) {
+                va.l = r12;
+                if (va.f.reg == 0) {
+                        va.f.reg = 7;
+                        r12 = va.l;
+                }
+                va.l = r13;
+                if (va.f.reg == 0) {
+                        va.f.reg = 7;
+                        r13 = va.l;
+                }
+        }
+        if (ia64_psr(regs)->rt == 0) {
+                va.l = ar_bspstore;
+                if (va.f.reg == 0) {
+                        va.f.reg = 7;
+                        ar_bspstore = va.l;
+                }
+                va.l = ar_bsp;
+                if (va.f.reg == 0) {
+                        va.f.reg = 7;
+                        ar_bsp = va.l;
+                }
+        }
+
+        /* mca_asm.S ia64_old_stack() cannot assume that the dirty registers
+         * have been copied to the old stack, the old stack may fail the
+         * validation tests below.  So ia64_old_stack() must restore the dirty
+         * registers from the new stack.  The old and new bspstore probably
+         * have different alignments, so loadrs calculated on the old bsp
+         * cannot be used to restore from the new bsp.  Calculate a suitable
+         * loadrs for the new stack and save it in the new pt_regs, where
+         * ia64_old_stack() can get it.
+         */
+        old_bspstore = (u64 *)ar_bspstore;
+        old_bsp = (u64 *)ar_bsp;
+        slots = ia64_rse_num_regs(old_bspstore, old_bsp);
+        new_bspstore = (u64 *)((u64)current + IA64_RBS_OFFSET);
+        new_bsp = ia64_rse_skip_regs(new_bspstore, slots);
+        regs->loadrs = (new_bsp - new_bspstore) * 8 << 16;
+
+        /* Verify the previous stack state before we change it */
+        if (user_mode(regs)) {
+                msg = "occurred in user space";
+                goto no_mod;
+        }
+        if (r13 != sos->prev_IA64_KR_CURRENT) {
+                msg = "inconsistent previous current and r13";
+                goto no_mod;
+        }
+        if ((r12 - r13) >= KERNEL_STACK_SIZE) {
+                msg = "inconsistent r12 and r13";
+                goto no_mod;
+        }
+        if ((ar_bspstore - r13) >= KERNEL_STACK_SIZE) {
+                msg = "inconsistent ar.bspstore and r13";
+                goto no_mod;
+        }
+        va.p = old_bspstore;
+        if (va.f.reg < 5) {
+                msg = "old_bspstore is in the wrong region";
+                goto no_mod;
+        }
+        if ((ar_bsp - r13) >= KERNEL_STACK_SIZE) {
+                msg = "inconsistent ar.bsp and r13";
+                goto no_mod;
+        }
+        size += (ia64_rse_skip_regs(old_bspstore, slots) - old_bspstore) * 8;
+        if (ar_bspstore + size > r12) {
+                msg = "no room for blocked state";
+                goto no_mod;
+        }
+
+        /* Change the comm field on the MCA/INT task to include the pid that
+         * was interrupted, it makes for easier debugging.  If that pid was 0
+         * (swapper or nested MCA/INIT) then use the start of the previous comm
+         * field suffixed with its cpu.
+         */
+        if (previous_current->pid)
+                snprintf(comm, sizeof(comm), "%s %d",
+                        current->comm, previous_current->pid);
+        else {
+                int l;
+                if ((p = strchr(previous_current->comm, ' ')))
+                        l = p - previous_current->comm;
+                else
+                        l = strlen(previous_current->comm);
+                snprintf(comm, sizeof(comm), "%s %*s %d",
+                        current->comm, l, previous_current->comm,
+                        previous_current->thread_info->cpu);
+        }
+        memcpy(current->comm, comm, sizeof(current->comm));
+
+        /* Make the original task look blocked.  First stack a struct pt_regs,
+         * describing the state at the time of interrupt.  mca_asm.S built a
+         * partial pt_regs, copy it and fill in the blanks using minstate.
+         */
+        p = (char *)r12 - sizeof(*regs);
+        old_regs = (struct pt_regs *)p;
+        memcpy(old_regs, regs, sizeof(*regs));
+        /* If ipsr.ic then use pmsa_{iip,ipsr,ifs}, else use
+         * pmsa_{xip,xpsr,xfs}
+         */
+        if (ia64_psr(regs)->ic) {
+                old_regs->cr_iip = ms->pmsa_iip;
+                old_regs->cr_ipsr = ms->pmsa_ipsr;
+                old_regs->cr_ifs = ms->pmsa_ifs;
+        } else {
+                old_regs->cr_iip = ms->pmsa_xip;
+                old_regs->cr_ipsr = ms->pmsa_xpsr;
+                old_regs->cr_ifs = ms->pmsa_xfs;
+        }
+        old_regs->pr = ms->pmsa_pr;
+        old_regs->b0 = ms->pmsa_br0;
+        old_regs->loadrs = loadrs;
+        old_regs->ar_rsc = ms->pmsa_rsc;
+        old_unat = old_regs->ar_unat;
+        copy_reg(&ms->pmsa_gr[1-1], ms->pmsa_nat_bits, &old_regs->r1, &old_unat);
+        copy_reg(&ms->pmsa_gr[2-1], ms->pmsa_nat_bits, &old_regs->r2, &old_unat);
+        copy_reg(&ms->pmsa_gr[3-1], ms->pmsa_nat_bits, &old_regs->r3, &old_unat);
+        copy_reg(&ms->pmsa_gr[8-1], ms->pmsa_nat_bits, &old_regs->r8, &old_unat);
+        copy_reg(&ms->pmsa_gr[9-1], ms->pmsa_nat_bits, &old_regs->r9, &old_unat);
+        copy_reg(&ms->pmsa_gr[10-1], ms->pmsa_nat_bits, &old_regs->r10, &old_unat);
+        copy_reg(&ms->pmsa_gr[11-1], ms->pmsa_nat_bits, &old_regs->r11, &old_unat);
+        copy_reg(&ms->pmsa_gr[12-1], ms->pmsa_nat_bits, &old_regs->r12, &old_unat);
+        copy_reg(&ms->pmsa_gr[13-1], ms->pmsa_nat_bits, &old_regs->r13, &old_unat);
+        copy_reg(&ms->pmsa_gr[14-1], ms->pmsa_nat_bits, &old_regs->r14, &old_unat);
+        copy_reg(&ms->pmsa_gr[15-1], ms->pmsa_nat_bits, &old_regs->r15, &old_unat);
+        if (ia64_psr(old_regs)->bn)
+                bank = ms->pmsa_bank1_gr;
+        else
+                bank = ms->pmsa_bank0_gr;
+        copy_reg(&bank[16-16], ms->pmsa_nat_bits, &old_regs->r16, &old_unat);
+        copy_reg(&bank[17-16], ms->pmsa_nat_bits, &old_regs->r17, &old_unat);
+        copy_reg(&bank[18-16], ms->pmsa_nat_bits, &old_regs->r18, &old_unat);
+        copy_reg(&bank[19-16], ms->pmsa_nat_bits, &old_regs->r19, &old_unat);
+        copy_reg(&bank[20-16], ms->pmsa_nat_bits, &old_regs->r20, &old_unat);
+        copy_reg(&bank[21-16], ms->pmsa_nat_bits, &old_regs->r21, &old_unat);
+        copy_reg(&bank[22-16], ms->pmsa_nat_bits, &old_regs->r22, &old_unat);
+        copy_reg(&bank[23-16], ms->pmsa_nat_bits, &old_regs->r23, &old_unat);
+        copy_reg(&bank[24-16], ms->pmsa_nat_bits, &old_regs->r24, &old_unat);
+        copy_reg(&bank[25-16], ms->pmsa_nat_bits, &old_regs->r25, &old_unat);
+        copy_reg(&bank[26-16], ms->pmsa_nat_bits, &old_regs->r26, &old_unat);
+        copy_reg(&bank[27-16], ms->pmsa_nat_bits, &old_regs->r27, &old_unat);
+        copy_reg(&bank[28-16], ms->pmsa_nat_bits, &old_regs->r28, &old_unat);
+        copy_reg(&bank[29-16], ms->pmsa_nat_bits, &old_regs->r29, &old_unat);
+        copy_reg(&bank[30-16], ms->pmsa_nat_bits, &old_regs->r30, &old_unat);
+        copy_reg(&bank[31-16], ms->pmsa_nat_bits, &old_regs->r31, &old_unat);
+
+        /* Next stack a struct switch_stack.  mca_asm.S built a partial
+         * switch_stack, copy it and fill in the blanks using pt_regs and
+         * minstate.
+         *
+         * In the synthesized switch_stack, b0 points to ia64_leave_kernel,
+         * ar.pfs is set to 0.
+         *
+         * unwind.c::unw_unwind() does special processing for interrupt frames.
+         * It checks if the PRED_NON_SYSCALL predicate is set, if the predicate
+         * is clear then unw_unwind() does _not_ adjust bsp over pt_regs.  Not
+         * that this is documented, of course.  Set PRED_NON_SYSCALL in the
+         * switch_stack on the original stack so it will unwind correctly when
+         * unwind.c reads pt_regs.
+         *
+         * thread.ksp is updated to point to the synthesized switch_stack.
+         */
+        p -= sizeof(struct switch_stack);
+        old_sw = (struct switch_stack *)p;
+        memcpy(old_sw, sw, sizeof(*sw));
+        old_sw->caller_unat = old_unat;
+        old_sw->ar_fpsr = old_regs->ar_fpsr;
+        copy_reg(&ms->pmsa_gr[4-1], ms->pmsa_nat_bits, &old_sw->r4, &old_unat);
+        copy_reg(&ms->pmsa_gr[5-1], ms->pmsa_nat_bits, &old_sw->r5, &old_unat);
+        copy_reg(&ms->pmsa_gr[6-1], ms->pmsa_nat_bits, &old_sw->r6, &old_unat);
+        copy_reg(&ms->pmsa_gr[7-1], ms->pmsa_nat_bits, &old_sw->r7, &old_unat);
+        old_sw->b0 = (u64)ia64_leave_kernel;
+        old_sw->b1 = ms->pmsa_br1;
+        old_sw->ar_pfs = 0;
+        old_sw->ar_unat = old_unat;
+        old_sw->pr = old_regs->pr | (1UL << PRED_NON_SYSCALL);
+        previous_current->thread.ksp = (u64)p - 16;
+
+        /* Finally copy the original stack's registers back to its RBS.
+         * Registers from ar.bspstore through ar.bsp at the time of the event
+         * are in the current RBS, copy them back to the original stack.  The
+         * copy must be done register by register because the original bspstore
+         * and the current one have different alignments, so the saved RNAT
+         * data occurs at different places.
+         *
+         * mca_asm does cover, so the old_bsp already includes all registers at
+         * the time of MCA/INIT.  It also does flushrs, so all registers before
+         * this function have been written to backing store on the MCA/INIT
+         * stack.
+         */
+        new_rnat = ia64_get_rnat(ia64_rse_rnat_addr(new_bspstore));
+        old_rnat = regs->ar_rnat;
+        while (slots--) {
+                if (ia64_rse_is_rnat_slot(new_bspstore)) {
+                        new_rnat = ia64_get_rnat(new_bspstore++);
+                }
+                if (ia64_rse_is_rnat_slot(old_bspstore)) {
+                        *old_bspstore++ = old_rnat;
+                        old_rnat = 0;
+                }
+                nat = (new_rnat >> ia64_rse_slot_num(new_bspstore)) & 1UL;
+                old_rnat &= ~(1UL << ia64_rse_slot_num(old_bspstore));
+                old_rnat |= (nat << ia64_rse_slot_num(old_bspstore));
+                *old_bspstore++ = *new_bspstore++;
+        }
+        old_sw->ar_bspstore = (unsigned long)old_bspstore;
+        old_sw->ar_rnat = old_rnat;
+
+        sos->prev_task = previous_current;
+        return previous_current;
+
+no_mod:
+        printk(KERN_INFO "cpu %d, %s %s, original stack not modified\n",
+                        smp_processor_id(), type, msg);
+        return previous_current;
+}
+
+/* The monarch/slave interaction is based on monarch_cpu and requires that all
+ * slaves have entered rendezvous before the monarch leaves.  If any cpu has
+ * not entered rendezvous yet then wait a bit.  The assumption is that any
+ * slave that has not rendezvoused after a reasonable time is never going to do
+ * so.  In this context, slave includes cpus that respond to the MCA rendezvous
+ * interrupt, as well as cpus that receive the INIT slave event.
+ */
+
+static void
+ia64_wait_for_slaves(int monarch)
+{
+        int c, wait = 0;
+        for_each_online_cpu(c) {
+                if (c == monarch)
+                        continue;
+                if (ia64_mc_info.imi_rendez_checkin[c] == IA64_MCA_RENDEZ_CHECKIN_NOTDONE) {
+                        udelay(1000);           /* short wait first */
+                        wait = 1;
+                        break;
+                }
+        }
+        if (!wait)
+                return;
+        for_each_online_cpu(c) {
+                if (c == monarch)
+                        continue;
+                if (ia64_mc_info.imi_rendez_checkin[c] == IA64_MCA_RENDEZ_CHECKIN_NOTDONE) {
+                        udelay(5*1000000);      /* wait 5 seconds for slaves (arbitrary) */
+                        break;
+                }
+        }
+}
+
 /*
- * ia64_mca_ucmc_handler
+ * ia64_mca_handler
  *
  *      This is uncorrectable machine check handler called from OS_MCA
  *      dispatch code which is in turn called from SAL_CHECK().
@@ -866,16 +922,28 @@ EXPORT_SYMBOL(ia64_unreg_MCA_extension);
  *      further MCA logging is enabled by clearing logs.
  *      Monarch also has the duty of sending wakeup-IPIs to pull the
  *      slave processors out of rendezvous spinloop.
- *
- *  Inputs  :   None
- *  Outputs :   None
  */
 void
-ia64_mca_ucmc_handler(void)
+ia64_mca_handler(struct pt_regs *regs, struct switch_stack *sw,
+                 struct ia64_sal_os_state *sos)
 {
         pal_processor_state_info_t *psp = (pal_processor_state_info_t *)
-                &ia64_sal_to_os_handoff_state.proc_state_param;
-        int recover; 
+                &sos->proc_state_param;
+        int recover, cpu = smp_processor_id();
+        task_t *previous_current;
+
+        oops_in_progress = 1;   /* FIXME: make printk NMI/MCA/INIT safe */
+        previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "MCA");
+        monarch_cpu = cpu;
+        ia64_wait_for_slaves(cpu);
+
+        /* Wakeup all the processors which are spinning in the rendezvous loop.
+         * They will leave SAL, then spin in the OS with interrupts disabled
+         * until this monarch cpu leaves the MCA handler.  That gets control
+         * back to the OS so we can backtrace the other cpus, backtrace when
+         * spinning in SAL does not work.
+         */
+        ia64_mca_wakeup_all();
 
         /* Get the MCA error record and log it */
         ia64_mca_log_sal_error_record(SAL_INFO_TYPE_MCA);
@@ -883,25 +951,20 @@ ia64_mca_ucmc_handler(void)
         /* TLB error is only exist in this SAL error record */
         recover = (psp->tc && !(psp->cc || psp->bc || psp->rc || psp->uc))
         /* other error recovery */
-           || (ia64_mca_ucmc_extension 
+           || (ia64_mca_ucmc_extension
                 && ia64_mca_ucmc_extension(
                         IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA),
-                        &ia64_sal_to_os_handoff_state,
-                        &ia64_os_to_sal_handoff_state)); 
+                        sos));
 
         if (recover) {
                 sal_log_record_header_t *rh = IA64_LOG_CURR_BUFFER(SAL_INFO_TYPE_MCA);
                 rh->severity = sal_log_severity_corrected;
                 ia64_sal_clear_state_info(SAL_INFO_TYPE_MCA);
+                sos->os_status = IA64_MCA_CORRECTED;
         }
-        /*
-         *  Wakeup all the processors which are spinning in the rendezvous
-         *  loop.
-         */
-        ia64_mca_wakeup_all();
 
-        /* Return to SAL */
-        ia64_return_to_sal_check(recover);
+        set_curr_task(cpu, previous_current);
+        monarch_cpu = -1;
 }
 
 static DECLARE_WORK(cmc_disable_work, ia64_mca_cmc_vector_disable_keventd, NULL);
@@ -1125,34 +1188,114 @@ ia64_mca_cpe_poll (unsigned long dummy)
 /*
  * C portion of the OS INIT handler
  *
- * Called from ia64_monarch_init_handler
- *
- * Inputs: pointer to pt_regs where processor info was saved.
+ * Called from ia64_os_init_dispatch
  *
- * Returns:
- *   0 if SAL must warm boot the System
- *   1 if SAL must return to interrupted context using PAL_MC_RESUME
+ * Inputs: pointer to pt_regs where processor info was saved.  SAL/OS state for
+ * this event.  This code is used for both monarch and slave INIT events, see
+ * sos->monarch.
  *
+ * All INIT events switch to the INIT stack and change the previous process to
+ * blocked status.  If one of the INIT events is the monarch then we are
+ * probably processing the nmi button/command.  Use the monarch cpu to dump all
+ * the processes.  The slave INIT events all spin until the monarch cpu
+ * returns.  We can also get INIT slave events for MCA, in which case the MCA
+ * process is the monarch.
  */
+
 void
-ia64_init_handler (struct pt_regs *pt, struct switch_stack *sw)
+ia64_init_handler(struct pt_regs *regs, struct switch_stack *sw,
+                  struct ia64_sal_os_state *sos)
 {
-        pal_min_state_area_t *ms;
+        static atomic_t slaves;
+        static atomic_t monarchs;
+        task_t *previous_current;
+        int cpu = smp_processor_id(), c;
+        struct task_struct *g, *t;
 
-        oops_in_progress = 1;   /* avoid deadlock in printk, but it makes recovery dodgy */
+        oops_in_progress = 1;   /* FIXME: make printk NMI/MCA/INIT safe */
         console_loglevel = 15;  /* make sure printks make it to console */
 
-        printk(KERN_INFO "Entered OS INIT handler. PSP=%lx\n",
-                ia64_sal_to_os_handoff_state.proc_state_param);
+        printk(KERN_INFO "Entered OS INIT handler. PSP=%lx cpu=%d monarch=%ld\n",
+                sos->proc_state_param, cpu, sos->monarch);
+        salinfo_log_wakeup(SAL_INFO_TYPE_INIT, NULL, 0, 0);
 
-        /*
-         * Address of minstate area provided by PAL is physical,
-         * uncacheable (bit 63 set). Convert to Linux virtual
-         * address in region 6.
+        previous_current = ia64_mca_modify_original_stack(regs, sw, sos, "INIT");
+        sos->os_status = IA64_INIT_RESUME;
+
+        /* FIXME: Workaround for broken proms that drive all INIT events as
+         * slaves.  The last slave that enters is promoted to be a monarch.
+         * Remove this code in September 2006, that gives platforms a year to
+         * fix their proms and get their customers updated.
          */
-        ms = (pal_min_state_area_t *)(ia64_sal_to_os_handoff_state.pal_min_state | (6ul<<61));
+        if (!sos->monarch && atomic_add_return(1, &slaves) == num_online_cpus()) {
+                printk(KERN_WARNING "%s: Promoting cpu %d to monarch.\n",
+                       __FUNCTION__, cpu);
+                atomic_dec(&slaves);
+                sos->monarch = 1;
+        }
+
+        /* FIXME: Workaround for broken proms that drive all INIT events as
+         * monarchs.  Second and subsequent monarchs are demoted to slaves.
+         * Remove this code in September 2006, that gives platforms a year to
+         * fix their proms and get their customers updated.
+         */
+        if (sos->monarch && atomic_add_return(1, &monarchs) > 1) {
+                printk(KERN_WARNING "%s: Demoting cpu %d to slave.\n",
+                               __FUNCTION__, cpu);
+                atomic_dec(&monarchs);
+                sos->monarch = 0;
+        }
 
-        init_handler_platform(ms, pt, sw);      /* call platform specific routines */
+        if (!sos->monarch) {
+                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_INIT;
+                while (monarch_cpu == -1)
+                       cpu_relax();     /* spin until monarch enters */
+                while (monarch_cpu != -1)
+                       cpu_relax();     /* spin until monarch leaves */
+                printk("Slave on cpu %d returning to normal service.\n", cpu);
+                set_curr_task(cpu, previous_current);
+                ia64_mc_info.imi_rendez_checkin[cpu] = IA64_MCA_RENDEZ_CHECKIN_NOTDONE;
+                atomic_dec(&slaves);
+                return;
+        }
+
+        monarch_cpu = cpu;
+
+        /*
+         * Wait for a bit.  On some machines (e.g., HP's zx2000 and zx6000, INIT can be
+         * generated via the BMC's command-line interface, but since the console is on the
+         * same serial line, the user will need some time to switch out of the BMC before
+         * the dump begins.
+         */
+        printk("Delaying for 5 seconds...\n");
+        udelay(5*1000000);
+        ia64_wait_for_slaves(cpu);
+        printk(KERN_ERR "Processes interrupted by INIT -");
+        for_each_online_cpu(c) {
+                struct ia64_sal_os_state *s;
+                t = __va(__per_cpu_mca[c] + IA64_MCA_CPU_INIT_STACK_OFFSET);
+                s = (struct ia64_sal_os_state *)((char *)t + MCA_SOS_OFFSET);
+                g = s->prev_task;
+                if (g) {
+                        if (g->pid)
+                                printk(" %d", g->pid);
+                        else
+                                printk(" %d (cpu %d task 0x%p)", g->pid, task_cpu(g), g);
+                }
+        }
+        printk("\n\n");
+        if (read_trylock(&tasklist_lock)) {
+                do_each_thread (g, t) {
+                        printk("\nBacktrace of pid %d (%s)\n", t->pid, t->comm);
+                        show_stack(t, NULL);
+                } while_each_thread (g, t);
+                read_unlock(&tasklist_lock);
+        }
+        printk("\nINIT dump complete.  Monarch on cpu %d returning to normal service.\n", cpu);
+        atomic_dec(&monarchs);
+        set_curr_task(cpu, previous_current);
+        monarch_cpu = -1;
+        return;
 }
 
 static int __init
@@ -1202,6 +1345,34 @@ static struct irqaction mca_cpep_irqaction = {
 };
 #endif /* CONFIG_ACPI */
 
+/* Minimal format of the MCA/INIT stacks.  The pseudo processes that run on
+ * these stacks can never sleep, they cannot return from the kernel to user
+ * space, they do not appear in a normal ps listing.  So there is no need to
+ * format most of the fields.
+ */
+
+static void
+format_mca_init_stack(void *mca_data, unsigned long offset,
+                const char *type, int cpu)
+{
+        struct task_struct *p = (struct task_struct *)((char *)mca_data + offset);
+        struct thread_info *ti;
+        memset(p, 0, KERNEL_STACK_SIZE);
+        ti = (struct thread_info *)((char *)p + IA64_TASK_SIZE);
+        ti->flags = _TIF_MCA_INIT;
+        ti->preempt_count = 1;
+        ti->task = p;
+        ti->cpu = cpu;
+        p->thread_info = ti;
+        p->state = TASK_UNINTERRUPTIBLE;
+        __set_bit(cpu, &p->cpus_allowed);
+        INIT_LIST_HEAD(&p->tasks);
+        p->parent = p->real_parent = p->group_leader = p;
+        INIT_LIST_HEAD(&p->children);
+        INIT_LIST_HEAD(&p->sibling);
+        strncpy(p->comm, type, sizeof(p->comm)-1);
+}
+
 /* Do per-CPU MCA-related initialization.  */
 
 void __devinit
@@ -1214,19 +1385,28 @@ ia64_mca_cpu_init(void *cpu_data)
                 int cpu;
 
                 mca_data = alloc_bootmem(sizeof(struct ia64_mca_cpu)
-                                         * NR_CPUS);
+                                         * NR_CPUS + KERNEL_STACK_SIZE);
+                mca_data = (void *)(((unsigned long)mca_data +
+                                        KERNEL_STACK_SIZE - 1) &
+                                (-KERNEL_STACK_SIZE));
                 for (cpu = 0; cpu < NR_CPUS; cpu++) {
+                        format_mca_init_stack(mca_data,
+                                        offsetof(struct ia64_mca_cpu, mca_stack),
+                                        "MCA", cpu);
+                        format_mca_init_stack(mca_data,
+                                        offsetof(struct ia64_mca_cpu, init_stack),
+                                        "INIT", cpu);
                         __per_cpu_mca[cpu] = __pa(mca_data);
                         mca_data += sizeof(struct ia64_mca_cpu);
                 }
         }
 
-        /*
-         * The MCA info structure was allocated earlier and its
-         * physical address saved in __per_cpu_mca[cpu].  Copy that
-         * address * to ia64_mca_data so we can access it as a per-CPU
-         * variable.
-         */
+        /*
+         * The MCA info structure was allocated earlier and its
+         * physical address saved in __per_cpu_mca[cpu].  Copy that
+         * address * to ia64_mca_data so we can access it as a per-CPU
+         * variable.
+         */
         __get_cpu_var(ia64_mca_data) = __per_cpu_mca[smp_processor_id()];
 
         /*
@@ -1236,11 +1416,11 @@ ia64_mca_cpu_init(void *cpu_data)
         __get_cpu_var(ia64_mca_per_cpu_pte) =
                 pte_val(mk_pte_phys(__pa(cpu_data), PAGE_KERNEL));
 
-        /*
-         * Also, stash away a copy of the PAL address and the PTE
-         * needed to map it.
-         */
-        pal_vaddr = efi_get_pal_addr();
+        /*
+         * Also, stash away a copy of the PAL address and the PTE
+         * needed to map it.
+         */
+        pal_vaddr = efi_get_pal_addr();
         if (!pal_vaddr)
                 return;
         __get_cpu_var(ia64_mca_pal_base) =
@@ -1272,8 +1452,8 @@ ia64_mca_cpu_init(void *cpu_data)
 void __init
 ia64_mca_init(void)
 {
-        ia64_fptr_t *mon_init_ptr = (ia64_fptr_t *)ia64_monarch_init_handler;
-        ia64_fptr_t *slave_init_ptr = (ia64_fptr_t *)ia64_slave_init_handler;
+        ia64_fptr_t *init_hldlr_ptr_monarch = (ia64_fptr_t *)ia64_os_init_dispatch_monarch;
+        ia64_fptr_t *init_hldlr_ptr_slave = (ia64_fptr_t *)ia64_os_init_dispatch_slave;
         ia64_fptr_t *mca_hldlr_ptr = (ia64_fptr_t *)ia64_os_mca_dispatch;
         int i;
         s64 rc;
@@ -1351,9 +1531,9 @@ ia64_mca_init(void)
          * XXX - disable SAL checksum by setting size to 0, should be
          * size of the actual init handler in mca_asm.S.
          */
-        ia64_mc_info.imi_monarch_init_handler           = ia64_tpa(mon_init_ptr->fp);
+        ia64_mc_info.imi_monarch_init_handler           = ia64_tpa(init_hldlr_ptr_monarch->fp);
         ia64_mc_info.imi_monarch_init_handler_size      = 0;
-        ia64_mc_info.imi_slave_init_handler             = ia64_tpa(slave_init_ptr->fp);
+        ia64_mc_info.imi_slave_init_handler             = ia64_tpa(init_hldlr_ptr_slave->fp);
         ia64_mc_info.imi_slave_init_handler_size        = 0;
 
         IA64_MCA_DEBUG("%s: OS INIT handler at %lx\n", __FUNCTION__,
diff --git a/arch/ia64/kernel/mca_asm.S b/arch/ia64/kernel/mca_asm.S
index ef3fd7265b67..499a065f4e60 100644
--- a/arch/ia64/kernel/mca_asm.S
+++ b/arch/ia64/kernel/mca_asm.S
@@ -16,6 +16,9 @@
 // 04/11/12 Russ Anderson <rja@sgi.com>
 //                 Added per cpu MCA/INIT stack save areas.
 //
+// 12/08/05 Keith Owens <kaos@sgi.com>
+//                 Use per cpu MCA/INIT stacks for all data.
+//
 #include <linux/config.h>
 #include <linux/threads.h>
 
@@ -25,96 +28,23 @@
 #include <asm/mca_asm.h>
 #include <asm/mca.h>
 
-/*
- * When we get a machine check, the kernel stack pointer is no longer
- * valid, so we need to set a new stack pointer.
- */
-#define MINSTATE_PHYS   /* Make sure stack access is physical for MINSTATE */
-
-/*
- * Needed for return context to SAL
- */
-#define IA64_MCA_SAME_CONTEXT   0
-#define IA64_MCA_COLD_BOOT      -2
-
-#include "minstate.h"
-
-/*
- * SAL_TO_OS_MCA_HANDOFF_STATE (SAL 3.0 spec)
- *              1. GR1 = OS GP
- *              2. GR8 = PAL_PROC physical address
- *              3. GR9 = SAL_PROC physical address
- *              4. GR10 = SAL GP (physical)
- *              5. GR11 = Rendez state
- *              6. GR12 = Return address to location within SAL_CHECK
- */
-#define SAL_TO_OS_MCA_HANDOFF_STATE_SAVE(_tmp)          \
-        LOAD_PHYSICAL(p0, _tmp, ia64_sal_to_os_handoff_state);; \
-        st8     [_tmp]=r1,0x08;;                        \
-        st8     [_tmp]=r8,0x08;;                        \
-        st8     [_tmp]=r9,0x08;;                        \
-        st8     [_tmp]=r10,0x08;;                       \
-        st8     [_tmp]=r11,0x08;;                       \
-        st8     [_tmp]=r12,0x08;;                       \
-        st8     [_tmp]=r17,0x08;;                       \
-        st8     [_tmp]=r18,0x08
-
-/*
- * OS_MCA_TO_SAL_HANDOFF_STATE (SAL 3.0 spec)
- * (p6) is executed if we never entered virtual mode (TLB error)
- * (p7) is executed if we entered virtual mode as expected (normal case)
- *      1. GR8 = OS_MCA return status
- *      2. GR9 = SAL GP (physical)
- *      3. GR10 = 0/1 returning same/new context
- *      4. GR22 = New min state save area pointer
- *      returns ptr to SAL rtn save loc in _tmp
- */
-#define OS_MCA_TO_SAL_HANDOFF_STATE_RESTORE(_tmp)       \
-        movl    _tmp=ia64_os_to_sal_handoff_state;;     \
-        DATA_VA_TO_PA(_tmp);;                           \
-        ld8     r8=[_tmp],0x08;;                        \
-        ld8     r9=[_tmp],0x08;;                        \
-        ld8     r10=[_tmp],0x08;;                       \
-        ld8     r22=[_tmp],0x08;;
-        // now _tmp is pointing to SAL rtn save location
-
-/*
- * COLD_BOOT_HANDOFF_STATE() sets ia64_mca_os_to_sal_state
- *      imots_os_status=IA64_MCA_COLD_BOOT
- *      imots_sal_gp=SAL GP
- *      imots_context=IA64_MCA_SAME_CONTEXT
- *      imots_new_min_state=Min state save area pointer
- *      imots_sal_check_ra=Return address to location within SAL_CHECK
- *
- */
-#define COLD_BOOT_HANDOFF_STATE(sal_to_os_handoff,os_to_sal_handoff,tmp)\
-        movl    tmp=IA64_MCA_COLD_BOOT;                                 \
-        movl    sal_to_os_handoff=__pa(ia64_sal_to_os_handoff_state);   \
-        movl    os_to_sal_handoff=__pa(ia64_os_to_sal_handoff_state);;  \
-        st8     [os_to_sal_handoff]=tmp,8;;                             \
-        ld8     tmp=[sal_to_os_handoff],48;;                            \
-        st8     [os_to_sal_handoff]=tmp,8;;                             \
-        movl    tmp=IA64_MCA_SAME_CONTEXT;;                             \
-        st8     [os_to_sal_handoff]=tmp,8;;                             \
-        ld8     tmp=[sal_to_os_handoff],-8;;                            \
-        st8     [os_to_sal_handoff]=tmp,8;;                             \
-        ld8     tmp=[sal_to_os_handoff];;                               \
-        st8     [os_to_sal_handoff]=tmp;;
+#include "entry.h"
 
 #define GET_IA64_MCA_DATA(reg)                                          \
         GET_THIS_PADDR(reg, ia64_mca_data)                              \
         ;;                                                              \
         ld8 reg=[reg]
 
-        .global ia64_os_mca_dispatch
-        .global ia64_os_mca_dispatch_end
-        .global ia64_sal_to_os_handoff_state
-        .global ia64_os_to_sal_handoff_state
         .global ia64_do_tlb_purge
+        .global ia64_os_mca_dispatch
+        .global ia64_os_init_dispatch_monarch
+        .global ia64_os_init_dispatch_slave
 
         .text
         .align 16
 
+//StartMain////////////////////////////////////////////////////////////////////
+
 /*
  * Just the TLB purge part is moved to a separate function
  * so we can re-use the code for cpu hotplug code as well
@@ -207,34 +137,31 @@ ia64_do_tlb_purge:
         br.sptk.many b1
         ;;
 
-ia64_os_mca_dispatch:
+//EndMain//////////////////////////////////////////////////////////////////////
+
+//StartMain////////////////////////////////////////////////////////////////////
 
+ia64_os_mca_dispatch:
         // Serialize all MCA processing
         mov     r3=1;;
         LOAD_PHYSICAL(p0,r2,ia64_mca_serialize);;
 ia64_os_mca_spin:
-        xchg8   r4=[r2],r3;;
+        xchg4   r4=[r2],r3;;
         cmp.ne  p6,p0=r4,r0
 (p6)    br ia64_os_mca_spin
 
-        // Save the SAL to OS MCA handoff state as defined
-        // by SAL SPEC 3.0
-        // NOTE : The order in which the state gets saved
-        //        is dependent on the way the C-structure
-        //        for ia64_mca_sal_to_os_state_t has been
-        //        defined in include/asm/mca.h
-        SAL_TO_OS_MCA_HANDOFF_STATE_SAVE(r2)
-        ;;
-
-        // LOG PROCESSOR STATE INFO FROM HERE ON..
-begin_os_mca_dump:
-        br      ia64_os_mca_proc_state_dump;;
+        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        mov r19=1                               // All MCA events are treated as monarch (for now)
+        br.sptk ia64_state_save                 // save the state that is not in minstate
+1:
 
-ia64_os_mca_done_dump:
-
-        LOAD_PHYSICAL(p0,r16,ia64_sal_to_os_handoff_state+56)
+        GET_IA64_MCA_DATA(r2)
+        // Using MCA stack, struct ia64_sal_os_state, variable proc_state_param
+        ;;
+        add r3=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_SOS_OFFSET+IA64_SAL_OS_STATE_PROC_STATE_PARAM_OFFSET, r2
         ;;
-        ld8 r18=[r16]           // Get processor state parameter on existing PALE_CHECK.
+        ld8 r18=[r3]                            // Get processor state parameter on existing PALE_CHECK.
         ;;
         tbit.nz p6,p7=r18,60
 (p7)    br.spnt done_tlb_purge_and_reload
@@ -323,624 +250,775 @@ ia64_reload_tr:
         itr.d dtr[r20]=r16
         ;;
         srlz.d
-        ;;
-        br.sptk.many done_tlb_purge_and_reload
-err:
-        COLD_BOOT_HANDOFF_STATE(r20,r21,r22)
-        br.sptk.many ia64_os_mca_done_restore
 
 done_tlb_purge_and_reload:
 
-        // Setup new stack frame for OS_MCA handling
-        GET_IA64_MCA_DATA(r2)
-        ;;
-        add r3 = IA64_MCA_CPU_STACKFRAME_OFFSET, r2
-        add r2 = IA64_MCA_CPU_RBSTORE_OFFSET, r2
-        ;;
-        rse_switch_context(r6,r3,r2);;  // RSC management in this new context
+        // switch to per cpu MCA stack
+        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_new_stack
+1:
+
+        // everything saved, now we can set the kernel registers
+        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_set_kernel_registers
+1:
 
+        // This must be done in physical mode
         GET_IA64_MCA_DATA(r2)
         ;;
-        add r2 = IA64_MCA_CPU_STACK_OFFSET+IA64_MCA_STACK_SIZE-16, r2
-        ;;
-        mov r12=r2              // establish new stack-pointer
+        mov r7=r2
 
         // Enter virtual mode from physical mode
         VIRTUAL_MODE_ENTER(r2, r3, ia64_os_mca_virtual_begin, r4)
-ia64_os_mca_virtual_begin:
+
+        // This code returns to SAL via SOS r2, in general SAL has no unwind
+        // data.  To get a clean termination when backtracing the C MCA/INIT
+        // handler, set a dummy return address of 0 in this routine.  That
+        // requires that ia64_os_mca_virtual_begin be a global function.
+ENTRY(ia64_os_mca_virtual_begin)
+        .prologue
+        .save rp,r0
+        .body
+
+        mov ar.rsc=3                            // set eager mode for C handler
+        mov r2=r7                               // see GET_IA64_MCA_DATA above
+        ;;
 
         // Call virtual mode handler
-        movl            r2=ia64_mca_ucmc_handler;;
-        mov             b6=r2;;
-        br.call.sptk.many    b0=b6;;
-.ret0:
+        alloc r14=ar.pfs,0,0,3,0
+        ;;
+        DATA_PA_TO_VA(r2,r7)
+        ;;
+        add out0=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_PT_REGS_OFFSET, r2
+        add out1=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_SWITCH_STACK_OFFSET, r2
+        add out2=IA64_MCA_CPU_MCA_STACK_OFFSET+MCA_SOS_OFFSET, r2
+        br.call.sptk.many    b0=ia64_mca_handler
+
         // Revert back to physical mode before going back to SAL
         PHYSICAL_MODE_ENTER(r2, r3, ia64_os_mca_virtual_end, r4)
 ia64_os_mca_virtual_end:
 
-        // restore the original stack frame here
+END(ia64_os_mca_virtual_begin)
+
+        // switch back to previous stack
+        alloc r14=ar.pfs,0,0,0,0                // remove the MCA handler frame
+        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_old_stack
+1:
+
+        mov r3=IA64_MCA_CPU_MCA_STACK_OFFSET    // use the MCA stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_state_restore              // restore the SAL state
+1:
+
+        mov             b0=r12                  // SAL_CHECK return address
+
+        // release lock
+        LOAD_PHYSICAL(p0,r3,ia64_mca_serialize);;
+        st4.rel         [r3]=r0
+
+        br              b0
+
+//EndMain//////////////////////////////////////////////////////////////////////
+
+//StartMain////////////////////////////////////////////////////////////////////
+
+//
+// SAL to OS entry point for INIT on all processors.  This has been defined for
+// registration purposes with SAL as a part of ia64_mca_init.  Monarch and
+// slave INIT have identical processing, except for the value of the
+// sos->monarch flag in r19.
+//
+
+ia64_os_init_dispatch_monarch:
+        mov r19=1                               // Bow, bow, ye lower middle classes!
+        br.sptk ia64_os_init_dispatch
+
+ia64_os_init_dispatch_slave:
+        mov r19=0                               // <igor>yeth, mathter</igor>
+
+ia64_os_init_dispatch:
+
+        mov r3=IA64_MCA_CPU_INIT_STACK_OFFSET   // use the INIT stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_state_save                 // save the state that is not in minstate
+1:
+
+        // switch to per cpu INIT stack
+        mov r3=IA64_MCA_CPU_INIT_STACK_OFFSET   // use the INIT stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_new_stack
+1:
+
+        // everything saved, now we can set the kernel registers
+        mov r3=IA64_MCA_CPU_INIT_STACK_OFFSET   // use the INIT stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_set_kernel_registers
+1:
+
+        // This must be done in physical mode
         GET_IA64_MCA_DATA(r2)
         ;;
-        add r2 = IA64_MCA_CPU_STACKFRAME_OFFSET, r2
-        ;;
-        movl    r4=IA64_PSR_MC
+        mov r7=r2
+
+        // Enter virtual mode from physical mode
+        VIRTUAL_MODE_ENTER(r2, r3, ia64_os_init_virtual_begin, r4)
+
+        // This code returns to SAL via SOS r2, in general SAL has no unwind
+        // data.  To get a clean termination when backtracing the C MCA/INIT
+        // handler, set a dummy return address of 0 in this routine.  That
+        // requires that ia64_os_init_virtual_begin be a global function.
+ENTRY(ia64_os_init_virtual_begin)
+        .prologue
+        .save rp,r0
+        .body
+
+        mov ar.rsc=3                            // set eager mode for C handler
+        mov r2=r7                               // see GET_IA64_MCA_DATA above
         ;;
-        rse_return_context(r4,r3,r2)    // switch from interrupt context for RSE
 
-        // let us restore all the registers from our PSI structure
-        mov     r8=gp
+        // Call virtual mode handler
+        alloc r14=ar.pfs,0,0,3,0
+        ;;
+        DATA_PA_TO_VA(r2,r7)
         ;;
-begin_os_mca_restore:
-        br      ia64_os_mca_proc_state_restore;;
+        add out0=IA64_MCA_CPU_INIT_STACK_OFFSET+MCA_PT_REGS_OFFSET, r2
+        add out1=IA64_MCA_CPU_INIT_STACK_OFFSET+MCA_SWITCH_STACK_OFFSET, r2
+        add out2=IA64_MCA_CPU_INIT_STACK_OFFSET+MCA_SOS_OFFSET, r2
+        br.call.sptk.many    b0=ia64_init_handler
 
-ia64_os_mca_done_restore:
-        OS_MCA_TO_SAL_HANDOFF_STATE_RESTORE(r2);;
-        // branch back to SALE_CHECK
-        ld8             r3=[r2];;
-        mov             b0=r3;;         // SAL_CHECK return address
+        // Revert back to physical mode before going back to SAL
+        PHYSICAL_MODE_ENTER(r2, r3, ia64_os_init_virtual_end, r4)
+ia64_os_init_virtual_end:
 
-        // release lock
-        movl            r3=ia64_mca_serialize;;
-        DATA_VA_TO_PA(r3);;
-        st8.rel         [r3]=r0
+END(ia64_os_init_virtual_begin)
+
+        mov r3=IA64_MCA_CPU_INIT_STACK_OFFSET   // use the INIT stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_state_restore              // restore the SAL state
+1:
 
+        // switch back to previous stack
+        alloc r14=ar.pfs,0,0,0,0                // remove the INIT handler frame
+        mov r3=IA64_MCA_CPU_INIT_STACK_OFFSET   // use the INIT stack
+        LOAD_PHYSICAL(p0,r2,1f)                 // return address
+        br.sptk ia64_old_stack
+1:
+
+        mov             b0=r12                  // SAL_CHECK return address
         br              b0
-        ;;
-ia64_os_mca_dispatch_end:
+
 //EndMain//////////////////////////////////////////////////////////////////////
 
+// common defines for the stubs
+#define ms              r4
+#define regs            r5
+#define temp1           r2      /* careful, it overlaps with input registers */
+#define temp2           r3      /* careful, it overlaps with input registers */
+#define temp3           r7
+#define temp4           r14
+
 
 //++
 // Name:
-//      ia64_os_mca_proc_state_dump()
+//      ia64_state_save()
 //
 // Stub Description:
 //
-//       This stub dumps the processor state during MCHK to a data area
+//      Save the state that is not in minstate.  This is sensitive to the layout of
+//      struct ia64_sal_os_state in mca.h.
+//
+//      r2 contains the return address, r3 contains either
+//      IA64_MCA_CPU_MCA_STACK_OFFSET or IA64_MCA_CPU_INIT_STACK_OFFSET.
+//
+//      The OS to SAL section of struct ia64_sal_os_state is set to a default
+//      value of cold boot (MCA) or warm boot (INIT) and return to the same
+//      context.  ia64_sal_os_state is also used to hold some registers that
+//      need to be saved and restored across the stack switches.
+//
+//      Most input registers to this stub come from PAL/SAL
+//      r1  os gp, physical
+//      r8  pal_proc entry point
+//      r9  sal_proc entry point
+//      r10 sal gp
+//      r11 MCA - rendevzous state, INIT - reason code
+//      r12 sal return address
+//      r17 pal min_state
+//      r18 processor state parameter
+//      r19 monarch flag, set by the caller of this routine
+//
+//      In addition to the SAL to OS state, this routine saves all the
+//      registers that appear in struct pt_regs and struct switch_stack,
+//      excluding those that are already in the PAL minstate area.  This
+//      results in a partial pt_regs and switch_stack, the C code copies the
+//      remaining registers from PAL minstate to pt_regs and switch_stack.  The
+//      resulting structures contain all the state of the original process when
+//      MCA/INIT occurred.
 //
 //--
 
-ia64_os_mca_proc_state_dump:
-// Save bank 1 GRs 16-31 which will be used by c-language code when we switch
-//  to virtual addressing mode.
-        GET_IA64_MCA_DATA(r2)
+ia64_state_save:
+        add regs=MCA_SOS_OFFSET, r3
+        add ms=MCA_SOS_OFFSET+8, r3
+        mov b0=r2               // save return address
+        cmp.eq p1,p2=IA64_MCA_CPU_MCA_STACK_OFFSET, r3
+        ;;
+        GET_IA64_MCA_DATA(temp2)
+        ;;
+        add temp1=temp2, regs   // struct ia64_sal_os_state on MCA or INIT stack
+        add temp2=temp2, ms     // struct ia64_sal_os_state+8 on MCA or INIT stack
+        ;;
+        mov regs=temp1          // save the start of sos
+        st8 [temp1]=r1,16       // os_gp
+        st8 [temp2]=r8,16       // pal_proc
+        ;;
+        st8 [temp1]=r9,16       // sal_proc
+        st8 [temp2]=r11,16      // rv_rc
+        mov r11=cr.iipa
+        ;;
+        st8 [temp1]=r18,16      // proc_state_param
+        st8 [temp2]=r19,16      // monarch
+        mov r6=IA64_KR(CURRENT)
+        ;;
+        st8 [temp1]=r12,16      // sal_ra
+        st8 [temp2]=r10,16      // sal_gp
+        mov r12=cr.isr
+        ;;
+        st8 [temp1]=r17,16      // pal_min_state
+        st8 [temp2]=r6,16       // prev_IA64_KR_CURRENT
+        mov r6=cr.ifa
+        ;;
+        st8 [temp1]=r0,16       // prev_task, starts off as NULL
+        st8 [temp2]=r12,16      // cr.isr
+        mov r12=cr.itir
+        ;;
+        st8 [temp1]=r6,16       // cr.ifa
+        st8 [temp2]=r12,16      // cr.itir
+        mov r12=cr.iim
+        ;;
+        st8 [temp1]=r11,16      // cr.iipa
+        st8 [temp2]=r12,16      // cr.iim
+        mov r6=cr.iha
+(p1)    mov r12=IA64_MCA_COLD_BOOT
+(p2)    mov r12=IA64_INIT_WARM_BOOT
+        ;;
+        st8 [temp1]=r6,16       // cr.iha
+        st8 [temp2]=r12         // os_status, default is cold boot
+        mov r6=IA64_MCA_SAME_CONTEXT
+        ;;
+        st8 [temp1]=r6          // context, default is same context
+
+        // Save the pt_regs data that is not in minstate.  The previous code
+        // left regs at sos.
+        add regs=MCA_PT_REGS_OFFSET-MCA_SOS_OFFSET, regs
+        ;;
+        add temp1=PT(B6), regs
+        mov temp3=b6
+        mov temp4=b7
+        add temp2=PT(B7), regs
+        ;;
+        st8 [temp1]=temp3,PT(AR_CSD)-PT(B6)             // save b6
+        st8 [temp2]=temp4,PT(AR_SSD)-PT(B7)             // save b7
+        mov temp3=ar.csd
+        mov temp4=ar.ssd
+        cover                                           // must be last in group
         ;;
-        add r2 = IA64_MCA_CPU_PROC_STATE_DUMP_OFFSET, r2
-        ;;
-// save ar.NaT
-        mov             r5=ar.unat                  // ar.unat
-
-// save banked GRs 16-31 along with NaT bits
-        bsw.1;;
-        st8.spill       [r2]=r16,8;;
-        st8.spill       [r2]=r17,8;;
-        st8.spill       [r2]=r18,8;;
-        st8.spill       [r2]=r19,8;;
-        st8.spill       [r2]=r20,8;;
-        st8.spill       [r2]=r21,8;;
-        st8.spill       [r2]=r22,8;;
-        st8.spill       [r2]=r23,8;;
-        st8.spill       [r2]=r24,8;;
-        st8.spill       [r2]=r25,8;;
-        st8.spill       [r2]=r26,8;;
-        st8.spill       [r2]=r27,8;;
-        st8.spill       [r2]=r28,8;;
-        st8.spill       [r2]=r29,8;;
-        st8.spill       [r2]=r30,8;;
-        st8.spill       [r2]=r31,8;;
-
-        mov             r4=ar.unat;;
-        st8             [r2]=r4,8                // save User NaT bits for r16-r31
-        mov             ar.unat=r5                  // restore original unat
-        bsw.0;;
-
-//save BRs
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2                // duplicate r2 in r4
-
-        mov             r3=b0
-        mov             r5=b1
-        mov             r7=b2;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=b3
-        mov             r5=b4
-        mov             r7=b5;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=b6
-        mov             r5=b7;;
-        st8             [r2]=r3,2*8
-        st8             [r4]=r5,2*8;;
-
-cSaveCRs:
-// save CRs
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2                // duplicate r2 in r4
-
-        mov             r3=cr.dcr
-        mov             r5=cr.itm
-        mov             r7=cr.iva;;
-
-        st8             [r2]=r3,8*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;            // 48 byte rements
-
-        mov             r3=cr.pta;;
-        st8             [r2]=r3,8*8;;            // 64 byte rements
-
-// if PSR.ic=0, reading interruption registers causes an illegal operation fault
-        mov             r3=psr;;
-        tbit.nz.unc     p6,p0=r3,PSR_IC;;           // PSI Valid Log bit pos. test
-(p6)    st8     [r2]=r0,9*8+160             // increment by 232 byte inc.
-begin_skip_intr_regs:
-(p6)    br              SkipIntrRegs;;
-
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2                // duplicate r2 in r6
-
-        mov             r3=cr.ipsr
-        mov             r5=cr.isr
-        mov             r7=r0;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=cr.iip
-        mov             r5=cr.ifa
-        mov             r7=cr.itir;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=cr.iipa
-        mov             r5=cr.ifs
-        mov             r7=cr.iim;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=cr25;;                   // cr.iha
-        st8             [r2]=r3,160;;               // 160 byte rement
-
-SkipIntrRegs:
-        st8             [r2]=r0,152;;               // another 152 byte .
-
-        add             r4=8,r2                     // duplicate r2 in r4
-        add             r6=2*8,r2                   // duplicate r2 in r6
-
-        mov             r3=cr.lid
-//      mov             r5=cr.ivr                     // cr.ivr, don't read it
-        mov             r7=cr.tpr;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=r0                       // cr.eoi => cr67
-        mov             r5=r0                       // cr.irr0 => cr68
-        mov             r7=r0;;                     // cr.irr1 => cr69
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=r0                       // cr.irr2 => cr70
-        mov             r5=r0                       // cr.irr3 => cr71
-        mov             r7=cr.itv;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=cr.pmv
-        mov             r5=cr.cmcv;;
-        st8             [r2]=r3,7*8
-        st8             [r4]=r5,7*8;;
-
-        mov             r3=r0                       // cr.lrr0 => cr80
-        mov             r5=r0;;                     // cr.lrr1 => cr81
-        st8             [r2]=r3,23*8
-        st8             [r4]=r5,23*8;;
-
-        adds            r2=25*8,r2;;
-
-cSaveARs:
-// save ARs
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2                // duplicate r2 in r6
-
-        mov             r3=ar.k0
-        mov             r5=ar.k1
-        mov             r7=ar.k2;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=ar.k3
-        mov             r5=ar.k4
-        mov             r7=ar.k5;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=ar.k6
-        mov             r5=ar.k7
-        mov             r7=r0;;                     // ar.kr8
-        st8             [r2]=r3,10*8
-        st8             [r4]=r5,10*8
-        st8             [r6]=r7,10*8;;           // rement by 72 bytes
-
-        mov             r3=ar.rsc
-        mov             ar.rsc=r0                           // put RSE in enforced lazy mode
-        mov             r5=ar.bsp
-        ;;
-        mov             r7=ar.bspstore;;
-        st8             [r2]=r3,3*8
-        st8             [r4]=r5,3*8
-        st8             [r6]=r7,3*8;;
-
-        mov             r3=ar.rnat;;
-        st8             [r2]=r3,8*13             // increment by 13x8 bytes
-
-        mov             r3=ar.ccv;;
-        st8             [r2]=r3,8*4
-
-        mov             r3=ar.unat;;
-        st8             [r2]=r3,8*4
-
-        mov             r3=ar.fpsr;;
-        st8             [r2]=r3,8*4
-
-        mov             r3=ar.itc;;
-        st8             [r2]=r3,160                 // 160
-
-        mov             r3=ar.pfs;;
-        st8             [r2]=r3,8
-
-        mov             r3=ar.lc;;
-        st8             [r2]=r3,8
-
-        mov             r3=ar.ec;;
-        st8             [r2]=r3
-        add             r2=8*62,r2               //padding
-
-// save RRs
-        mov             ar.lc=0x08-1
-        movl            r4=0x00;;
-
-cStRR:
-        dep.z           r5=r4,61,3;;
-        mov             r3=rr[r5];;
-        st8             [r2]=r3,8
-        add             r4=1,r4
-        br.cloop.sptk.few       cStRR
-        ;;
-end_os_mca_dump:
-        br      ia64_os_mca_done_dump;;
+        st8 [temp1]=temp3,PT(AR_UNAT)-PT(AR_CSD)        // save ar.csd
+        st8 [temp2]=temp4,PT(AR_PFS)-PT(AR_SSD)         // save ar.ssd
+        mov temp3=ar.unat
+        mov temp4=ar.pfs
+        ;;
+        st8 [temp1]=temp3,PT(AR_RNAT)-PT(AR_UNAT)       // save ar.unat
+        st8 [temp2]=temp4,PT(AR_BSPSTORE)-PT(AR_PFS)    // save ar.pfs
+        mov temp3=ar.rnat
+        mov temp4=ar.bspstore
+        ;;
+        st8 [temp1]=temp3,PT(LOADRS)-PT(AR_RNAT)        // save ar.rnat
+        st8 [temp2]=temp4,PT(AR_FPSR)-PT(AR_BSPSTORE)   // save ar.bspstore
+        mov temp3=ar.bsp
+        ;;
+        sub temp3=temp3, temp4  // ar.bsp - ar.bspstore
+        mov temp4=ar.fpsr
+        ;;
+        shl temp3=temp3,16      // compute ar.rsc to be used for "loadrs"
+        ;;
+        st8 [temp1]=temp3,PT(AR_CCV)-PT(LOADRS)         // save loadrs
+        st8 [temp2]=temp4,PT(F6)-PT(AR_FPSR)            // save ar.fpsr
+        mov temp3=ar.ccv
+        ;;
+        st8 [temp1]=temp3,PT(F7)-PT(AR_CCV)             // save ar.ccv
+        stf.spill [temp2]=f6,PT(F8)-PT(F6)
+        ;;
+        stf.spill [temp1]=f7,PT(F9)-PT(F7)
+        stf.spill [temp2]=f8,PT(F10)-PT(F8)
+        ;;
+        stf.spill [temp1]=f9,PT(F11)-PT(F9)
+        stf.spill [temp2]=f10
+        ;;
+        stf.spill [temp1]=f11
+
+        // Save the switch_stack data that is not in minstate nor pt_regs.  The
+        // previous code left regs at pt_regs.
+        add regs=MCA_SWITCH_STACK_OFFSET-MCA_PT_REGS_OFFSET, regs
+        ;;
+        add temp1=SW(F2), regs
+        add temp2=SW(F3), regs
+        ;;
+        stf.spill [temp1]=f2,32
+        stf.spill [temp2]=f3,32
+        ;;
+        stf.spill [temp1]=f4,32
+        stf.spill [temp2]=f5,32
+        ;;
+        stf.spill [temp1]=f12,32
+        stf.spill [temp2]=f13,32
+        ;;
+        stf.spill [temp1]=f14,32
+        stf.spill [temp2]=f15,32
+        ;;
+        stf.spill [temp1]=f16,32
+        stf.spill [temp2]=f17,32
+        ;;
+        stf.spill [temp1]=f18,32
+        stf.spill [temp2]=f19,32
+        ;;
+        stf.spill [temp1]=f20,32
+        stf.spill [temp2]=f21,32
+        ;;
+        stf.spill [temp1]=f22,32
+        stf.spill [temp2]=f23,32
+        ;;
+        stf.spill [temp1]=f24,32
+        stf.spill [temp2]=f25,32
+        ;;
+        stf.spill [temp1]=f26,32
+        stf.spill [temp2]=f27,32
+        ;;
+        stf.spill [temp1]=f28,32
+        stf.spill [temp2]=f29,32
+        ;;
+        stf.spill [temp1]=f30,SW(B2)-SW(F30)
+        stf.spill [temp2]=f31,SW(B3)-SW(F31)
+        mov temp3=b2
+        mov temp4=b3
+        ;;
+        st8 [temp1]=temp3,16    // save b2
+        st8 [temp2]=temp4,16    // save b3
+        mov temp3=b4
+        mov temp4=b5
+        ;;
+        st8 [temp1]=temp3,SW(AR_LC)-SW(B4)      // save b4
+        st8 [temp2]=temp4       // save b5
+        mov temp3=ar.lc
+        ;;
+        st8 [temp1]=temp3       // save ar.lc
+
+        // FIXME: Some proms are incorrectly accessing the minstate area as
+        // cached data.  The C code uses region 6, uncached virtual.  Ensure
+        // that there is no cache data lying around for the first 1K of the
+        // minstate area.
+        // Remove this code in September 2006, that gives platforms a year to
+        // fix their proms and get their customers updated.
+
+        add r1=32*1,r17
+        add r2=32*2,r17
+        add r3=32*3,r17
+        add r4=32*4,r17
+        add r5=32*5,r17
+        add r6=32*6,r17
+        add r7=32*7,r17
+        ;;
+        fc r17
+        fc r1
+        fc r2
+        fc r3
+        fc r4
+        fc r5
+        fc r6
+        fc r7
+        add r17=32*8,r17
+        add r1=32*8,r1
+        add r2=32*8,r2
+        add r3=32*8,r3
+        add r4=32*8,r4
+        add r5=32*8,r5
+        add r6=32*8,r6
+        add r7=32*8,r7
+        ;;
+        fc r17
+        fc r1
+        fc r2
+        fc r3
+        fc r4
+        fc r5
+        fc r6
+        fc r7
+        add r17=32*8,r17
+        add r1=32*8,r1
+        add r2=32*8,r2
+        add r3=32*8,r3
+        add r4=32*8,r4
+        add r5=32*8,r5
+        add r6=32*8,r6
+        add r7=32*8,r7
+        ;;
+        fc r17
+        fc r1
+        fc r2
+        fc r3
+        fc r4
+        fc r5
+        fc r6
+        fc r7
+        add r17=32*8,r17
+        add r1=32*8,r1
+        add r2=32*8,r2
+        add r3=32*8,r3
+        add r4=32*8,r4
+        add r5=32*8,r5
+        add r6=32*8,r6
+        add r7=32*8,r7
+        ;;
+        fc r17
+        fc r1
+        fc r2
+        fc r3
+        fc r4
+        fc r5
+        fc r6
+        fc r7
+
+        br.sptk b0
 
 //EndStub//////////////////////////////////////////////////////////////////////
 
 
 //++
 // Name:
-//       ia64_os_mca_proc_state_restore()
+//      ia64_state_restore()
 //
 // Stub Description:
 //
-//       This is a stub to restore the saved processor state during MCHK
+//      Restore the SAL/OS state.  This is sensitive to the layout of struct
+//      ia64_sal_os_state in mca.h.
+//
+//      r2 contains the return address, r3 contains either
+//      IA64_MCA_CPU_MCA_STACK_OFFSET or IA64_MCA_CPU_INIT_STACK_OFFSET.
+//
+//      In addition to the SAL to OS state, this routine restores all the
+//      registers that appear in struct pt_regs and struct switch_stack,
+//      excluding those in the PAL minstate area.
 //
 //--
 
-ia64_os_mca_proc_state_restore:
+ia64_state_restore:
+        // Restore the switch_stack data that is not in minstate nor pt_regs.
+        add regs=MCA_SWITCH_STACK_OFFSET, r3
+        mov b0=r2               // save return address
+        ;;
+        GET_IA64_MCA_DATA(temp2)
+        ;;
+        add regs=temp2, regs
+        ;;
+        add temp1=SW(F2), regs
+        add temp2=SW(F3), regs
+        ;;
+        ldf.fill f2=[temp1],32
+        ldf.fill f3=[temp2],32
+        ;;
+        ldf.fill f4=[temp1],32
+        ldf.fill f5=[temp2],32
+        ;;
+        ldf.fill f12=[temp1],32
+        ldf.fill f13=[temp2],32
+        ;;
+        ldf.fill f14=[temp1],32
+        ldf.fill f15=[temp2],32
+        ;;
+        ldf.fill f16=[temp1],32
+        ldf.fill f17=[temp2],32
+        ;;
+        ldf.fill f18=[temp1],32
+        ldf.fill f19=[temp2],32
+        ;;
+        ldf.fill f20=[temp1],32
+        ldf.fill f21=[temp2],32
+        ;;
+        ldf.fill f22=[temp1],32
+        ldf.fill f23=[temp2],32
+        ;;
+        ldf.fill f24=[temp1],32
+        ldf.fill f25=[temp2],32
+        ;;
+        ldf.fill f26=[temp1],32
+        ldf.fill f27=[temp2],32
+        ;;
+        ldf.fill f28=[temp1],32
+        ldf.fill f29=[temp2],32
+        ;;
+        ldf.fill f30=[temp1],SW(B2)-SW(F30)
+        ldf.fill f31=[temp2],SW(B3)-SW(F31)
+        ;;
+        ld8 temp3=[temp1],16    // restore b2
+        ld8 temp4=[temp2],16    // restore b3
+        ;;
+        mov b2=temp3
+        mov b3=temp4
+        ld8 temp3=[temp1],SW(AR_LC)-SW(B4)      // restore b4
+        ld8 temp4=[temp2]       // restore b5
+        ;;
+        mov b4=temp3
+        mov b5=temp4
+        ld8 temp3=[temp1]       // restore ar.lc
+        ;;
+        mov ar.lc=temp3
 
-// Restore bank1 GR16-31
-        GET_IA64_MCA_DATA(r2)
+        // Restore the pt_regs data that is not in minstate.  The previous code
+        // left regs at switch_stack.
+        add regs=MCA_PT_REGS_OFFSET-MCA_SWITCH_STACK_OFFSET, regs
+        ;;
+        add temp1=PT(B6), regs
+        add temp2=PT(B7), regs
+        ;;
+        ld8 temp3=[temp1],PT(AR_CSD)-PT(B6)             // restore b6
+        ld8 temp4=[temp2],PT(AR_SSD)-PT(B7)             // restore b7
+        ;;
+        mov b6=temp3
+        mov b7=temp4
+        ld8 temp3=[temp1],PT(AR_UNAT)-PT(AR_CSD)        // restore ar.csd
+        ld8 temp4=[temp2],PT(AR_PFS)-PT(AR_SSD)         // restore ar.ssd
+        ;;
+        mov ar.csd=temp3
+        mov ar.ssd=temp4
+        ld8 temp3=[temp1]                               // restore ar.unat
+        add temp1=PT(AR_CCV)-PT(AR_UNAT), temp1
+        ld8 temp4=[temp2],PT(AR_FPSR)-PT(AR_PFS)        // restore ar.pfs
+        ;;
+        mov ar.unat=temp3
+        mov ar.pfs=temp4
+        // ar.rnat, ar.bspstore, loadrs are restore in ia64_old_stack.
+        ld8 temp3=[temp1],PT(F6)-PT(AR_CCV)             // restore ar.ccv
+        ld8 temp4=[temp2],PT(F7)-PT(AR_FPSR)            // restore ar.fpsr
+        ;;
+        mov ar.ccv=temp3
+        mov ar.fpsr=temp4
+        ldf.fill f6=[temp1],PT(F8)-PT(F6)
+        ldf.fill f7=[temp2],PT(F9)-PT(F7)
+        ;;
+        ldf.fill f8=[temp1],PT(F10)-PT(F8)
+        ldf.fill f9=[temp2],PT(F11)-PT(F9)
+        ;;
+        ldf.fill f10=[temp1]
+        ldf.fill f11=[temp2]
+
+        // Restore the SAL to OS state. The previous code left regs at pt_regs.
+        add regs=MCA_SOS_OFFSET-MCA_PT_REGS_OFFSET, regs
         ;;
-        add r2 = IA64_MCA_CPU_PROC_STATE_DUMP_OFFSET, r2
-
-restore_GRs:                                    // restore bank-1 GRs 16-31
-        bsw.1;;
-        add             r3=16*8,r2;;                // to get to NaT of GR 16-31
-        ld8             r3=[r3];;
-        mov             ar.unat=r3;;                // first restore NaT
-
-        ld8.fill        r16=[r2],8;;
-        ld8.fill        r17=[r2],8;;
-        ld8.fill        r18=[r2],8;;
-        ld8.fill        r19=[r2],8;;
-        ld8.fill        r20=[r2],8;;
-        ld8.fill        r21=[r2],8;;
-        ld8.fill        r22=[r2],8;;
-        ld8.fill        r23=[r2],8;;
-        ld8.fill        r24=[r2],8;;
-        ld8.fill        r25=[r2],8;;
-        ld8.fill        r26=[r2],8;;
-        ld8.fill        r27=[r2],8;;
-        ld8.fill        r28=[r2],8;;
-        ld8.fill        r29=[r2],8;;
-        ld8.fill        r30=[r2],8;;
-        ld8.fill        r31=[r2],8;;
-
-        ld8             r3=[r2],8;;              // increment to skip NaT
-        bsw.0;;
-
-restore_BRs:
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2;;              // duplicate r2 in r4
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             b0=r3
-        mov             b1=r5
-        mov             b2=r7;;
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             b3=r3
-        mov             b4=r5
-        mov             b5=r7;;
-
-        ld8             r3=[r2],2*8
-        ld8             r5=[r4],2*8;;
-        mov             b6=r3
-        mov             b7=r5;;
-
-restore_CRs:
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2;;              // duplicate r2 in r4
-
-        ld8             r3=[r2],8*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;            // 48 byte increments
-        mov             cr.dcr=r3
-        mov             cr.itm=r5
-        mov             cr.iva=r7;;
-
-        ld8             r3=[r2],8*8;;            // 64 byte increments
-//      mov             cr.pta=r3
-
-
-// if PSR.ic=1, reading interruption registers causes an illegal operation fault
-        mov             r3=psr;;
-        tbit.nz.unc     p6,p0=r3,PSR_IC;;           // PSI Valid Log bit pos. test
-(p6)    st8     [r2]=r0,9*8+160             // increment by 232 byte inc.
-
-begin_rskip_intr_regs:
-(p6)    br              rSkipIntrRegs;;
-
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2;;              // duplicate r2 in r4
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             cr.ipsr=r3
-//      mov             cr.isr=r5                   // cr.isr is read only
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             cr.iip=r3
-        mov             cr.ifa=r5
-        mov             cr.itir=r7;;
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             cr.iipa=r3
-        mov             cr.ifs=r5
-        mov             cr.iim=r7
-
-        ld8             r3=[r2],160;;               // 160 byte increment
-        mov             cr.iha=r3
-
-rSkipIntrRegs:
-        ld8             r3=[r2],152;;               // another 152 byte inc.
-
-        add             r4=8,r2                     // duplicate r2 in r4
-        add             r6=2*8,r2;;                 // duplicate r2 in r6
-
-        ld8             r3=[r2],8*3
-        ld8             r5=[r4],8*3
-        ld8             r7=[r6],8*3;;
-        mov             cr.lid=r3
-//      mov             cr.ivr=r5                   // cr.ivr is read only
-        mov             cr.tpr=r7;;
-
-        ld8             r3=[r2],8*3
-        ld8             r5=[r4],8*3
-        ld8             r7=[r6],8*3;;
-//      mov             cr.eoi=r3
-//      mov             cr.irr0=r5                  // cr.irr0 is read only
-//      mov             cr.irr1=r7;;                // cr.irr1 is read only
-
-        ld8             r3=[r2],8*3
-        ld8             r5=[r4],8*3
-        ld8             r7=[r6],8*3;;
-//      mov             cr.irr2=r3                  // cr.irr2 is read only
-//      mov             cr.irr3=r5                  // cr.irr3 is read only
-        mov             cr.itv=r7;;
-
-        ld8             r3=[r2],8*7
-        ld8             r5=[r4],8*7;;
-        mov             cr.pmv=r3
-        mov             cr.cmcv=r5;;
-
-        ld8             r3=[r2],8*23
-        ld8             r5=[r4],8*23;;
-        adds            r2=8*23,r2
-        adds            r4=8*23,r4;;
-//      mov             cr.lrr0=r3
-//      mov             cr.lrr1=r5
-
-        adds            r2=8*2,r2;;
-
-restore_ARs:
-        add             r4=8,r2                  // duplicate r2 in r4
-        add             r6=2*8,r2;;              // duplicate r2 in r4
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             ar.k0=r3
-        mov             ar.k1=r5
-        mov             ar.k2=r7;;
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-        mov             ar.k3=r3
-        mov             ar.k4=r5
-        mov             ar.k5=r7;;
-
-        ld8             r3=[r2],10*8
-        ld8             r5=[r4],10*8
-        ld8             r7=[r6],10*8;;
-        mov             ar.k6=r3
-        mov             ar.k7=r5
-        ;;
-
-        ld8             r3=[r2],3*8
-        ld8             r5=[r4],3*8
-        ld8             r7=[r6],3*8;;
-//      mov             ar.rsc=r3
-//      mov             ar.bsp=r5                   // ar.bsp is read only
-        mov             ar.rsc=r0                           // make sure that RSE is in enforced lazy mode
-        ;;
-        mov             ar.bspstore=r7;;
-
-        ld8             r9=[r2],8*13;;
-        mov             ar.rnat=r9
-
-        mov             ar.rsc=r3
-        ld8             r3=[r2],8*4;;
-        mov             ar.ccv=r3
-
-        ld8             r3=[r2],8*4;;
-        mov             ar.unat=r3
-
-        ld8             r3=[r2],8*4;;
-        mov             ar.fpsr=r3
-
-        ld8             r3=[r2],160;;               // 160
-//      mov             ar.itc=r3
-
-        ld8             r3=[r2],8;;
-        mov             ar.pfs=r3
-
-        ld8             r3=[r2],8;;
-        mov             ar.lc=r3
-
-        ld8             r3=[r2];;
-        mov             ar.ec=r3
-        add             r2=8*62,r2;;             // padding
-
-restore_RRs:
-        mov             r5=ar.lc
-        mov             ar.lc=0x08-1
-        movl            r4=0x00;;
-cStRRr:
-        dep.z           r7=r4,61,3
-        ld8             r3=[r2],8;;
-        mov             rr[r7]=r3                   // what are its access previledges?
-        add             r4=1,r4
-        br.cloop.sptk.few       cStRRr
-        ;;
-        mov             ar.lc=r5
-        ;;
-end_os_mca_restore:
-        br      ia64_os_mca_done_restore;;
+        add temp1=IA64_SAL_OS_STATE_COMMON_OFFSET, regs
+        add temp2=IA64_SAL_OS_STATE_COMMON_OFFSET+8, regs
+        ;;
+        ld8 r12=[temp1],16      // sal_ra
+        ld8 r9=[temp2],16       // sal_gp
+        ;;
+        ld8 r22=[temp1],24      // pal_min_state, virtual.  skip prev_task
+        ld8 r21=[temp2],16      // prev_IA64_KR_CURRENT
+        ;;
+        ld8 temp3=[temp1],16    // cr.isr
+        ld8 temp4=[temp2],16    // cr.ifa
+        ;;
+        mov cr.isr=temp3
+        mov cr.ifa=temp4
+        ld8 temp3=[temp1],16    // cr.itir
+        ld8 temp4=[temp2],16    // cr.iipa
+        ;;
+        mov cr.itir=temp3
+        mov cr.iipa=temp4
+        ld8 temp3=[temp1],16    // cr.iim
+        ld8 temp4=[temp2],16    // cr.iha
+        ;;
+        mov cr.iim=temp3
+        mov cr.iha=temp4
+        dep r22=0,r22,62,2      // pal_min_state, physical, uncached
+        mov IA64_KR(CURRENT)=r21
+        ld8 r8=[temp1]          // os_status
+        ld8 r10=[temp2]         // context
+
+        br.sptk b0
 
 //EndStub//////////////////////////////////////////////////////////////////////
 
 
-// ok, the issue here is that we need to save state information so
-// it can be useable by the kernel debugger and show regs routines.
-// In order to do this, our best bet is save the current state (plus
-// the state information obtain from the MIN_STATE_AREA) into a pt_regs
-// format.  This way we can pass it on in a useable format.
+//++
+// Name:
+//      ia64_new_stack()
 //
-
+// Stub Description:
 //
-// SAL to OS entry point for INIT on the monarch processor
-// This has been defined for registration purposes with SAL
-// as a part of ia64_mca_init.
+//      Switch to the MCA/INIT stack.
 //
-// When we get here, the following registers have been
-// set by the SAL for our use
+//      r2 contains the return address, r3 contains either
+//      IA64_MCA_CPU_MCA_STACK_OFFSET or IA64_MCA_CPU_INIT_STACK_OFFSET.
 //
-//              1. GR1 = OS INIT GP
-//              2. GR8 = PAL_PROC physical address
-//              3. GR9 = SAL_PROC physical address
-//              4. GR10 = SAL GP (physical)
-//              5. GR11 = Init Reason
-//                      0 = Received INIT for event other than crash dump switch
-//                      1 = Received wakeup at the end of an OS_MCA corrected machine check
-//                      2 = Received INIT dude to CrashDump switch assertion
+//      On entry RBS is still on the original stack, this routine switches RBS
+//      to use the MCA/INIT stack.
 //
-//              6. GR12 = Return address to location within SAL_INIT procedure
-
+//      On entry, sos->pal_min_state is physical, on exit it is virtual.
+//
+//--
 
-GLOBAL_ENTRY(ia64_monarch_init_handler)
-        .prologue
-        // stash the information the SAL passed to os
-        SAL_TO_OS_MCA_HANDOFF_STATE_SAVE(r2)
+ia64_new_stack:
+        add regs=MCA_PT_REGS_OFFSET, r3
+        add temp2=MCA_SOS_OFFSET+IA64_SAL_OS_STATE_PAL_MIN_STATE_OFFSET, r3
+        mov b0=r2                       // save return address
+        GET_IA64_MCA_DATA(temp1)
+        invala
         ;;
-        SAVE_MIN_WITH_COVER
+        add temp2=temp2, temp1          // struct ia64_sal_os_state.pal_min_state on MCA or INIT stack
+        add regs=regs, temp1            // struct pt_regs on MCA or INIT stack
         ;;
-        mov r8=cr.ifa
-        mov r9=cr.isr
-        adds r3=8,r2                            // set up second base pointer
+        // Address of minstate area provided by PAL is physical, uncacheable.
+        // Convert to Linux virtual address in region 6 for C code.
+        ld8 ms=[temp2]                  // pal_min_state, physical
         ;;
-        SAVE_REST
-
-// ok, enough should be saved at this point to be dangerous, and supply
-// information for a dump
-// We need to switch to Virtual mode before hitting the C functions.
+        dep temp1=-1,ms,62,2            // set region 6
+        mov temp3=IA64_RBS_OFFSET-MCA_PT_REGS_OFFSET
+        ;;
+        st8 [temp2]=temp1               // pal_min_state, virtual
 
-        movl    r2=IA64_PSR_IT|IA64_PSR_IC|IA64_PSR_DT|IA64_PSR_RT|IA64_PSR_DFH|IA64_PSR_BN
-        mov     r3=psr  // get the current psr, minimum enabled at this point
+        add temp4=temp3, regs           // start of bspstore on new stack
         ;;
-        or      r2=r2,r3
+        mov ar.bspstore=temp4           // switch RBS to MCA/INIT stack
         ;;
-        movl    r3=IVirtual_Switch
+        flushrs                         // must be first in group
+        br.sptk b0
+
+//EndStub//////////////////////////////////////////////////////////////////////
+
+
+//++
+// Name:
+//      ia64_old_stack()
+//
+// Stub Description:
+//
+//      Switch to the old stack.
+//
+//      r2 contains the return address, r3 contains either
+//      IA64_MCA_CPU_MCA_STACK_OFFSET or IA64_MCA_CPU_INIT_STACK_OFFSET.
+//
+//      On entry, pal_min_state is virtual, on exit it is physical.
+//
+//      On entry RBS is on the MCA/INIT stack, this routine switches RBS
+//      back to the previous stack.
+//
+//      The psr is set to all zeroes.  SAL return requires either all zeroes or
+//      just psr.mc set.  Leaving psr.mc off allows INIT to be issued if this
+//      code does not perform correctly.
+//
+//      The dirty registers at the time of the event were flushed to the
+//      MCA/INIT stack in ia64_pt_regs_save().  Restore the dirty registers
+//      before reverting to the previous bspstore.
+//--
+
+ia64_old_stack:
+        add regs=MCA_PT_REGS_OFFSET, r3
+        mov b0=r2                       // save return address
+        GET_IA64_MCA_DATA(temp2)
+        LOAD_PHYSICAL(p0,temp1,1f)
         ;;
-        mov     cr.iip=r3       // short return to set the appropriate bits
-        mov     cr.ipsr=r2      // need to do an rfi to set appropriate bits
+        mov cr.ipsr=r0
+        mov cr.ifs=r0
+        mov cr.iip=temp1
         ;;
+        invala
         rfi
+1:
+
+        add regs=regs, temp2            // struct pt_regs on MCA or INIT stack
         ;;
-IVirtual_Switch:
-        //
-        // We should now be running virtual
-        //
-        // Let's call the C handler to get the rest of the state info
-        //
-        alloc r14=ar.pfs,0,0,2,0                // now it's safe (must be first in insn group!)
+        add temp1=PT(LOADRS), regs
         ;;
-        adds out0=16,sp                         // out0 = pointer to pt_regs
+        ld8 temp2=[temp1],PT(AR_BSPSTORE)-PT(LOADRS)    // restore loadrs
         ;;
-        DO_SAVE_SWITCH_STACK
-        .body
-        adds out1=16,sp                         // out0 = pointer to switch_stack
+        ld8 temp3=[temp1],PT(AR_RNAT)-PT(AR_BSPSTORE)   // restore ar.bspstore
+        mov ar.rsc=temp2
+        ;;
+        loadrs
+        ld8 temp4=[temp1]               // restore ar.rnat
+        ;;
+        mov ar.bspstore=temp3           // back to old stack
+        ;;
+        mov ar.rnat=temp4
+        ;;
+
+        br.sptk b0
 
-        br.call.sptk.many rp=ia64_init_handler
-.ret1:
+//EndStub//////////////////////////////////////////////////////////////////////
 
-return_from_init:
-        br.sptk return_from_init
-END(ia64_monarch_init_handler)
 
+//++
+// Name:
+//      ia64_set_kernel_registers()
 //
-// SAL to OS entry point for INIT on the slave processor
-// This has been defined for registration purposes with SAL
-// as a part of ia64_mca_init.
+// Stub Description:
+//
+//      Set the registers that are required by the C code in order to run on an
+//      MCA/INIT stack.
+//
+//      r2 contains the return address, r3 contains either
+//      IA64_MCA_CPU_MCA_STACK_OFFSET or IA64_MCA_CPU_INIT_STACK_OFFSET.
 //
+//--
+
+ia64_set_kernel_registers:
+        add temp3=MCA_SP_OFFSET, r3
+        add temp4=MCA_SOS_OFFSET+IA64_SAL_OS_STATE_OS_GP_OFFSET, r3
+        mov b0=r2               // save return address
+        GET_IA64_MCA_DATA(temp1)
+        ;;
+        add temp4=temp4, temp1  // &struct ia64_sal_os_state.os_gp
+        add r12=temp1, temp3    // kernel stack pointer on MCA/INIT stack
+        add r13=temp1, r3       // set current to start of MCA/INIT stack
+        ;;
+        ld8 r1=[temp4]          // OS GP from SAL OS state
+        ;;
+        DATA_PA_TO_VA(r1,temp1)
+        DATA_PA_TO_VA(r12,temp2)
+        DATA_PA_TO_VA(r13,temp3)
+        ;;
+        mov IA64_KR(CURRENT)=r13
+
+        // FIXME: do I need to wire IA64_KR_CURRENT_STACK and IA64_TR_CURRENT_STACK?
+
+        br.sptk b0
+
+//EndStub//////////////////////////////////////////////////////////////////////
+
+#undef  ms
+#undef  regs
+#undef  temp1
+#undef  temp2
+#undef  temp3
+#undef  temp4
+
 
-GLOBAL_ENTRY(ia64_slave_init_handler)
-1:      br.sptk 1b
-END(ia64_slave_init_handler)
+// Support function for mca.c, it is here to avoid using inline asm.  Given the
+// address of an rnat slot, if that address is below the current ar.bspstore
+// then return the contents of that slot, otherwise return the contents of
+// ar.rnat.
+GLOBAL_ENTRY(ia64_get_rnat)
+        alloc r14=ar.pfs,1,0,0,0
+        mov ar.rsc=0
+        ;;
+        mov r14=ar.bspstore
+        ;;
+        cmp.lt p6,p7=in0,r14
+        ;;
+(p6)    ld8 r8=[in0]
+(p7)    mov r8=ar.rnat
+        mov ar.rsc=3
+        br.ret.sptk.many rp
+END(ia64_get_rnat)
diff --git a/arch/ia64/kernel/mca_drv.c b/arch/ia64/kernel/mca_drv.c
index abc0113a821d..6e683745af49 100644
--- a/arch/ia64/kernel/mca_drv.c
+++ b/arch/ia64/kernel/mca_drv.c
@@ -4,6 +4,8 @@
  *
  * Copyright (C) 2004 FUJITSU LIMITED
  * Copyright (C) Hidetoshi Seto (seto.hidetoshi@jp.fujitsu.com)
+ * Copyright (C) 2005 Silicon Graphics, Inc
+ * Copyright (C) 2005 Keith Owens <kaos@sgi.com>
  */
 #include <linux/config.h>
 #include <linux/types.h>
@@ -38,10 +40,6 @@
 /* max size of SAL error record (default) */
 static int sal_rec_max = 10000;
 
-/* from mca.c */
-static ia64_mca_sal_to_os_state_t *sal_to_os_handoff_state;
-static ia64_mca_os_to_sal_state_t *os_to_sal_handoff_state;
-
 /* from mca_drv_asm.S */
 extern void *mca_handler_bhhook(void);
 
@@ -316,7 +314,8 @@ init_record_index_pools(void)
  */
 
 static mca_type_t
-is_mca_global(peidx_table_t *peidx, pal_bus_check_info_t *pbci)
+is_mca_global(peidx_table_t *peidx, pal_bus_check_info_t *pbci,
+              struct ia64_sal_os_state *sos)
 {
         pal_processor_state_info_t *psp = (pal_processor_state_info_t*)peidx_psp(peidx);
 
@@ -327,7 +326,7 @@ is_mca_global(peidx_table_t *peidx, pal_bus_check_info_t *pbci)
          * Therefore it is local MCA when rendezvous has not been requested.
          * Failed to rendezvous, the system must be down.
          */
-        switch (sal_to_os_handoff_state->imsto_rendez_state) {
+        switch (sos->rv_rc) {
                 case -1: /* SAL rendezvous unsuccessful */
                         return MCA_IS_GLOBAL;
                 case  0: /* SAL rendezvous not required */
@@ -388,7 +387,8 @@ is_mca_global(peidx_table_t *peidx, pal_bus_check_info_t *pbci)
  */
 
 static int
-recover_from_read_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci)
+recover_from_read_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci,
+                        struct ia64_sal_os_state *sos)
 {
         sal_log_mod_error_info_t *smei;
         pal_min_state_area_t *pmsa;
@@ -426,7 +426,7 @@ recover_from_read_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_chec
                          *  setup for resume to bottom half of MCA,
                          * "mca_handler_bhhook"
                          */
-                        pmsa = (pal_min_state_area_t *)(sal_to_os_handoff_state->pal_min_state | (6ul<<61));
+                        pmsa = sos->pal_min_state;
                         /* pass to bhhook as 1st argument (gr8) */
                         pmsa->pmsa_gr[8-1] = smei->target_identifier;
                         /* set interrupted return address (but no use) */
@@ -459,7 +459,8 @@ recover_from_read_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_chec
  */
 
 static int
-recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci)
+recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci,
+                            struct ia64_sal_os_state *sos)
 {
         int status = 0;
         pal_processor_state_info_t *psp = (pal_processor_state_info_t*)peidx_psp(peidx);
@@ -469,7 +470,7 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_
                 case 1: /* partial read */
                 case 3: /* full line(cpu) read */
                 case 9: /* I/O space read */
-                        status = recover_from_read_error(slidx, peidx, pbci);
+                        status = recover_from_read_error(slidx, peidx, pbci, sos);
                         break;
                 case 0: /* unknown */
                 case 2: /* partial write */
@@ -508,7 +509,8 @@ recover_from_platform_error(slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_
  */
 
 static int
-recover_from_processor_error(int platform, slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci)
+recover_from_processor_error(int platform, slidx_table_t *slidx, peidx_table_t *peidx, pal_bus_check_info_t *pbci,
+                             struct ia64_sal_os_state *sos)
 {
         pal_processor_state_info_t *psp = (pal_processor_state_info_t*)peidx_psp(peidx);
 
@@ -545,7 +547,7 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, peidx_table_t *
          * This means "there are some platform errors".
          */
         if (platform) 
-                return recover_from_platform_error(slidx, peidx, pbci);
+                return recover_from_platform_error(slidx, peidx, pbci, sos);
         /* 
          * On account of strange SAL error record, we cannot recover. 
          */
@@ -562,8 +564,7 @@ recover_from_processor_error(int platform, slidx_table_t *slidx, peidx_table_t *
 
 static int
 mca_try_to_recover(void *rec, 
-        ia64_mca_sal_to_os_state_t *sal_to_os_state,
-        ia64_mca_os_to_sal_state_t *os_to_sal_state)
+        struct ia64_sal_os_state *sos)
 {
         int platform_err;
         int n_proc_err;
@@ -571,10 +572,6 @@ mca_try_to_recover(void *rec,
         peidx_table_t peidx;
         pal_bus_check_info_t pbci;
 
-        /* handoff state from/to mca.c */
-        sal_to_os_handoff_state = sal_to_os_state;
-        os_to_sal_handoff_state = os_to_sal_state;
-
         /* Make index of SAL error record */
         platform_err = mca_make_slidx(rec, &slidx);
 
@@ -597,11 +594,11 @@ mca_try_to_recover(void *rec,
         *((u64*)&pbci) = peidx_check_info(&peidx, bus_check, 0);
 
         /* Check whether MCA is global or not */
-        if (is_mca_global(&peidx, &pbci))
+        if (is_mca_global(&peidx, &pbci, sos))
                 return 0;
         
         /* Try to recover a processor error */
-        return recover_from_processor_error(platform_err, &slidx, &peidx, &pbci);
+        return recover_from_processor_error(platform_err, &slidx, &peidx, &pbci, sos);
 }
 
 /*
diff --git a/arch/ia64/kernel/minstate.h b/arch/ia64/kernel/minstate.h
index f6d8a010d99b..85ed54179afa 100644
--- a/arch/ia64/kernel/minstate.h
+++ b/arch/ia64/kernel/minstate.h
@@ -5,73 +5,6 @@
 #include "entry.h"
 
 /*
- * For ivt.s we want to access the stack virtually so we don't have to disable translation
- * on interrupts.
- *
- *  On entry:
- *      r1:     pointer to current task (ar.k6)
- */
-#define MINSTATE_START_SAVE_MIN_VIRT                                                            \
-(pUStk) mov ar.rsc=0;           /* set enforced lazy mode, pl 0, little-endian, loadrs=0 */     \
-        ;;                                                                                      \
-(pUStk) mov.m r24=ar.rnat;                                                                      \
-(pUStk) addl r22=IA64_RBS_OFFSET,r1;                    /* compute base of RBS */               \
-(pKStk) mov r1=sp;                                      /* get sp  */                           \
-        ;;                                                                                      \
-(pUStk) lfetch.fault.excl.nt1 [r22];                                                            \
-(pUStk) addl r1=IA64_STK_OFFSET-IA64_PT_REGS_SIZE,r1;   /* compute base of memory stack */      \
-(pUStk) mov r23=ar.bspstore;                            /* save ar.bspstore */                  \
-        ;;                                                                                      \
-(pUStk) mov ar.bspstore=r22;                            /* switch to kernel RBS */              \
-(pKStk) addl r1=-IA64_PT_REGS_SIZE,r1;                  /* if in kernel mode, use sp (r12) */   \
-        ;;                                                                                      \
-(pUStk) mov r18=ar.bsp;                                                                         \
-(pUStk) mov ar.rsc=0x3;         /* set eager mode, pl 0, little-endian, loadrs=0 */
-
-#define MINSTATE_END_SAVE_MIN_VIRT                                                              \
-        bsw.1;                  /* switch back to bank 1 (must be last in insn group) */        \
-        ;;
-
-/*
- * For mca_asm.S we want to access the stack physically since the state is saved before we
- * go virtual and don't want to destroy the iip or ipsr.
- */
-#define MINSTATE_START_SAVE_MIN_PHYS                                                            \
-(pKStk) mov r3=IA64_KR(PER_CPU_DATA);;                                                          \
-(pKStk) addl r3=THIS_CPU(ia64_mca_data),r3;;                                                    \
-(pKStk) ld8 r3 = [r3];;                                                                         \
-(pKStk) addl r3=IA64_MCA_CPU_INIT_STACK_OFFSET,r3;;                                             \
-(pKStk) addl r1=IA64_STK_OFFSET-IA64_PT_REGS_SIZE,r3;                                           \
-(pUStk) mov ar.rsc=0;           /* set enforced lazy mode, pl 0, little-endian, loadrs=0 */     \
-(pUStk) addl r22=IA64_RBS_OFFSET,r1;            /* compute base of register backing store */    \
-        ;;                                                                                      \
-(pUStk) mov r24=ar.rnat;                                                                        \
-(pUStk) addl r1=IA64_STK_OFFSET-IA64_PT_REGS_SIZE,r1;   /* compute base of memory stack */      \
-(pUStk) mov r23=ar.bspstore;                            /* save ar.bspstore */                  \
-(pUStk) dep r22=-1,r22,61,3;                    /* compute kernel virtual addr of RBS */        \
-        ;;                                                                                      \
-(pUStk) mov ar.bspstore=r22;                    /* switch to kernel RBS */                      \
-        ;;                                                                                      \
-(pUStk) mov r18=ar.bsp;                                                                         \
-(pUStk) mov ar.rsc=0x3;         /* set eager mode, pl 0, little-endian, loadrs=0 */             \
-
-#define MINSTATE_END_SAVE_MIN_PHYS                                                              \
-        dep r12=-1,r12,61,3;            /* make sp a kernel virtual address */                  \
-        ;;
-
-#ifdef MINSTATE_VIRT
-# define MINSTATE_GET_CURRENT(reg)      mov reg=IA64_KR(CURRENT)
-# define MINSTATE_START_SAVE_MIN        MINSTATE_START_SAVE_MIN_VIRT
-# define MINSTATE_END_SAVE_MIN          MINSTATE_END_SAVE_MIN_VIRT
-#endif
-
-#ifdef MINSTATE_PHYS
-# define MINSTATE_GET_CURRENT(reg)      mov reg=IA64_KR(CURRENT);; tpa reg=reg
-# define MINSTATE_START_SAVE_MIN        MINSTATE_START_SAVE_MIN_PHYS
-# define MINSTATE_END_SAVE_MIN          MINSTATE_END_SAVE_MIN_PHYS
-#endif
-
-/*
  * DO_SAVE_MIN switches to the kernel stacks (if necessary) and saves
  * the minimum state necessary that allows us to turn psr.ic back
  * on.
@@ -97,7 +30,7 @@
  * we can pass interruption state as arguments to a handler.
  */
 #define DO_SAVE_MIN(COVER,SAVE_IFS,EXTRA)                                                       \
-        MINSTATE_GET_CURRENT(r16);      /* M (or M;;I) */                                       \
+        mov r16=IA64_KR(CURRENT);       /* M */                                                 \
         mov r27=ar.rsc;                 /* M */                                                 \
         mov r20=r1;                     /* A */                                                 \
         mov r25=ar.unat;                /* M */                                                 \
@@ -118,7 +51,21 @@
         SAVE_IFS;                                                                               \
         cmp.eq pKStk,pUStk=r0,r17;              /* are we in kernel mode already? */            \
         ;;                                                                                      \
-        MINSTATE_START_SAVE_MIN                                                                 \
+(pUStk) mov ar.rsc=0;           /* set enforced lazy mode, pl 0, little-endian, loadrs=0 */     \
+        ;;                                                                                      \
+(pUStk) mov.m r24=ar.rnat;                                                                      \
+(pUStk) addl r22=IA64_RBS_OFFSET,r1;                    /* compute base of RBS */               \
+(pKStk) mov r1=sp;                                      /* get sp  */                           \
+        ;;                                                                                      \
+(pUStk) lfetch.fault.excl.nt1 [r22];                                                            \
+(pUStk) addl r1=IA64_STK_OFFSET-IA64_PT_REGS_SIZE,r1;   /* compute base of memory stack */      \
+(pUStk) mov r23=ar.bspstore;                            /* save ar.bspstore */                  \
+        ;;                                                                                      \
+(pUStk) mov ar.bspstore=r22;                            /* switch to kernel RBS */              \
+(pKStk) addl r1=-IA64_PT_REGS_SIZE,r1;                  /* if in kernel mode, use sp (r12) */   \
+        ;;                                                                                      \
+(pUStk) mov r18=ar.bsp;                                                                         \
+(pUStk) mov ar.rsc=0x3;         /* set eager mode, pl 0, little-endian, loadrs=0 */             \
         adds r17=2*L1_CACHE_BYTES,r1;           /* really: biggest cache-line size */           \
         adds r16=PT(CR_IPSR),r1;                                                                \
         ;;                                                                                      \
@@ -181,7 +128,8 @@
         EXTRA;                                                                                  \
         movl r1=__gp;           /* establish kernel global pointer */                           \
         ;;                                                                                      \
-        MINSTATE_END_SAVE_MIN
+        bsw.1;                  /* switch back to bank 1 (must be last in insn group) */        \
+        ;;
 
 /*
  * SAVE_REST saves the remainder of pt_regs (with psr.ic on).
diff --git a/arch/ia64/kernel/palinfo.c b/arch/ia64/kernel/palinfo.c
index 25e7c8344564..89faa603c6be 100644
--- a/arch/ia64/kernel/palinfo.c
+++ b/arch/ia64/kernel/palinfo.c
@@ -307,11 +307,9 @@ vm_info(char *page)
 
         if ((status = ia64_pal_vm_summary(&vm_info_1, &vm_info_2)) !=0) {
                 printk(KERN_ERR "ia64_pal_vm_summary=%ld\n", status);
-                return 0;
-        }
+        } else {
 
-
-        p += sprintf(p,
+                p += sprintf(p,
                      "Physical Address Space         : %d bits\n"
                      "Virtual Address Space          : %d bits\n"
                      "Protection Key Registers(PKR)  : %d\n"
@@ -319,92 +317,99 @@ vm_info(char *page)
                      "Hash Tag ID                    : 0x%x\n"
                      "Size of RR.rid                 : %d\n",
                      vm_info_1.pal_vm_info_1_s.phys_add_size,
-                     vm_info_2.pal_vm_info_2_s.impl_va_msb+1, vm_info_1.pal_vm_info_1_s.max_pkr+1,
-                     vm_info_1.pal_vm_info_1_s.key_size, vm_info_1.pal_vm_info_1_s.hash_tag_id,
+                     vm_info_2.pal_vm_info_2_s.impl_va_msb+1,
+                     vm_info_1.pal_vm_info_1_s.max_pkr+1,
+                     vm_info_1.pal_vm_info_1_s.key_size,
+                     vm_info_1.pal_vm_info_1_s.hash_tag_id,
                      vm_info_2.pal_vm_info_2_s.rid_size);
+        }
 
-        if (ia64_pal_mem_attrib(&attrib) != 0)
-                return 0;
-
-        p += sprintf(p, "Supported memory attributes    : ");
-        sep = "";
-        for (i = 0; i < 8; i++) {
-                if (attrib & (1 << i)) {
-                        p += sprintf(p, "%s%s", sep, mem_attrib[i]);
-                        sep = ", ";
+        if (ia64_pal_mem_attrib(&attrib) == 0) {
+                p += sprintf(p, "Supported memory attributes    : ");
+                sep = "";
+                for (i = 0; i < 8; i++) {
+                        if (attrib & (1 << i)) {
+                                p += sprintf(p, "%s%s", sep, mem_attrib[i]);
+                                sep = ", ";
+                        }
                 }
+                p += sprintf(p, "\n");
         }
-        p += sprintf(p, "\n");
 
         if ((status = ia64_pal_vm_page_size(&tr_pages, &vw_pages)) !=0) {
                 printk(KERN_ERR "ia64_pal_vm_page_size=%ld\n", status);
-                return 0;
-        }
-
-        p += sprintf(p,
-                     "\nTLB walker                     : %simplemented\n"
-                     "Number of DTR                  : %d\n"
-                     "Number of ITR                  : %d\n"
-                     "TLB insertable page sizes      : ",
-                     vm_info_1.pal_vm_info_1_s.vw ? "" : "not ",
-                     vm_info_1.pal_vm_info_1_s.max_dtr_entry+1,
-                     vm_info_1.pal_vm_info_1_s.max_itr_entry+1);
+        } else {
 
+                p += sprintf(p,
+                             "\nTLB walker                     : %simplemented\n"
+                             "Number of DTR                  : %d\n"
+                             "Number of ITR                  : %d\n"
+                             "TLB insertable page sizes      : ",
+                             vm_info_1.pal_vm_info_1_s.vw ? "" : "not ",
+                             vm_info_1.pal_vm_info_1_s.max_dtr_entry+1,
+                             vm_info_1.pal_vm_info_1_s.max_itr_entry+1);
 
-        p = bitvector_process(p, tr_pages);
 
-        p += sprintf(p, "\nTLB purgeable page sizes       : ");
+                p = bitvector_process(p, tr_pages);
 
-        p = bitvector_process(p, vw_pages);
+                p += sprintf(p, "\nTLB purgeable page sizes       : ");
 
+                p = bitvector_process(p, vw_pages);
+        }
         if ((status=ia64_get_ptce(&ptce)) != 0) {
                 printk(KERN_ERR "ia64_get_ptce=%ld\n", status);
-                return 0;
-        }
-
-        p += sprintf(p,
+        } else {
+                p += sprintf(p,
                      "\nPurge base address             : 0x%016lx\n"
                      "Purge outer loop count         : %d\n"
                      "Purge inner loop count         : %d\n"
                      "Purge outer loop stride        : %d\n"
                      "Purge inner loop stride        : %d\n",
-                     ptce.base, ptce.count[0], ptce.count[1], ptce.stride[0], ptce.stride[1]);
+                     ptce.base, ptce.count[0], ptce.count[1],
+                     ptce.stride[0], ptce.stride[1]);
 
-        p += sprintf(p,
+                p += sprintf(p,
                      "TC Levels                      : %d\n"
                      "Unique TC(s)                   : %d\n",
                      vm_info_1.pal_vm_info_1_s.num_tc_levels,
                      vm_info_1.pal_vm_info_1_s.max_unique_tcs);
 
-        for(i=0; i < vm_info_1.pal_vm_info_1_s.num_tc_levels; i++) {
-                for (j=2; j>0 ; j--) {
-                        tc_pages = 0; /* just in case */
+                for(i=0; i < vm_info_1.pal_vm_info_1_s.num_tc_levels; i++) {
+                        for (j=2; j>0 ; j--) {
+                                tc_pages = 0; /* just in case */
 
 
-                        /* even without unification, some levels may not be present */
-                        if ((status=ia64_pal_vm_info(i,j, &tc_info, &tc_pages)) != 0) {
-                                continue;
-                        }
+                                /* even without unification, some levels may not be present */
+                                if ((status=ia64_pal_vm_info(i,j, &tc_info, &tc_pages)) != 0) {
+                                        continue;
+                                }
 
-                        p += sprintf(p,
+                                p += sprintf(p,
                                      "\n%s Translation Cache Level %d:\n"
                                      "\tHash sets           : %d\n"
                                      "\tAssociativity       : %d\n"
                                      "\tNumber of entries   : %d\n"
                                      "\tFlags               : ",
-                                     cache_types[j+tc_info.tc_unified], i+1, tc_info.tc_num_sets,
-                                     tc_info.tc_associativity, tc_info.tc_num_entries);
+                                     cache_types[j+tc_info.tc_unified], i+1,
+                                     tc_info.tc_num_sets,
+                                     tc_info.tc_associativity,
+                                     tc_info.tc_num_entries);
 
-                        if (tc_info.tc_pf) p += sprintf(p, "PreferredPageSizeOptimized ");
-                        if (tc_info.tc_unified) p += sprintf(p, "Unified ");
-                        if (tc_info.tc_reduce_tr) p += sprintf(p, "TCReduction");
+                                if (tc_info.tc_pf)
+                                        p += sprintf(p, "PreferredPageSizeOptimized ");
+                                if (tc_info.tc_unified)
+                                        p += sprintf(p, "Unified ");
+                                if (tc_info.tc_reduce_tr)
+                                        p += sprintf(p, "TCReduction");
 
-                        p += sprintf(p, "\n\tSupported page sizes: ");
+                                p += sprintf(p, "\n\tSupported page sizes: ");
 
-                        p = bitvector_process(p, tc_pages);
+                                p = bitvector_process(p, tc_pages);
 
-                        /* when unified date (j=2) is enough */
-                        if (tc_info.tc_unified) break;
+                                /* when unified date (j=2) is enough */
+                                if (tc_info.tc_unified)
+                                        break;
+                        }
                 }
         }
         p += sprintf(p, "\n");
@@ -440,14 +445,14 @@ register_info(char *page)
                 p += sprintf(p, "\n");
         }
 
-        if (ia64_pal_rse_info(&phys_stacked, &hints) != 0) return 0;
+        if (ia64_pal_rse_info(&phys_stacked, &hints) == 0) {
 
         p += sprintf(p,
                      "RSE stacked physical registers   : %ld\n"
                      "RSE load/store hints             : %ld (%s)\n",
                      phys_stacked, hints.ph_data,
                      hints.ph_data < RSE_HINTS_COUNT ? rse_hints[hints.ph_data]: "(??)");
-
+        }
         if (ia64_pal_debug_info(&iregs, &dregs))
                 return 0;
 
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/salinfo.c b/arch/ia64/kernel/salinfo.c
index 6f0cc7a6634e..ca68e6e44a72 100644
--- a/arch/ia64/kernel/salinfo.c
+++ b/arch/ia64/kernel/salinfo.c
@@ -22,6 +22,11 @@
  *
  * Dec  5 2004  kaos@sgi.com
  *   Standardize which records are cleared automatically.
+ *
+ * Aug 18 2005  kaos@sgi.com
+ *   mca.c may not pass a buffer, a NULL buffer just indicates that a new
+ *   record is available in SAL.
+ *   Replace some NR_CPUS by cpus_online, for hotplug cpu.
  */
 
 #include <linux/types.h>
@@ -193,7 +198,7 @@ shift1_data_saved (struct salinfo_data *data, int shift)
  * The buffer passed from mca.c points to the output from ia64_log_get. This is
  * a persistent buffer but its contents can change between the interrupt and
  * when user space processes the record.  Save the record id to identify
- * changes.
+ * changes.  If the buffer is NULL then just update the bitmap.
  */
 void
 salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe)
@@ -206,27 +211,29 @@ salinfo_log_wakeup(int type, u8 *buffer, u64 size, int irqsafe)
 
         BUG_ON(type >= ARRAY_SIZE(salinfo_log_name));
 
-        if (irqsafe)
-                spin_lock_irqsave(&data_saved_lock, flags);
-        for (i = 0, data_saved = data->data_saved; i < saved_size; ++i, ++data_saved) {
-                if (!data_saved->buffer)
-                        break;
-        }
-        if (i == saved_size) {
-                if (!data->saved_num) {
-                        shift1_data_saved(data, 0);
-                        data_saved = data->data_saved + saved_size - 1;
-                } else
-                        data_saved = NULL;
-        }
-        if (data_saved) {
-                data_saved->cpu = smp_processor_id();
-                data_saved->id = ((sal_log_record_header_t *)buffer)->id;
-                data_saved->size = size;
-                data_saved->buffer = buffer;
+        if (buffer) {
+                if (irqsafe)
+                        spin_lock_irqsave(&data_saved_lock, flags);
+                for (i = 0, data_saved = data->data_saved; i < saved_size; ++i, ++data_saved) {
+                        if (!data_saved->buffer)
+                                break;
+                }
+                if (i == saved_size) {
+                        if (!data->saved_num) {
+                                shift1_data_saved(data, 0);
+                                data_saved = data->data_saved + saved_size - 1;
+                        } else
+                                data_saved = NULL;
+                }
+                if (data_saved) {
+                        data_saved->cpu = smp_processor_id();
+                        data_saved->id = ((sal_log_record_header_t *)buffer)->id;
+                        data_saved->size = size;
+                        data_saved->buffer = buffer;
+                }
+                if (irqsafe)
+                        spin_unlock_irqrestore(&data_saved_lock, flags);
         }
-        if (irqsafe)
-                spin_unlock_irqrestore(&data_saved_lock, flags);
 
         if (!test_and_set_bit(smp_processor_id(), &data->cpu_event)) {
                 if (irqsafe)
@@ -244,7 +251,7 @@ salinfo_timeout_check(struct salinfo_data *data)
         int i;
         if (!data->open)
                 return;
-        for (i = 0; i < NR_CPUS; ++i) {
+        for_each_online_cpu(i) {
                 if (test_bit(i, &data->cpu_event)) {
                         /* double up() is not a problem, user space will see no
                          * records for the additional "events".
@@ -291,7 +298,7 @@ retry:
 
         n = data->cpu_check;
         for (i = 0; i < NR_CPUS; i++) {
-                if (test_bit(n, &data->cpu_event)) {
+                if (test_bit(n, &data->cpu_event) && cpu_online(n)) {
                         cpu = n;
                         break;
                 }
@@ -585,11 +592,10 @@ salinfo_init(void)
 
                 /* we missed any events before now */
                 online = 0;
-                for (j = 0; j < NR_CPUS; j++)
-                        if (cpu_online(j)) {
-                                set_bit(j, &data->cpu_event);
-                                ++online;
-                        }
+                for_each_online_cpu(j) {
+                        set_bit(j, &data->cpu_event);
+                        ++online;
+                }
                 sema_init(&data->sem, online);
 
                 *sdir++ = dir;
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/unwind.c b/arch/ia64/kernel/unwind.c
index 3288be47bc75..93d5a3b41f69 100644
--- a/arch/ia64/kernel/unwind.c
+++ b/arch/ia64/kernel/unwind.c
@@ -2020,28 +2020,6 @@ init_frame_info (struct unw_frame_info *info, struct task_struct *t,
 }
 
 void
-unw_init_from_interruption (struct unw_frame_info *info, struct task_struct *t,
-                            struct pt_regs *pt, struct switch_stack *sw)
-{
-        unsigned long sof;
-
-        init_frame_info(info, t, sw, pt->r12);
-        info->cfm_loc = &pt->cr_ifs;
-        info->unat_loc = &pt->ar_unat;
-        info->pfs_loc = &pt->ar_pfs;
-        sof = *info->cfm_loc & 0x7f;
-        info->bsp = (unsigned long) ia64_rse_skip_regs((unsigned long *) info->regstk.top, -sof);
-        info->ip = pt->cr_iip + ia64_psr(pt)->ri;
-        info->pt = (unsigned long) pt;
-        UNW_DPRINT(3, "unwind.%s:\n"
-                   "  bsp    0x%lx\n"
-                   "  sof    0x%lx\n"
-                   "  ip     0x%lx\n",
-                   __FUNCTION__, info->bsp, sof, info->ip);
-        find_save_locs(info);
-}
-
-void
 unw_init_frame_info (struct unw_frame_info *info, struct task_struct *t, struct switch_stack *sw)
 {
         unsigned long sol;
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 24614869e866..3c32af910d60 100644
--- a/arch/ia64/mm/fault.c
+++ b/arch/ia64/mm/fault.c
@@ -230,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
@@ -243,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/mm/init.c b/arch/ia64/mm/init.c
index 65f9958db9f0..1281c609ee98 100644
--- a/arch/ia64/mm/init.c
+++ b/arch/ia64/mm/init.c
@@ -382,13 +382,22 @@ ia64_mmu_init (void *my_cpu_data)
 
         if (impl_va_bits < 51 || impl_va_bits > 61)
                 panic("CPU has bogus IMPL_VA_MSB value of %lu!\n", impl_va_bits - 1);
+        /*
+         * mapped_space_bits - PAGE_SHIFT is the total number of ptes we need,
+         * which must fit into "vmlpt_bits - pte_bits" slots. Second half of
+         * the test makes sure that our mapped space doesn't overlap the
+         * unimplemented hole in the middle of the region.
+         */
+        if ((mapped_space_bits - PAGE_SHIFT > vmlpt_bits - pte_bits) ||
+            (mapped_space_bits > impl_va_bits - 1))
+                panic("Cannot build a big enough virtual-linear page table"
+                      " to cover mapped address space.\n"
+                      " Try using a smaller page size.\n");
+
 
         /* place the VMLPT at the end of each page-table mapped region: */
         pta = POW2(61) - POW2(vmlpt_bits);
 
-        if (POW2(mapped_space_bits) >= pta)
-                panic("mm/init: overlap between virtually mapped linear page table and "
-                      "mapped kernel space!");
         /*
          * Set the (virtually mapped linear) page table address.  Bit
          * 8 selects between the short and long format, bits 2-7 the
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/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..6f8c5883716b 100644
--- a/arch/ia64/sn/kernel/setup.c
+++ b/arch/ia64/sn/kernel/setup.c
@@ -49,6 +49,7 @@
 #include <asm/sn/clksupport.h>
 #include <asm/sn/sn_sal.h>
 #include <asm/sn/geo.h>
+#include <asm/sn/sn_feature_sets.h>
 #include "xtalk/xwidgetdev.h"
 #include "xtalk/hubdev.h"
 #include <asm/sn/klconfig.h>
@@ -56,7 +57,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];
 
@@ -97,6 +98,7 @@ EXPORT_SYMBOL(sn_region_size);
 int sn_prom_type;       /* 0=hardware, 1=medusa/realprom, 2=medusa/fakeprom */
 
 short physical_node_map[MAX_PHYSNODE_ID];
+static unsigned long sn_prom_features[MAX_PROM_FEATURE_SETS];
 
 EXPORT_SYMBOL(physical_node_map);
 
@@ -271,7 +273,10 @@ void __init sn_setup(char **cmdline_p)
         u32 version = sn_sal_rev();
         extern void sn_cpu_init(void);
 
-        ia64_sn_plat_set_error_handling_features();
+        ia64_sn_plat_set_error_handling_features();     // obsolete
+        ia64_sn_set_os_feature(OSF_MCA_SLV_TO_OS_INIT_SLV);
+        ia64_sn_set_os_feature(OSF_FEAT_LOG_SBES);
+
 
 #if defined(CONFIG_VT) && defined(CONFIG_VGA_CONSOLE)
         /*
@@ -314,16 +319,6 @@ void __init sn_setup(char **cmdline_p)
 
         printk("SGI SAL version %x.%02x\n", version >> 8, version & 0x00FF);
 
-        /*
-         * Confirm the SAL we're running on is recent enough...
-         */
-        if (version < SN_SAL_MIN_VERSION) {
-                printk(KERN_ERR "This kernel needs SGI SAL version >= "
-                       "%x.%02x\n", SN_SAL_MIN_VERSION >> 8,
-                        SN_SAL_MIN_VERSION & 0x00FF);
-                panic("PROM version too old\n");
-        }
-
         master_nasid = boot_get_nasid();
 
         status =
@@ -480,6 +475,10 @@ void __init sn_cpu_init(void)
         if (nodepdaindr[0] == NULL)
                 return;
 
+        for (i = 0; i < MAX_PROM_FEATURE_SETS; i++)
+                if (ia64_sn_get_prom_feature_set(i, &sn_prom_features[i]) != 0)
+                        break;
+
         cpuid = smp_processor_id();
         cpuphyid = get_sapicid();
 
@@ -651,3 +650,12 @@ nasid_slice_to_cpuid(int nasid, int slice)
 
         return -1;
 }
+
+int sn_prom_feature_available(int id)
+{
+        if (id >= BITS_PER_LONG * MAX_PROM_FEATURE_SETS)
+                return 0;
+        return test_bit(id, sn_prom_features);
+}
+EXPORT_SYMBOL(sn_prom_feature_available);
+
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/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/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/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/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/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/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/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/head-de2.S b/arch/m68knommu/platform/68328/head-de2.S
new file mode 100644
index 000000000000..94c5a1609a75
--- /dev/null
+++ b/arch/m68knommu/platform/68328/head-de2.S
@@ -0,0 +1,135 @@
+#include <linux/config.h>
+
+#if defined(CONFIG_RAM32MB)
+#define MEM_END 0x02000000      /* Memory size 32Mb */
+#elif defined(CONFIG_RAM16MB)
+#define MEM_END 0x01000000      /* Memory size 16Mb */
+#else
+#define MEM_END 0x00800000      /* Memory size 8Mb */
+#endif
+
+#undef CRT_DEBUG
+
+.macro  PUTC CHAR
+#ifdef CRT_DEBUG
+        moveq   #\CHAR, %d7
+        jsr     putc
+#endif
+.endm
+
+        .global _start
+        .global _rambase
+        .global _ramvec
+        .global _ramstart
+        .global _ramend
+        
+        .data
+
+/*
+ *      Set up the usable of RAM stuff
+ */
+_rambase:
+        .long   0
+_ramvec:
+        .long   0
+_ramstart:
+        .long   0
+_ramend:
+        .long   0
+
+        .text
+
+_start:
+
+/*
+ * Setup initial stack
+ */
+        /* disable all interrupts */
+        movew   #0x2700, %sr
+        movel   #-1, 0xfffff304
+        movel   #MEM_END-4, %sp
+
+        PUTC    '\r'
+        PUTC    '\n'
+        PUTC    'A'
+        PUTC    'B'
+
+/*
+ *      Determine end of RAM
+ */
+
+        movel   #MEM_END, %a0
+        movel   %a0, _ramend
+
+        PUTC    'C'
+
+/*
+ *      Move ROM filesystem above bss :-)
+ */
+
+        moveal  #_sbss, %a0                     /* romfs at the start of bss */
+        moveal  #_ebss, %a1                     /* Set up destination  */
+        movel   %a0, %a2                        /* Copy of bss start */
+
+        movel   8(%a0), %d1                     /* Get size of ROMFS */
+        addql   #8, %d1                         /* Allow for rounding */
+        andl    #0xfffffffc, %d1        /* Whole words */
+
+        addl    %d1, %a0                        /* Copy from end */
+        addl    %d1, %a1                        /* Copy from end */
+        movel   %a1, _ramstart          /* Set start of ram */
+
+1:
+        movel   -(%a0), %d0                     /* Copy dword */
+        movel   %d0, -(%a1)
+        cmpl    %a0, %a2                        /* Check if at end */
+        bne     1b
+
+        PUTC    'D'
+
+/*
+ * Initialize BSS segment to 0
+ */
+
+        lea     _sbss, %a0
+        lea     _ebss, %a1
+
+        /* Copy 0 to %a0 until %a0 == %a1 */
+2:      cmpal   %a0, %a1
+        beq     1f
+        clrl    (%a0)+
+        bra     2b
+1:
+
+        PUTC    'E'
+
+/*
+ * Load the current task pointer and stack
+ */
+
+        lea     init_thread_union, %a0
+        lea     0x2000(%a0), %sp
+
+        PUTC    'F'
+        PUTC    '\r'
+        PUTC    '\n'
+
+/*
+ * Go
+ */
+
+        jmp     start_kernel
+
+/*
+ * Local functions
+ */
+ 
+#ifdef CRT_DEBUG
+putc:
+        moveb   %d7, 0xfffff907
+1:
+        movew   0xfffff906, %d7
+        andw    #0x2000, %d7
+        beq     1b
+        rts
+#endif
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/68360/head-ram.S b/arch/m68knommu/platform/68360/head-ram.S
new file mode 100644
index 000000000000..a5c639a51eef
--- /dev/null
+++ b/arch/m68knommu/platform/68360/head-ram.S
@@ -0,0 +1,408 @@
+/* arch/m68knommu/platform/68360/head-ram.S
+ *
+ * Startup code for Motorola 68360
+ *
+ * Copyright 2001 (C) SED Systems, a Division of Calian Ltd.
+ * Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
+ * Based on: arch/m68knommu/platform/68360/uCquicc/crt0_rom.S, 2.0.38.1.pre7
+ *           uClinux Kernel
+ * Copyright (C) Michael Leslie <mleslie@lineo.com>
+ * Based on: arch/m68knommu/platform/68EZ328/ucsimm/crt0_rom.S
+ * Copyright (C) 1998  D. Jeff Dionne <jeff@uclinux.org>,
+ *
+ */
+#define ASSEMBLY
+#include <linux/config.h>
+
+.global _stext
+.global _start
+
+.global _rambase
+.global __ramvec
+.global _ramvec
+.global _ramstart
+.global _ramend
+
+.global _quicc_base
+.global _periph_base
+
+#define REGB                        0x1000
+#define PEPAR                       (_dprbase + REGB + 0x0016)
+#define GMR                         (_dprbase + REGB + 0x0040)
+#define OR0                         (_dprbase + REGB + 0x0054)
+#define BR0                         (_dprbase + REGB + 0x0050)
+#define OR1                         (_dprbase + REGB + 0x0064)
+#define BR1                         (_dprbase + REGB + 0x0060)
+#define OR4                         (_dprbase + REGB + 0x0094)
+#define BR4                         (_dprbase + REGB + 0x0090)
+#define OR6                         (_dprbase + REGB + 0x00b4)
+#define BR6                         (_dprbase + REGB + 0x00b0)
+#define OR7                         (_dprbase + REGB + 0x00c4)
+#define BR7                         (_dprbase + REGB + 0x00c0)
+
+#define MCR                         (_dprbase + REGB + 0x0000)
+#define AVR                         (_dprbase + REGB + 0x0008)
+
+#define SYPCR                       (_dprbase + REGB + 0x0022)
+
+#define PLLCR                       (_dprbase + REGB + 0x0010)
+#define CLKOCR                      (_dprbase + REGB + 0x000C)
+#define CDVCR                       (_dprbase + REGB + 0x0014)
+
+#define BKAR                        (_dprbase + REGB + 0x0030)
+#define BKCR                        (_dprbase + REGB + 0x0034)
+#define SWIV                        (_dprbase + REGB + 0x0023)
+#define PICR                        (_dprbase + REGB + 0x0026)
+#define PITR                        (_dprbase + REGB + 0x002A)
+
+/* Define for all memory configuration */
+#define MCU_SIM_GMR                 0x00000000
+#define SIM_OR_MASK                 0x0fffffff
+
+/* Defines for chip select zero - the flash */
+#define SIM_OR0_MASK                0x20000002
+#define SIM_BR0_MASK                0x00000001
+
+
+/* Defines for chip select one - the RAM */
+#define SIM_OR1_MASK                0x10000000
+#define SIM_BR1_MASK                0x00000001
+
+#define MCU_SIM_MBAR_ADRS           0x0003ff00
+#define MCU_SIM_MBAR_BA_MASK        0xfffff000
+#define MCU_SIM_MBAR_AS_MASK        0x00000001
+
+#define MCU_SIM_PEPAR               0x00B4
+    
+#define MCU_DISABLE_INTRPTS         0x2700
+#define MCU_SIM_AVR                 0x00
+    
+#define MCU_SIM_MCR                 0x00005cff
+
+#define MCU_SIM_CLKOCR              0x00
+#define MCU_SIM_PLLCR               0x8000
+#define MCU_SIM_CDVCR               0x0000
+
+#define MCU_SIM_SYPCR               0x0000
+#define MCU_SIM_SWIV                0x00
+#define MCU_SIM_PICR                0x0000
+#define MCU_SIM_PITR                0x0000
+
+
+#include <asm/m68360_regs.h>
+
+        
+/*
+ * By the time this RAM specific code begins to execute, DPRAM
+ * and DRAM should already be mapped and accessible.
+ */
+
+        .text
+_start:
+_stext:
+        nop
+        ori.w   #MCU_DISABLE_INTRPTS, %sr       /* disable interrupts: */
+        /* We should not need to setup the boot stack the reset should do it. */
+        movea.l #__ramend, %sp                  /*set up stack at the end of DRAM:*/
+
+set_mbar_register:
+        moveq.l #0x07, %d1                      /* Setup MBAR */
+        movec   %d1, %dfc
+
+        lea.l   MCU_SIM_MBAR_ADRS, %a0
+        move.l  #_dprbase, %d0
+        andi.l  #MCU_SIM_MBAR_BA_MASK, %d0
+        ori.l   #MCU_SIM_MBAR_AS_MASK, %d0
+        moves.l %d0, %a0@
+
+        moveq.l #0x05, %d1
+        movec.l %d1, %dfc
+
+        /* Now we can begin to access registers in DPRAM */
+
+set_sim_mcr:
+        /* Set Module Configuration Register */
+        move.l  #MCU_SIM_MCR, MCR
+
+        /* to do:       Determine cause of reset */
+
+        /*
+         *       configure system clock MC68360 p. 6-40
+         *       (value +1)*osc/128 = system clock
+         */
+set_sim_clock:
+        move.w  #MCU_SIM_PLLCR, PLLCR
+        move.b  #MCU_SIM_CLKOCR, CLKOCR
+        move.w  #MCU_SIM_CDVCR, CDVCR
+
+        /* Wait for the PLL to settle */
+        move.w  #16384, %d0
+pll_settle_wait:
+        subi.w  #1, %d0
+        bne     pll_settle_wait
+
+        /* Setup the system protection register, and watchdog timer register */
+        move.b  #MCU_SIM_SWIV, SWIV
+        move.w  #MCU_SIM_PICR, PICR
+        move.w  #MCU_SIM_PITR, PITR
+        move.w  #MCU_SIM_SYPCR, SYPCR
+
+        /* Clear DPRAM - system + parameter */
+        movea.l #_dprbase, %a0
+        movea.l #_dprbase+0x2000, %a1
+
+        /* Copy 0 to %a0 until %a0 == %a1 */
+clear_dpram:
+        movel   #0, %a0@+
+        cmpal   %a0, %a1
+        bhi     clear_dpram
+
+configure_memory_controller:    
+        /* Set up Global Memory Register (GMR) */
+        move.l  #MCU_SIM_GMR, %d0
+        move.l  %d0, GMR
+
+configure_chip_select_0:
+        move.l  #__ramend, %d0
+        subi.l  #__ramstart, %d0
+        subq.l  #0x01, %d0
+        eori.l  #SIM_OR_MASK, %d0
+        ori.l   #SIM_OR0_MASK, %d0
+        move.l  %d0, OR0
+
+        move.l  #__ramstart, %d0
+        ori.l   #SIM_BR0_MASK, %d0
+        move.l  %d0, BR0
+
+configure_chip_select_1:
+        move.l  #__rom_end, %d0
+        subi.l  #__rom_start, %d0
+        subq.l  #0x01, %d0
+        eori.l  #SIM_OR_MASK, %d0
+        ori.l   #SIM_OR1_MASK, %d0
+        move.l  %d0, OR1
+
+        move.l  #__rom_start, %d0
+        ori.l   #SIM_BR1_MASK, %d0
+        move.l  %d0, BR1
+
+        move.w  #MCU_SIM_PEPAR, PEPAR 
+
+        /* point to vector table: */
+        move.l  #_romvec, %a0
+        move.l  #_ramvec, %a1
+copy_vectors:
+        move.l  %a0@, %d0
+        move.l  %d0, %a1@
+        move.l  %a0@, %a1@
+        addq.l  #0x04, %a0
+        addq.l  #0x04, %a1
+        cmp.l   #_start, %a0
+        blt     copy_vectors
+
+        move.l  #_ramvec, %a1
+        movec   %a1, %vbr
+
+
+        /* Copy data segment from ROM to RAM */
+        moveal  #_stext, %a0
+        moveal  #_sdata, %a1
+        moveal  #_edata, %a2
+
+        /* Copy %a0 to %a1 until %a1 == %a2 */
+LD1:
+        move.l  %a0@, %d0
+        addq.l  #0x04, %a0
+        move.l  %d0, %a1@
+        addq.l  #0x04, %a1
+        cmp.l   #_edata, %a1
+        blt     LD1
+
+        moveal  #_sbss, %a0
+        moveal  #_ebss, %a1
+
+        /* Copy 0 to %a0 until %a0 == %a1 */
+L1:
+        movel   #0, %a0@+
+        cmpal   %a0, %a1
+        bhi     L1
+
+load_quicc:
+        move.l  #_dprbase, _quicc_base
+
+store_ram_size:
+        /* Set ram size information */
+        move.l  #_sdata, _rambase
+        move.l  #_ebss, _ramstart
+        move.l  #__ramend, %d0
+        sub.l   #0x1000, %d0                    /* Reserve 4K for stack space.*/
+        move.l  %d0, _ramend                    /* Different from __ramend.*/
+
+store_flash_size:
+        /* Set rom size information */
+        move.l  #__rom_end, %d0
+        sub.l   #__rom_start, %d0
+        move.l  %d0, rom_length
+    
+        pea     0
+        pea     env
+        pea     %sp@(4)
+        pea     0
+
+        lea     init_thread_union, %a2
+        lea     0x2000(%a2), %sp
+
+lp:
+        jsr     start_kernel
+
+_exit:
+        jmp     _exit
+
+
+        .data
+        .align 4
+env:
+        .long   0
+_quicc_base:
+        .long   0
+_periph_base:
+        .long   0
+_ramvec:
+        .long   0
+_rambase:
+        .long   0
+_ramstart:
+        .long   0
+_ramend:
+        .long   0
+_dprbase:
+        .long   0xffffe000
+
+        .text
+
+    /*
+     * These are the exception vectors at boot up, they are copied into RAM
+     * and then overwritten as needed.
+     */
+ 
+.section ".data.initvect","awx"
+    .long   __ramend    /* Reset: Initial Stack Pointer                 - 0.  */
+    .long   _start      /* Reset: Initial Program Counter               - 1.  */
+    .long   buserr      /* Bus Error                                    - 2.  */
+    .long   trap        /* Address Error                                - 3.  */
+    .long   trap        /* Illegal Instruction                          - 4.  */
+    .long   trap        /* Divide by zero                               - 5.  */
+    .long   trap        /* CHK, CHK2 Instructions                       - 6.  */
+    .long   trap        /* TRAPcc, TRAPV Instructions                   - 7.  */
+    .long   trap        /* Privilege Violation                          - 8.  */
+    .long   trap        /* Trace                                        - 9.  */
+    .long   trap        /* Line 1010 Emulator                           - 10. */
+    .long   trap        /* Line 1111 Emualtor                           - 11. */
+    .long   trap        /* Harware Breakpoint                           - 12. */
+    .long   trap        /* (Reserved for Coprocessor Protocol Violation)- 13. */
+    .long   trap        /* Format Error                                 - 14. */
+    .long   trap        /* Uninitialized Interrupt                      - 15. */
+    .long   trap        /* (Unassigned, Reserver)                       - 16. */
+    .long   trap        /* (Unassigned, Reserver)                       - 17. */
+    .long   trap        /* (Unassigned, Reserver)                       - 18. */
+    .long   trap        /* (Unassigned, Reserver)                       - 19. */
+    .long   trap        /* (Unassigned, Reserver)                       - 20. */
+    .long   trap        /* (Unassigned, Reserver)                       - 21. */
+    .long   trap        /* (Unassigned, Reserver)                       - 22. */
+    .long   trap        /* (Unassigned, Reserver)                       - 23. */
+    .long   trap        /* Spurious Interrupt                           - 24. */
+    .long   trap        /* Level 1 Interrupt Autovector                 - 25. */
+    .long   trap        /* Level 2 Interrupt Autovector                 - 26. */
+    .long   trap        /* Level 3 Interrupt Autovector                 - 27. */
+    .long   trap        /* Level 4 Interrupt Autovector                 - 28. */
+    .long   trap        /* Level 5 Interrupt Autovector                 - 29. */
+    .long   trap        /* Level 6 Interrupt Autovector                 - 30. */
+    .long   trap        /* Level 7 Interrupt Autovector                 - 31. */
+    .long   system_call /* Trap Instruction Vectors 0                   - 32. */
+    .long   trap        /* Trap Instruction Vectors 1                   - 33. */
+    .long   trap        /* Trap Instruction Vectors 2                   - 34. */
+    .long   trap        /* Trap Instruction Vectors 3                   - 35. */
+    .long   trap        /* Trap Instruction Vectors 4                   - 36. */
+    .long   trap        /* Trap Instruction Vectors 5                   - 37. */
+    .long   trap        /* Trap Instruction Vectors 6                   - 38. */
+    .long   trap        /* Trap Instruction Vectors 7                   - 39. */
+    .long   trap        /* Trap Instruction Vectors 8                   - 40. */
+    .long   trap        /* Trap Instruction Vectors 9                   - 41. */
+    .long   trap        /* Trap Instruction Vectors 10                  - 42. */
+    .long   trap        /* Trap Instruction Vectors 11                  - 43. */
+    .long   trap        /* Trap Instruction Vectors 12                  - 44. */
+    .long   trap        /* Trap Instruction Vectors 13                  - 45. */
+    .long   trap        /* Trap Instruction Vectors 14                  - 46. */
+    .long   trap        /* Trap Instruction Vectors 15                  - 47. */
+    .long   0           /* (Reserved for Coprocessor)                   - 48. */
+    .long   0           /* (Reserved for Coprocessor)                   - 49. */
+    .long   0           /* (Reserved for Coprocessor)                   - 50. */
+    .long   0           /* (Reserved for Coprocessor)                   - 51. */
+    .long   0           /* (Reserved for Coprocessor)                   - 52. */
+    .long   0           /* (Reserved for Coprocessor)                   - 53. */
+    .long   0           /* (Reserved for Coprocessor)                   - 54. */
+    .long   0           /* (Reserved for Coprocessor)                   - 55. */
+    .long   0           /* (Reserved for Coprocessor)                   - 56. */
+    .long   0           /* (Reserved for Coprocessor)                   - 57. */
+    .long   0           /* (Reserved for Coprocessor)                   - 58. */
+    .long   0           /* (Unassigned, Reserved)                       - 59. */
+    .long   0           /* (Unassigned, Reserved)                       - 60. */
+    .long   0           /* (Unassigned, Reserved)                       - 61. */
+    .long   0           /* (Unassigned, Reserved)                       - 62. */
+    .long   0           /* (Unassigned, Reserved)                       - 63. */
+    /*                  The assignment of these vectors to the CPM is         */
+    /*                  dependent on the configuration of the CPM vba         */
+    /*                          fields.                                       */
+    .long   0           /* (User-Defined Vectors 1) CPM Error           - 64. */
+    .long   0           /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */
+    .long   0           /* (User-Defined Vectors 3) CPM Parallel IO PC10- 66. */
+    .long   0           /* (User-Defined Vectors 4) CPM SMC2 / PIP      - 67. */
+    .long   0           /* (User-Defined Vectors 5) CPM SMC1            - 68. */
+    .long   0           /* (User-Defined Vectors 6) CPM SPI             - 69. */
+    .long   0           /* (User-Defined Vectors 7) CPM Parallel IO PC9 - 70. */
+    .long   0           /* (User-Defined Vectors 8) CPM Timer 4         - 71. */
+    .long   0           /* (User-Defined Vectors 9) CPM Reserved        - 72. */
+    .long   0           /* (User-Defined Vectors 10) CPM Parallel IO PC8- 73. */
+    .long   0           /* (User-Defined Vectors 11) CPM Parallel IO PC7- 74. */
+    .long   0           /* (User-Defined Vectors 12) CPM Parallel IO PC6- 75. */
+    .long   0           /* (User-Defined Vectors 13) CPM Timer 3        - 76. */
+    .long   0           /* (User-Defined Vectors 14) CPM Reserved       - 77. */
+    .long   0           /* (User-Defined Vectors 15) CPM Parallel IO PC5- 78. */
+    .long   0           /* (User-Defined Vectors 16) CPM Parallel IO PC4- 79. */
+    .long   0           /* (User-Defined Vectors 17) CPM Reserved       - 80. */
+    .long   0           /* (User-Defined Vectors 18) CPM RISC Timer Tbl - 81. */
+    .long   0           /* (User-Defined Vectors 19) CPM Timer 2        - 82. */
+    .long   0           /* (User-Defined Vectors 21) CPM Reserved       - 83. */
+    .long   0           /* (User-Defined Vectors 22) CPM IDMA2          - 84. */
+    .long   0           /* (User-Defined Vectors 23) CPM IDMA1          - 85. */
+    .long   0           /* (User-Defined Vectors 24) CPM SDMA Bus Err   - 86. */
+    .long   0           /* (User-Defined Vectors 25) CPM Parallel IO PC3- 87. */
+    .long   0           /* (User-Defined Vectors 26) CPM Parallel IO PC2- 88. */
+    .long   0           /* (User-Defined Vectors 27) CPM Timer 1        - 89. */
+    .long   0           /* (User-Defined Vectors 28) CPM Parallel IO PC1- 90. */
+    .long   0           /* (User-Defined Vectors 29) CPM SCC 4          - 91. */
+    .long   0           /* (User-Defined Vectors 30) CPM SCC 3          - 92. */
+    .long   0           /* (User-Defined Vectors 31) CPM SCC 2          - 93. */
+    .long   0           /* (User-Defined Vectors 32) CPM SCC 1          - 94. */
+    .long   0           /* (User-Defined Vectors 33) CPM Parallel IO PC0- 95. */
+    /*                  I don't think anything uses the vectors after here.   */
+    .long   0           /* (User-Defined Vectors 34)                    - 96. */
+    .long   0,0,0,0,0               /* (User-Defined Vectors 35  -  39). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 40  -  49). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 50  -  59). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 60  -  69). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 70  -  79). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 80  -  89). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 90  -  99). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 100 - 109). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 110 - 119). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 120 - 129). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 130 - 139). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 140 - 149). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 150 - 159). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 160 - 169). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 170 - 179). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 180 - 189). */
+    .long   0,0,0                   /* (User-Defined Vectors 190 - 192). */
+.text
+ignore: rte
diff --git a/arch/m68knommu/platform/68360/head-rom.S b/arch/m68knommu/platform/68360/head-rom.S
new file mode 100644
index 000000000000..0da357a4cfee
--- /dev/null
+++ b/arch/m68knommu/platform/68360/head-rom.S
@@ -0,0 +1,420 @@
+/* arch/m68knommu/platform/68360/head-rom.S
+ *
+ * Startup code for Motorola 68360
+ *
+ * Copyright (C) SED Systems, a Division of Calian Ltd.
+ * Based on: arch/m68knommu/platform/68328/pilot/crt0_rom.S
+ * Based on: arch/m68knommu/platform/68360/uCquicc/crt0_rom.S, 2.0.38.1.pre7
+ *           uClinux Kernel
+ * Copyright (C) Michael Leslie <mleslie@lineo.com>
+ * Based on: arch/m68knommu/platform/68EZ328/ucsimm/crt0_rom.S
+ * Copyright (C) 1998  D. Jeff Dionne <jeff@uclinux.org>,
+ *
+ */
+#include <linux/config.h>
+
+.global _stext
+.global _sbss
+.global _start
+
+.global _rambase
+.global __ramvec
+.global _ramvec
+.global _ramstart
+.global _ramend
+
+.global _quicc_base
+.global _periph_base
+
+#define REGB                        0x1000
+#define PEPAR                       (_dprbase + REGB + 0x0016)
+#define GMR                         (_dprbase + REGB + 0x0040)
+#define OR0                         (_dprbase + REGB + 0x0054)
+#define BR0                         (_dprbase + REGB + 0x0050)
+
+#define OR1                         (_dprbase + REGB + 0x0064)
+#define BR1                         (_dprbase + REGB + 0x0060)
+
+#define OR2                         (_dprbase + REGB + 0x0074)
+#define BR2                         (_dprbase + REGB + 0x0070)
+
+#define OR3                         (_dprbase + REGB + 0x0084)
+#define BR3                         (_dprbase + REGB + 0x0080)
+
+#define OR4                         (_dprbase + REGB + 0x0094)
+#define BR4                         (_dprbase + REGB + 0x0090)
+
+#define OR5                         (_dprbase + REGB + 0x00A4)
+#define BR5                         (_dprbase + REGB + 0x00A0)
+
+#define OR6                         (_dprbase + REGB + 0x00b4)
+#define BR6                         (_dprbase + REGB + 0x00b0)
+
+#define OR7                         (_dprbase + REGB + 0x00c4)
+#define BR7                         (_dprbase + REGB + 0x00c0)
+
+#define MCR                         (_dprbase + REGB + 0x0000)
+#define AVR                         (_dprbase + REGB + 0x0008)
+
+#define SYPCR                       (_dprbase + REGB + 0x0022)
+
+#define PLLCR                       (_dprbase + REGB + 0x0010)
+#define CLKOCR                      (_dprbase + REGB + 0x000C)
+#define CDVCR                       (_dprbase + REGB + 0x0014)
+
+#define BKAR                        (_dprbase + REGB + 0x0030)
+#define BKCR                        (_dprbase + REGB + 0x0034)
+#define SWIV                        (_dprbase + REGB + 0x0023)
+#define PICR                        (_dprbase + REGB + 0x0026)
+#define PITR                        (_dprbase + REGB + 0x002A)
+
+/* Define for all memory configuration */
+#define MCU_SIM_GMR                 0x00000000
+#define SIM_OR_MASK                 0x0fffffff
+
+/* Defines for chip select zero - the flash */
+#define SIM_OR0_MASK                0x20000000
+#define SIM_BR0_MASK                0x00000001
+
+/* Defines for chip select one - the RAM */
+#define SIM_OR1_MASK                0x10000000
+#define SIM_BR1_MASK                0x00000001
+
+#define MCU_SIM_MBAR_ADRS           0x0003ff00
+#define MCU_SIM_MBAR_BA_MASK        0xfffff000
+#define MCU_SIM_MBAR_AS_MASK        0x00000001
+
+#define MCU_SIM_PEPAR               0x00B4
+    
+#define MCU_DISABLE_INTRPTS         0x2700
+#define MCU_SIM_AVR                 0x00
+    
+#define MCU_SIM_MCR                 0x00005cff
+
+#define MCU_SIM_CLKOCR              0x00
+#define MCU_SIM_PLLCR               0x8000
+#define MCU_SIM_CDVCR               0x0000
+
+#define MCU_SIM_SYPCR               0x0000
+#define MCU_SIM_SWIV                0x00
+#define MCU_SIM_PICR                0x0000
+#define MCU_SIM_PITR                0x0000
+
+
+#include <asm/m68360_regs.h>
+
+        
+/*
+ * By the time this RAM specific code begins to execute, DPRAM
+ * and DRAM should already be mapped and accessible.
+ */
+
+        .text
+_start:
+_stext:
+        nop
+        ori.w   #MCU_DISABLE_INTRPTS, %sr       /* disable interrupts: */
+        /* We should not need to setup the boot stack the reset should do it. */
+        movea.l #__ramend, %sp          /* set up stack at the end of DRAM:*/
+
+
+set_mbar_register:
+        moveq.l #0x07, %d1                      /* Setup MBAR */
+        movec   %d1, %dfc
+
+        lea.l   MCU_SIM_MBAR_ADRS, %a0
+        move.l  #_dprbase, %d0
+        andi.l  #MCU_SIM_MBAR_BA_MASK, %d0
+        ori.l   #MCU_SIM_MBAR_AS_MASK, %d0
+        moves.l %d0, %a0@
+
+        moveq.l #0x05, %d1
+        movec.l %d1, %dfc
+
+        /* Now we can begin to access registers in DPRAM */
+
+set_sim_mcr:
+        /* Set Module Configuration Register */
+        move.l  #MCU_SIM_MCR, MCR
+
+        /* to do:       Determine cause of reset */
+
+        /*
+         *      configure system clock MC68360 p. 6-40
+         *      (value +1)*osc/128 = system clock
+         *                    or
+         *      (value + 1)*osc = system clock
+         *      You do not need to divide the oscillator by 128 unless you want to.
+         */
+set_sim_clock:
+        move.w  #MCU_SIM_PLLCR, PLLCR
+        move.b  #MCU_SIM_CLKOCR, CLKOCR
+        move.w  #MCU_SIM_CDVCR, CDVCR
+
+        /* Wait for the PLL to settle */
+        move.w  #16384, %d0
+pll_settle_wait:
+        subi.w  #1, %d0
+        bne     pll_settle_wait
+
+        /* Setup the system protection register, and watchdog timer register */
+        move.b  #MCU_SIM_SWIV, SWIV
+        move.w  #MCU_SIM_PICR, PICR
+        move.w  #MCU_SIM_PITR, PITR
+        move.w  #MCU_SIM_SYPCR, SYPCR
+
+        /* Clear DPRAM - system + parameter */
+        movea.l #_dprbase, %a0
+        movea.l #_dprbase+0x2000, %a1
+
+        /* Copy 0 to %a0 until %a0 == %a1 */
+clear_dpram:
+        movel   #0, %a0@+
+        cmpal   %a0, %a1
+        bhi     clear_dpram
+
+configure_memory_controller:    
+        /* Set up Global Memory Register (GMR) */
+        move.l  #MCU_SIM_GMR, %d0
+        move.l  %d0, GMR
+
+configure_chip_select_0:
+        move.l  #0x00400000, %d0
+        subq.l  #0x01, %d0
+        eori.l  #SIM_OR_MASK, %d0
+        ori.l   #SIM_OR0_MASK, %d0
+        move.l  %d0, OR0
+
+        move.l  #__rom_start, %d0
+        ori.l   #SIM_BR0_MASK, %d0
+        move.l  %d0, BR0
+
+        move.l  #0x0, BR1
+        move.l  #0x0, BR2
+        move.l  #0x0, BR3
+        move.l  #0x0, BR4
+        move.l  #0x0, BR5
+        move.l  #0x0, BR6
+        move.l  #0x0, BR7
+
+        move.w  #MCU_SIM_PEPAR, PEPAR 
+
+        /* point to vector table: */
+        move.l  #_romvec, %a0
+        move.l  #_ramvec, %a1
+copy_vectors:
+        move.l  %a0@, %d0
+        move.l  %d0, %a1@
+        move.l  %a0@, %a1@
+        addq.l  #0x04, %a0
+        addq.l  #0x04, %a1
+        cmp.l   #_start, %a0
+        blt     copy_vectors
+
+        move.l  #_ramvec, %a1
+        movec   %a1, %vbr
+
+
+        /* Copy data segment from ROM to RAM */
+        moveal  #_etext, %a0
+        moveal  #_sdata, %a1
+        moveal  #_edata, %a2
+
+        /* Copy %a0 to %a1 until %a1 == %a2 */
+LD1:
+        move.l  %a0@, %d0
+        addq.l  #0x04, %a0
+        move.l  %d0, %a1@
+        addq.l  #0x04, %a1
+        cmp.l   #_edata, %a1
+        blt     LD1
+
+        moveal  #_sbss, %a0
+        moveal  #_ebss, %a1
+
+        /* Copy 0 to %a0 until %a0 == %a1 */
+L1:
+        movel   #0, %a0@+
+        cmpal   %a0, %a1
+        bhi     L1
+
+load_quicc:
+        move.l  #_dprbase, _quicc_base
+
+store_ram_size:
+        /* Set ram size information */
+        move.l  #_sdata, _rambase
+        move.l  #_ebss, _ramstart
+        move.l  #__ramend, %d0
+        sub.l   #0x1000, %d0                    /* Reserve 4K for stack space.*/
+        move.l  %d0, _ramend                    /* Different from __ramend.*/
+
+store_flash_size:
+        /* Set rom size information */
+        move.l  #__rom_end, %d0
+        sub.l   #__rom_start, %d0
+        move.l  %d0, rom_length
+    
+        pea     0
+        pea     env
+        pea     %sp@(4)
+        pea     0
+
+        lea     init_thread_union, %a2
+        lea     0x2000(%a2), %sp
+
+lp:
+        jsr     start_kernel
+
+_exit:
+        jmp     _exit
+
+
+        .data
+        .align 4
+env:
+        .long   0
+_quicc_base:
+        .long   0
+_periph_base:
+        .long   0
+_ramvec:
+        .long   0
+_rambase:
+        .long   0
+_ramstart:
+        .long   0
+_ramend:
+        .long   0
+_dprbase:
+        .long   0xffffe000
+
+
+        .text
+
+    /*
+     * These are the exception vectors at boot up, they are copied into RAM
+     * and then overwritten as needed.
+     */
+ 
+.section ".data.initvect","awx"
+    .long   __ramend    /* Reset: Initial Stack Pointer                 - 0.  */
+    .long   _start      /* Reset: Initial Program Counter               - 1.  */
+    .long   buserr      /* Bus Error                                    - 2.  */
+    .long   trap        /* Address Error                                - 3.  */
+    .long   trap        /* Illegal Instruction                          - 4.  */
+    .long   trap        /* Divide by zero                               - 5.  */
+    .long   trap        /* CHK, CHK2 Instructions                       - 6.  */
+    .long   trap        /* TRAPcc, TRAPV Instructions                   - 7.  */
+    .long   trap        /* Privilege Violation                          - 8.  */
+    .long   trap        /* Trace                                        - 9.  */
+    .long   trap        /* Line 1010 Emulator                           - 10. */
+    .long   trap        /* Line 1111 Emualtor                           - 11. */
+    .long   trap        /* Harware Breakpoint                           - 12. */
+    .long   trap        /* (Reserved for Coprocessor Protocol Violation)- 13. */
+    .long   trap        /* Format Error                                 - 14. */
+    .long   trap        /* Uninitialized Interrupt                      - 15. */
+    .long   trap        /* (Unassigned, Reserver)                       - 16. */
+    .long   trap        /* (Unassigned, Reserver)                       - 17. */
+    .long   trap        /* (Unassigned, Reserver)                       - 18. */
+    .long   trap        /* (Unassigned, Reserver)                       - 19. */
+    .long   trap        /* (Unassigned, Reserver)                       - 20. */
+    .long   trap        /* (Unassigned, Reserver)                       - 21. */
+    .long   trap        /* (Unassigned, Reserver)                       - 22. */
+    .long   trap        /* (Unassigned, Reserver)                       - 23. */
+    .long   trap        /* Spurious Interrupt                           - 24. */
+    .long   trap        /* Level 1 Interrupt Autovector                 - 25. */
+    .long   trap        /* Level 2 Interrupt Autovector                 - 26. */
+    .long   trap        /* Level 3 Interrupt Autovector                 - 27. */
+    .long   trap        /* Level 4 Interrupt Autovector                 - 28. */
+    .long   trap        /* Level 5 Interrupt Autovector                 - 29. */
+    .long   trap        /* Level 6 Interrupt Autovector                 - 30. */
+    .long   trap        /* Level 7 Interrupt Autovector                 - 31. */
+    .long   system_call /* Trap Instruction Vectors 0                   - 32. */
+    .long   trap        /* Trap Instruction Vectors 1                   - 33. */
+    .long   trap        /* Trap Instruction Vectors 2                   - 34. */
+    .long   trap        /* Trap Instruction Vectors 3                   - 35. */
+    .long   trap        /* Trap Instruction Vectors 4                   - 36. */
+    .long   trap        /* Trap Instruction Vectors 5                   - 37. */
+    .long   trap        /* Trap Instruction Vectors 6                   - 38. */
+    .long   trap        /* Trap Instruction Vectors 7                   - 39. */
+    .long   trap        /* Trap Instruction Vectors 8                   - 40. */
+    .long   trap        /* Trap Instruction Vectors 9                   - 41. */
+    .long   trap        /* Trap Instruction Vectors 10                  - 42. */
+    .long   trap        /* Trap Instruction Vectors 11                  - 43. */
+    .long   trap        /* Trap Instruction Vectors 12                  - 44. */
+    .long   trap        /* Trap Instruction Vectors 13                  - 45. */
+    .long   trap        /* Trap Instruction Vectors 14                  - 46. */
+    .long   trap        /* Trap Instruction Vectors 15                  - 47. */
+    .long   0           /* (Reserved for Coprocessor)                   - 48. */
+    .long   0           /* (Reserved for Coprocessor)                   - 49. */
+    .long   0           /* (Reserved for Coprocessor)                   - 50. */
+    .long   0           /* (Reserved for Coprocessor)                   - 51. */
+    .long   0           /* (Reserved for Coprocessor)                   - 52. */
+    .long   0           /* (Reserved for Coprocessor)                   - 53. */
+    .long   0           /* (Reserved for Coprocessor)                   - 54. */
+    .long   0           /* (Reserved for Coprocessor)                   - 55. */
+    .long   0           /* (Reserved for Coprocessor)                   - 56. */
+    .long   0           /* (Reserved for Coprocessor)                   - 57. */
+    .long   0           /* (Reserved for Coprocessor)                   - 58. */
+    .long   0           /* (Unassigned, Reserved)                       - 59. */
+    .long   0           /* (Unassigned, Reserved)                       - 60. */
+    .long   0           /* (Unassigned, Reserved)                       - 61. */
+    .long   0           /* (Unassigned, Reserved)                       - 62. */
+    .long   0           /* (Unassigned, Reserved)                       - 63. */
+    /*                  The assignment of these vectors to the CPM is         */
+    /*                  dependent on the configuration of the CPM vba         */
+    /*                          fields.                                       */
+    .long   0           /* (User-Defined Vectors 1) CPM Error           - 64. */
+    .long   0           /* (User-Defined Vectors 2) CPM Parallel IO PC11- 65. */
+    .long   0           /* (User-Defined Vectors 3) CPM Parallel IO PC10- 66. */
+    .long   0           /* (User-Defined Vectors 4) CPM SMC2 / PIP      - 67. */
+    .long   0           /* (User-Defined Vectors 5) CPM SMC1            - 68. */
+    .long   0           /* (User-Defined Vectors 6) CPM SPI             - 69. */
+    .long   0           /* (User-Defined Vectors 7) CPM Parallel IO PC9 - 70. */
+    .long   0           /* (User-Defined Vectors 8) CPM Timer 4         - 71. */
+    .long   0           /* (User-Defined Vectors 9) CPM Reserved        - 72. */
+    .long   0           /* (User-Defined Vectors 10) CPM Parallel IO PC8- 73. */
+    .long   0           /* (User-Defined Vectors 11) CPM Parallel IO PC7- 74. */
+    .long   0           /* (User-Defined Vectors 12) CPM Parallel IO PC6- 75. */
+    .long   0           /* (User-Defined Vectors 13) CPM Timer 3        - 76. */
+    .long   0           /* (User-Defined Vectors 14) CPM Reserved       - 77. */
+    .long   0           /* (User-Defined Vectors 15) CPM Parallel IO PC5- 78. */
+    .long   0           /* (User-Defined Vectors 16) CPM Parallel IO PC4- 79. */
+    .long   0           /* (User-Defined Vectors 17) CPM Reserved       - 80. */
+    .long   0           /* (User-Defined Vectors 18) CPM RISC Timer Tbl - 81. */
+    .long   0           /* (User-Defined Vectors 19) CPM Timer 2        - 82. */
+    .long   0           /* (User-Defined Vectors 21) CPM Reserved       - 83. */
+    .long   0           /* (User-Defined Vectors 22) CPM IDMA2          - 84. */
+    .long   0           /* (User-Defined Vectors 23) CPM IDMA1          - 85. */
+    .long   0           /* (User-Defined Vectors 24) CPM SDMA Bus Err   - 86. */
+    .long   0           /* (User-Defined Vectors 25) CPM Parallel IO PC3- 87. */
+    .long   0           /* (User-Defined Vectors 26) CPM Parallel IO PC2- 88. */
+    .long   0           /* (User-Defined Vectors 27) CPM Timer 1        - 89. */
+    .long   0           /* (User-Defined Vectors 28) CPM Parallel IO PC1- 90. */
+    .long   0           /* (User-Defined Vectors 29) CPM SCC 4          - 91. */
+    .long   0           /* (User-Defined Vectors 30) CPM SCC 3          - 92. */
+    .long   0           /* (User-Defined Vectors 31) CPM SCC 2          - 93. */
+    .long   0           /* (User-Defined Vectors 32) CPM SCC 1          - 94. */
+    .long   0           /* (User-Defined Vectors 33) CPM Parallel IO PC0- 95. */
+    /*                  I don't think anything uses the vectors after here.   */
+    .long   0           /* (User-Defined Vectors 34)                    - 96. */
+    .long   0,0,0,0,0               /* (User-Defined Vectors 35  -  39). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 40  -  49). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 50  -  59). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 60  -  69). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 70  -  79). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 80  -  89). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 90  -  99). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 100 - 109). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 110 - 119). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 120 - 129). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 130 - 139). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 140 - 149). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 150 - 159). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 160 - 169). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 170 - 179). */
+    .long   0,0,0,0,0,0,0,0,0,0     /* (User-Defined Vectors 180 - 189). */
+    .long   0,0,0                   /* (User-Defined Vectors 190 - 192). */
+.text
+ignore: rte
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 8d76eb1ff291..0eb71ac303af 100644
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -154,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/offset.c b/arch/mips/kernel/asm-offsets.c
index 2c11abb5a406..2c11abb5a406 100644
--- a/arch/mips/kernel/offset.c
+++ b/arch/mips/kernel/asm-offsets.c
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/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 b46595462717..4de155699c4f 100644
--- a/arch/mips/kernel/sysirix.c
+++ b/arch/mips/kernel/sysirix.c
@@ -1032,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/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/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/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 6ab7e5ea5fcf..347ea284140b 100644
--- a/arch/ppc/Kconfig
+++ b/arch/ppc/Kconfig
@@ -265,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
 
@@ -499,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
@@ -680,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..16e2675f3270 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)
+archprepare: 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/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/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/Makefile b/arch/ppc64/Makefile
index 8189953a372c..17d2c1eac3b8 100644
--- a/arch/ppc64/Makefile
+++ b/arch/ppc64/Makefile
@@ -56,7 +56,7 @@ 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/iSeries_pci.c b/arch/ppc64/kernel/iSeries_pci.c
index 356e4fd9a94f..fbc273c32bcc 100644
--- a/arch/ppc64/kernel/iSeries_pci.c
+++ b/arch/ppc64/kernel/iSeries_pci.c
@@ -252,7 +252,7 @@ unsigned long __init find_and_init_phbs(void)
                         phb = (struct pci_controller *)kmalloc(sizeof(struct pci_controller), GFP_KERNEL);
                         if (phb == NULL)
                                 return -ENOMEM;
-                        pci_setup_pci_controller(phb);
+                        pci_setup_pci_controller(phb);
 
                         phb->pci_mem_offset = phb->local_number = bus;
                         phb->first_busno = bus;
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/maple_pci.c b/arch/ppc64/kernel/maple_pci.c
index 53993999b265..1d297e0edfc0 100644
--- a/arch/ppc64/kernel/maple_pci.c
+++ b/arch/ppc64/kernel/maple_pci.c
@@ -283,7 +283,7 @@ static void __init setup_u3_agp(struct pci_controller* hose)
          * the reg address cell, we shall fix that by killing struct
          * reg_property and using some accessor functions instead
          */
-        hose->first_busno = 0xf0;
+        hose->first_busno = 0xf0;
         hose->last_busno = 0xff;
         hose->ops = &u3_agp_pci_ops;
         hose->cfg_addr = ioremap(0xf0000000 + 0x800000, 0x1000);
@@ -315,24 +315,24 @@ static int __init add_bridge(struct device_node *dev)
         char* disp_name;
         int *bus_range;
         int primary = 1;
-        struct property *of_prop;
+        struct property *of_prop;
 
         DBG("Adding PCI host bridge %s\n", dev->full_name);
 
-        bus_range = (int *) get_property(dev, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
-                               dev->full_name);
-        }
+        bus_range = (int *) get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
+                dev->full_name);
+        }
 
         hose = alloc_bootmem(sizeof(struct pci_controller));
         if (hose == NULL)
                 return -ENOMEM;
-        pci_setup_pci_controller(hose);
+        pci_setup_pci_controller(hose);
 
-        hose->arch_data = dev;
-        hose->first_busno = bus_range ? bus_range[0] : 0;
-        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+        hose->arch_data = dev;
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
         of_prop = alloc_bootmem(sizeof(struct property) +
                                 sizeof(hose->global_number));
@@ -346,25 +346,25 @@ static int __init add_bridge(struct device_node *dev)
         }
 
         disp_name = NULL;
-        if (device_is_compatible(dev, "u3-agp")) {
-                setup_u3_agp(hose);
-                disp_name = "U3-AGP";
-                primary = 0;
-        } else if (device_is_compatible(dev, "u3-ht")) {
-                setup_u3_ht(hose);
-                disp_name = "U3-HT";
-                primary = 1;
-        }
-        printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n",
-                disp_name, hose->first_busno, hose->last_busno);
-
-        /* Interpret the "ranges" property */
-        /* This also maps the I/O region and sets isa_io/mem_base */
-        pci_process_bridge_OF_ranges(hose, dev);
+        if (device_is_compatible(dev, "u3-agp")) {
+                setup_u3_agp(hose);
+                disp_name = "U3-AGP";
+                primary = 0;
+        } else if (device_is_compatible(dev, "u3-ht")) {
+                setup_u3_ht(hose);
+                disp_name = "U3-HT";
+                primary = 1;
+        }
+        printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n",
+                disp_name, hose->first_busno, hose->last_busno);
+
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pci_process_bridge_OF_ranges(hose, dev);
         pci_setup_phb_io(hose, primary);
 
-        /* Fixup "bus-range" OF property */
-        fixup_bus_range(dev);
+        /* Fixup "bus-range" OF property */
+        fixup_bus_range(dev);
 
         return 0;
 }
@@ -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 6d860c1d9fa0..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
@@ -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_setup.c b/arch/ppc64/kernel/pSeries_setup.c
index 9490b6c5b173..bfadccc7b8be 100644
--- a/arch/ppc64/kernel/pSeries_setup.c
+++ b/arch/ppc64/kernel/pSeries_setup.c
@@ -590,6 +590,13 @@ static int pseries_shared_idle(void)
         return 0;
 }
 
+static int pSeries_pci_probe_mode(struct pci_bus *bus)
+{
+        if (systemcfg->platform & PLATFORM_LPAR)
+                return PCI_PROBE_DEVTREE;
+        return PCI_PROBE_NORMAL;
+}
+
 struct machdep_calls __initdata pSeries_md = {
         .probe                  = pSeries_probe,
         .setup_arch             = pSeries_setup_arch,
@@ -597,6 +604,7 @@ struct machdep_calls __initdata pSeries_md = {
         .get_cpuinfo            = pSeries_get_cpuinfo,
         .log_error              = pSeries_log_error,
         .pcibios_fixup          = pSeries_final_fixup,
+        .pci_probe_mode         = pSeries_pci_probe_mode,
         .irq_bus_setup          = pSeries_irq_bus_setup,
         .restart                = rtas_restart,
         .power_off              = rtas_power_off,
diff --git a/arch/ppc64/kernel/pSeries_smp.c b/arch/ppc64/kernel/pSeries_smp.c
index 79c7f3223665..d2c7e2c4733b 100644
--- a/arch/ppc64/kernel/pSeries_smp.c
+++ b/arch/ppc64/kernel/pSeries_smp.c
@@ -272,6 +272,7 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         unsigned long start_here = __pa((u32)*((unsigned long *)
                                                pSeries_secondary_smp_init));
         unsigned int pcpu;
+        int start_cpu;
 
         if (cpu_isset(lcpu, of_spin_map))
                 /* Already started by OF and sitting in spin loop */
@@ -282,12 +283,20 @@ static inline int __devinit smp_startup_cpu(unsigned int lcpu)
         /* Fixup atomic count: it exited inside IRQ handler. */
         paca[lcpu].__current->thread_info->preempt_count        = 0;
 
-        status = rtas_call(rtas_token("start-cpu"), 3, 1, NULL,
-                           pcpu, start_here, lcpu);
+        /* 
+         * If the RTAS start-cpu token does not exist then presume the
+         * cpu is already spinning.
+         */
+        start_cpu = rtas_token("start-cpu");
+        if (start_cpu == RTAS_UNKNOWN_SERVICE)
+                return 1;
+
+        status = rtas_call(start_cpu, 3, 1, NULL, pcpu, start_here, lcpu);
         if (status != 0) {
                 printk(KERN_ERR "start-cpu failed: %i\n", status);
                 return 0;
         }
+
         return 1;
 }
 
diff --git a/arch/ppc64/kernel/pci.c b/arch/ppc64/kernel/pci.c
index d0d55c7908ef..861138ad092c 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>
@@ -50,6 +51,10 @@ unsigned long io_page_mask;
 
 EXPORT_SYMBOL(io_page_mask);
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+static void fixup_resource(struct resource *res, struct pci_dev *dev);
+static void do_bus_setup(struct pci_bus *bus);
+#endif
 
 unsigned int pcibios_assign_all_busses(void)
 {
@@ -84,7 +89,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);
@@ -225,10 +229,287 @@ static void __init pcibios_claim_of_setup(void)
 }
 #endif
 
+#ifdef CONFIG_PPC_MULTIPLATFORM
+static u32 get_int_prop(struct device_node *np, const char *name, u32 def)
+{
+        u32 *prop;
+        int len;
+
+        prop = (u32 *) get_property(np, name, &len);
+        if (prop && len >= 4)
+                return *prop;
+        return def;
+}
+
+static unsigned int pci_parse_of_flags(u32 addr0)
+{
+        unsigned int flags = 0;
+
+        if (addr0 & 0x02000000) {
+                flags |= IORESOURCE_MEM;
+                if (addr0 & 0x40000000)
+                        flags |= IORESOURCE_PREFETCH;
+        } else if (addr0 & 0x01000000)
+                flags |= IORESOURCE_IO;
+        return flags;
+}
+
+#define GET_64BIT(prop, i)      ((((u64) (prop)[(i)]) << 32) | (prop)[(i)+1])
+
+static void pci_parse_of_addrs(struct device_node *node, struct pci_dev *dev)
+{
+        u64 base, size;
+        unsigned int flags;
+        struct resource *res;
+        u32 *addrs, i;
+        int proplen;
+
+        addrs = (u32 *) get_property(node, "assigned-addresses", &proplen);
+        if (!addrs)
+                return;
+        for (; proplen >= 20; proplen -= 20, addrs += 5) {
+                flags = pci_parse_of_flags(addrs[0]);
+                if (!flags)
+                        continue;
+                base = GET_64BIT(addrs, 1);
+                size = GET_64BIT(addrs, 3);
+                if (!size)
+                        continue;
+                i = addrs[0] & 0xff;
+                if (PCI_BASE_ADDRESS_0 <= i && i <= PCI_BASE_ADDRESS_5) {
+                        res = &dev->resource[(i - PCI_BASE_ADDRESS_0) >> 2];
+                } else if (i == dev->rom_base_reg) {
+                        res = &dev->resource[PCI_ROM_RESOURCE];
+                        flags |= IORESOURCE_READONLY | IORESOURCE_CACHEABLE;
+                } else {
+                        printk(KERN_ERR "PCI: bad cfg reg num 0x%x\n", i);
+                        continue;
+                }
+                res->start = base;
+                res->end = base + size - 1;
+                res->flags = flags;
+                res->name = pci_name(dev);
+                fixup_resource(res, dev);
+        }
+}
+
+static struct pci_dev *of_create_pci_dev(struct device_node *node,
+                                         struct pci_bus *bus, int devfn)
+{
+        struct pci_dev *dev;
+        const char *type;
+
+        dev = kmalloc(sizeof(struct pci_dev), GFP_KERNEL);
+        if (!dev)
+                return NULL;
+        type = get_property(node, "device_type", NULL);
+        if (type == NULL)
+                type = "";
+
+        memset(dev, 0, sizeof(struct pci_dev));
+        dev->bus = bus;
+        dev->sysdata = node;
+        dev->dev.parent = bus->bridge;
+        dev->dev.bus = &pci_bus_type;
+        dev->devfn = devfn;
+        dev->multifunction = 0;         /* maybe a lie? */
+
+        dev->vendor = get_int_prop(node, "vendor-id", 0xffff);
+        dev->device = get_int_prop(node, "device-id", 0xffff);
+        dev->subsystem_vendor = get_int_prop(node, "subsystem-vendor-id", 0);
+        dev->subsystem_device = get_int_prop(node, "subsystem-id", 0);
+
+        dev->cfg_size = 256; /*pci_cfg_space_size(dev);*/
+
+        sprintf(pci_name(dev), "%04x:%02x:%02x.%d", pci_domain_nr(bus),
+                dev->bus->number, PCI_SLOT(devfn), PCI_FUNC(devfn));
+        dev->class = get_int_prop(node, "class-code", 0);
+
+        dev->current_state = 4;         /* unknown power state */
+
+        if (!strcmp(type, "pci")) {
+                /* a PCI-PCI bridge */
+                dev->hdr_type = PCI_HEADER_TYPE_BRIDGE;
+                dev->rom_base_reg = PCI_ROM_ADDRESS1;
+        } else if (!strcmp(type, "cardbus")) {
+                dev->hdr_type = PCI_HEADER_TYPE_CARDBUS;
+        } else {
+                dev->hdr_type = PCI_HEADER_TYPE_NORMAL;
+                dev->rom_base_reg = PCI_ROM_ADDRESS;
+                dev->irq = NO_IRQ;
+                if (node->n_intrs > 0) {
+                        dev->irq = node->intrs[0].line;
+                        pci_write_config_byte(dev, PCI_INTERRUPT_LINE,
+                                              dev->irq);
+                }
+        }
+
+        pci_parse_of_addrs(node, dev);
+
+        pci_device_add(dev, bus);
+
+        /* XXX pci_scan_msi_device(dev); */
+
+        return dev;
+}
+
+static void of_scan_pci_bridge(struct device_node *node, struct pci_dev *dev);
+
+static void __devinit of_scan_bus(struct device_node *node,
+                                  struct pci_bus *bus)
+{
+        struct device_node *child = NULL;
+        u32 *reg;
+        int reglen, devfn;
+        struct pci_dev *dev;
+
+        while ((child = of_get_next_child(node, child)) != NULL) {
+                reg = (u32 *) get_property(child, "reg", &reglen);
+                if (reg == NULL || reglen < 20)
+                        continue;
+                devfn = (reg[0] >> 8) & 0xff;
+                /* create a new pci_dev for this device */
+                dev = of_create_pci_dev(child, bus, devfn);
+                if (!dev)
+                        continue;
+                if (dev->hdr_type == PCI_HEADER_TYPE_BRIDGE ||
+                    dev->hdr_type == PCI_HEADER_TYPE_CARDBUS)
+                        of_scan_pci_bridge(child, dev);
+        }
+
+        do_bus_setup(bus);
+}
+
+static void __devinit of_scan_pci_bridge(struct device_node *node,
+                                         struct pci_dev *dev)
+{
+        struct pci_bus *bus;
+        u32 *busrange, *ranges;
+        int len, i, mode;
+        struct resource *res;
+        unsigned int flags;
+        u64 size;
+
+        /* parse bus-range property */
+        busrange = (u32 *) get_property(node, "bus-range", &len);
+        if (busrange == NULL || len != 8) {
+                printk(KERN_ERR "Can't get bus-range for PCI-PCI bridge %s\n",
+                       node->full_name);
+                return;
+        }
+        ranges = (u32 *) get_property(node, "ranges", &len);
+        if (ranges == NULL) {
+                printk(KERN_ERR "Can't get ranges for PCI-PCI bridge %s\n",
+                       node->full_name);
+                return;
+        }
+
+        bus = pci_add_new_bus(dev->bus, dev, busrange[0]);
+        if (!bus) {
+                printk(KERN_ERR "Failed to create pci bus for %s\n",
+                       node->full_name);
+                return;
+        }
+
+        bus->primary = dev->bus->number;
+        bus->subordinate = busrange[1];
+        bus->bridge_ctl = 0;
+        bus->sysdata = node;
+
+        /* parse ranges property */
+        /* PCI #address-cells == 3 and #size-cells == 2 always */
+        res = &dev->resource[PCI_BRIDGE_RESOURCES];
+        for (i = 0; i < PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES; ++i) {
+                res->flags = 0;
+                bus->resource[i] = res;
+                ++res;
+        }
+        i = 1;
+        for (; len >= 32; len -= 32, ranges += 8) {
+                flags = pci_parse_of_flags(ranges[0]);
+                size = GET_64BIT(ranges, 6);
+                if (flags == 0 || size == 0)
+                        continue;
+                if (flags & IORESOURCE_IO) {
+                        res = bus->resource[0];
+                        if (res->flags) {
+                                printk(KERN_ERR "PCI: ignoring extra I/O range"
+                                       " for bridge %s\n", node->full_name);
+                                continue;
+                        }
+                } else {
+                        if (i >= PCI_NUM_RESOURCES - PCI_BRIDGE_RESOURCES) {
+                                printk(KERN_ERR "PCI: too many memory ranges"
+                                       " for bridge %s\n", node->full_name);
+                                continue;
+                        }
+                        res = bus->resource[i];
+                        ++i;
+                }
+                res->start = GET_64BIT(ranges, 1);
+                res->end = res->start + size - 1;
+                res->flags = flags;
+                fixup_resource(res, dev);
+        }
+        sprintf(bus->name, "PCI Bus %04x:%02x", pci_domain_nr(bus),
+                bus->number);
+
+        mode = PCI_PROBE_NORMAL;
+        if (ppc_md.pci_probe_mode)
+                mode = ppc_md.pci_probe_mode(bus);
+        if (mode == PCI_PROBE_DEVTREE)
+                of_scan_bus(node, bus);
+        else if (mode == PCI_PROBE_NORMAL)
+                pci_scan_child_bus(bus);
+}
+#endif /* CONFIG_PPC_MULTIPLATFORM */
+
+static void __devinit scan_phb(struct pci_controller *hose)
+{
+        struct pci_bus *bus;
+        struct device_node *node = hose->arch_data;
+        int i, mode;
+        struct resource *res;
+
+        bus = pci_create_bus(NULL, hose->first_busno, hose->ops, node);
+        if (bus == NULL) {
+                printk(KERN_ERR "Failed to create bus for PCI domain %04x\n",
+                       hose->global_number);
+                return;
+        }
+        bus->secondary = hose->first_busno;
+        hose->bus = bus;
+
+        bus->resource[0] = res = &hose->io_resource;
+        if (res->flags && request_resource(&ioport_resource, res))
+                printk(KERN_ERR "Failed to request PCI IO region "
+                       "on PCI domain %04x\n", hose->global_number);
+
+        for (i = 0; i < 3; ++i) {
+                res = &hose->mem_resources[i];
+                bus->resource[i+1] = res;
+                if (res->flags && request_resource(&iomem_resource, res))
+                        printk(KERN_ERR "Failed to request PCI memory region "
+                               "on PCI domain %04x\n", hose->global_number);
+        }
+
+        mode = PCI_PROBE_NORMAL;
+#ifdef CONFIG_PPC_MULTIPLATFORM
+        if (ppc_md.pci_probe_mode)
+                mode = ppc_md.pci_probe_mode(bus);
+        if (mode == PCI_PROBE_DEVTREE) {
+                bus->subordinate = hose->last_busno;
+                of_scan_bus(node, bus);
+        }
+#endif /* CONFIG_PPC_MULTIPLATFORM */
+        if (mode == PCI_PROBE_NORMAL)
+                hose->last_busno = bus->subordinate = pci_scan_child_bus(bus);
+        pci_bus_add_devices(bus);
+}
+
 static int __init pcibios_init(void)
 {
         struct pci_controller *hose, *tmp;
-        struct pci_bus *bus;
 
         /* For now, override phys_mem_access_prot. If we need it,
          * later, we may move that initialization to each ppc_md
@@ -242,13 +523,8 @@ static int __init pcibios_init(void)
         printk("PCI: Probing PCI hardware\n");
 
         /* Scan all of the recorded PCI controllers.  */
-        list_for_each_entry_safe(hose, tmp, &hose_list, list_node) {
-                hose->last_busno = 0xff;
-                bus = pci_scan_bus(hose->first_busno, hose->ops,
-                                   hose->arch_data);
-                hose->bus = bus;
-                hose->last_busno = bus->subordinate;
-        }
+        list_for_each_entry_safe(hose, tmp, &hose_list, list_node)
+                scan_phb(hose);
 
 #ifndef CONFIG_PPC_ISERIES
         if (pci_probe_only)
@@ -820,118 +1096,89 @@ void phbs_remap_io(void)
 /*
  * ppc64 can have multifunction devices that do not respond to function 0.
  * In this case we must scan all functions.
+ * XXX this can go now, we use the OF device tree in all the
+ * cases that caused problems. -- paulus
  */
 int pcibios_scan_all_fns(struct pci_bus *bus, int devfn)
 {
-       struct device_node *busdn, *dn;
+       return 0;
+}
+
+static void __devinit fixup_resource(struct resource *res, struct pci_dev *dev)
+{
+        struct pci_controller *hose = pci_bus_to_host(dev->bus);
+        unsigned long start, end, mask, offset;
 
-       if (bus->self)
-               busdn = pci_device_to_OF_node(bus->self);
-       else
-               busdn = bus->sysdata;   /* must be a phb */
+        if (res->flags & IORESOURCE_IO) {
+                offset = (unsigned long)hose->io_base_virt - pci_io_base;
 
-       if (busdn == NULL)
-               return 0;
+                start = res->start += offset;
+                end = res->end += offset;
 
-       /*
-        * Check to see if there is any of the 8 functions are in the
-        * 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))
-                       return 1;
+                /* Need to allow IO access to pages that are in the
+                   ISA range */
+                if (start < MAX_ISA_PORT) {
+                        if (end > MAX_ISA_PORT)
+                                end = MAX_ISA_PORT;
 
-       return 0;
-}
+                        start >>= PAGE_SHIFT;
+                        end >>= PAGE_SHIFT;
 
+                        /* get the range of pages for the map */
+                        mask = ((1 << (end+1)) - 1) ^ ((1 << start) - 1);
+                        io_page_mask |= mask;
+                }
+        } else if (res->flags & IORESOURCE_MEM) {
+                res->start += hose->pci_mem_offset;
+                res->end += hose->pci_mem_offset;
+        }
+}
 
 void __devinit pcibios_fixup_device_resources(struct pci_dev *dev,
-                                           struct pci_bus *bus)
+                                              struct pci_bus *bus)
 {
         /* Update device resources.  */
-        struct pci_controller *hose = pci_bus_to_host(bus);
         int i;
 
-        for (i = 0; i < PCI_NUM_RESOURCES; i++) {
-                if (dev->resource[i].flags & IORESOURCE_IO) {
-                        unsigned long offset = (unsigned long)hose->io_base_virt
-                                - pci_io_base;
-                        unsigned long start, end, mask;
-
-                        start = dev->resource[i].start += offset;
-                        end = dev->resource[i].end += offset;
-
-                        /* Need to allow IO access to pages that are in the
-                           ISA range */
-                        if (start < MAX_ISA_PORT) {
-                                if (end > MAX_ISA_PORT)
-                                        end = MAX_ISA_PORT;
-
-                                start >>= PAGE_SHIFT;
-                                end >>= PAGE_SHIFT;
-
-                                /* get the range of pages for the map */
-                                mask = ((1 << (end+1))-1) ^ ((1 << start)-1);
-                                io_page_mask |= mask;
-                        }
-                }
-                else if (dev->resource[i].flags & IORESOURCE_MEM) {
-                        dev->resource[i].start += hose->pci_mem_offset;
-                        dev->resource[i].end += hose->pci_mem_offset;
-                }
-        }
+        for (i = 0; i < PCI_NUM_RESOURCES; i++)
+                if (dev->resource[i].flags)
+                        fixup_resource(&dev->resource[i], dev);
 }
 EXPORT_SYMBOL(pcibios_fixup_device_resources);
 
-void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+static void __devinit do_bus_setup(struct pci_bus *bus)
 {
-        struct pci_controller *hose = pci_bus_to_host(bus);
-        struct pci_dev *dev = bus->self;
-        struct resource *res;
-        int i;
+        struct pci_dev *dev;
 
-        if (!dev) {
-                /* Root bus. */
+        ppc_md.iommu_bus_setup(bus);
 
-                hose->bus = bus;
-                bus->resource[0] = res = &hose->io_resource;
+        list_for_each_entry(dev, &bus->devices, bus_list)
+                ppc_md.iommu_dev_setup(dev);
 
-                if (res->flags && request_resource(&ioport_resource, res))
-                        printk(KERN_ERR "Failed to request IO on "
-                                        "PCI domain %d\n", pci_domain_nr(bus));
+        if (ppc_md.irq_bus_setup)
+                ppc_md.irq_bus_setup(bus);
+}
 
-                for (i = 0; i < 3; ++i) {
-                        res = &hose->mem_resources[i];
-                        bus->resource[i+1] = res;
-                        if (res->flags && request_resource(&iomem_resource, res))
-                                printk(KERN_ERR "Failed to request MEM on "
-                                                "PCI domain %d\n",
-                                                pci_domain_nr(bus));
-                }
-        } else if (pci_probe_only &&
-                   (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
+void __devinit pcibios_fixup_bus(struct pci_bus *bus)
+{
+        struct pci_dev *dev = bus->self;
+
+        if (dev && pci_probe_only &&
+            (dev->class >> 8) == PCI_CLASS_BRIDGE_PCI) {
                 /* This is a subordinate bridge */
 
                 pci_read_bridge_bases(bus);
                 pcibios_fixup_device_resources(dev, bus);
         }
 
-        ppc_md.iommu_bus_setup(bus);
-
-        list_for_each_entry(dev, &bus->devices, bus_list)
-                ppc_md.iommu_dev_setup(dev);
-
-        if (ppc_md.irq_bus_setup)
-                ppc_md.irq_bus_setup(bus);
+        do_bus_setup(bus);
 
         if (!pci_probe_only)
                 return;
 
-        list_for_each_entry(dev, &bus->devices, bus_list) {
+        list_for_each_entry(dev, &bus->devices, bus_list)
                 if ((dev->class >> 8) != PCI_CLASS_BRIDGE_PCI)
                         pcibios_fixup_device_resources(dev, bus);
-        }
 }
 EXPORT_SYMBOL(pcibios_fixup_bus);
 
@@ -983,3 +1230,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..dc40a0cad0b4 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;
@@ -388,7 +388,7 @@ static void __init setup_u3_agp(struct pci_controller* hose)
          * the reg address cell, we shall fix that by killing struct
          * reg_property and using some accessor functions instead
          */
-        hose->first_busno = 0xf0;
+        hose->first_busno = 0xf0;
         hose->last_busno = 0xff;
         has_uninorth = 1;
         hose->ops = &macrisc_pci_ops;
@@ -473,7 +473,7 @@ static void __init setup_u3_ht(struct pci_controller* hose)
                         continue;
                 }               
                 cur++;
-                DBG("U3/HT: hole, %d end at %08lx, %d start at %08lx\n",
+                DBG("U3/HT: hole, %d end at %08lx, %d start at %08lx\n",
                     cur-1, res->start - 1, cur, res->end + 1);
                 hose->mem_resources[cur].name = np->full_name;
                 hose->mem_resources[cur].flags = IORESOURCE_MEM;
@@ -603,24 +603,24 @@ static int __init add_bridge(struct device_node *dev)
         char* disp_name;
         int *bus_range;
         int primary = 1;
-        struct property *of_prop;
+        struct property *of_prop;
 
         DBG("Adding PCI host bridge %s\n", dev->full_name);
 
-        bus_range = (int *) get_property(dev, "bus-range", &len);
-        if (bus_range == NULL || len < 2 * sizeof(int)) {
-                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
-                               dev->full_name);
-        }
+        bus_range = (int *) get_property(dev, "bus-range", &len);
+        if (bus_range == NULL || len < 2 * sizeof(int)) {
+                printk(KERN_WARNING "Can't get bus-range for %s, assume bus 0\n",
+                        dev->full_name);
+        }
 
         hose = alloc_bootmem(sizeof(struct pci_controller));
         if (hose == NULL)
                 return -ENOMEM;
-        pci_setup_pci_controller(hose);
+        pci_setup_pci_controller(hose);
 
-        hose->arch_data = dev;
-        hose->first_busno = bus_range ? bus_range[0] : 0;
-        hose->last_busno = bus_range ? bus_range[1] : 0xff;
+        hose->arch_data = dev;
+        hose->first_busno = bus_range ? bus_range[0] : 0;
+        hose->last_busno = bus_range ? bus_range[1] : 0xff;
 
         of_prop = alloc_bootmem(sizeof(struct property) +
                                 sizeof(hose->global_number));
@@ -634,24 +634,24 @@ static int __init add_bridge(struct device_node *dev)
         }
 
         disp_name = NULL;
-        if (device_is_compatible(dev, "u3-agp")) {
-                setup_u3_agp(hose);
-                disp_name = "U3-AGP";
-                primary = 0;
-        } else if (device_is_compatible(dev, "u3-ht")) {
-                setup_u3_ht(hose);
-                disp_name = "U3-HT";
-                primary = 1;
-        }
-        printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n",
-                disp_name, hose->first_busno, hose->last_busno);
-
-        /* Interpret the "ranges" property */
-        /* This also maps the I/O region and sets isa_io/mem_base */
-        pmac_process_bridge_OF_ranges(hose, dev, primary);
-
-        /* Fixup "bus-range" OF property */
-        fixup_bus_range(dev);
+        if (device_is_compatible(dev, "u3-agp")) {
+                setup_u3_agp(hose);
+                disp_name = "U3-AGP";
+                primary = 0;
+        } else if (device_is_compatible(dev, "u3-ht")) {
+                setup_u3_ht(hose);
+                disp_name = "U3-HT";
+                primary = 1;
+        }
+        printk(KERN_INFO "Found %s PCI host bridge. Firmware bus number: %d->%d\n",
+                disp_name, hose->first_busno, hose->last_busno);
+
+        /* Interpret the "ranges" property */
+        /* This also maps the I/O region and sets isa_io/mem_base */
+        pmac_process_bridge_OF_ranges(hose, dev, primary);
+
+        /* Fixup "bus-range" OF property */
+        fixup_bus_range(dev);
 
         return 0;
 }
@@ -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/pmac_setup.c b/arch/ppc64/kernel/pmac_setup.c
index e7f695dcd8c8..325426c7bed0 100644
--- a/arch/ppc64/kernel/pmac_setup.c
+++ b/arch/ppc64/kernel/pmac_setup.c
@@ -477,6 +477,18 @@ static int __init pmac_probe(int platform)
         return 1;
 }
 
+static int pmac_probe_mode(struct pci_bus *bus)
+{
+        struct device_node *node = bus->sysdata;
+
+        /* We need to use normal PCI probing for the AGP bus,
+           since the device for the AGP bridge isn't in the tree. */
+        if (bus->self == NULL && device_is_compatible(node, "u3-agp"))
+                return PCI_PROBE_NORMAL;
+
+        return PCI_PROBE_DEVTREE;
+}
+
 struct machdep_calls __initdata pmac_md = {
 #ifdef CONFIG_HOTPLUG_CPU
         .cpu_die                = generic_mach_cpu_die,
@@ -488,6 +500,7 @@ struct machdep_calls __initdata pmac_md = {
         .init_IRQ               = pmac_init_IRQ,
         .get_irq                = mpic_get_irq,
         .pcibios_fixup          = pmac_pcibios_fixup,
+        .pci_probe_mode         = pmac_probe_mode,
         .restart                = pmac_restart,
         .power_off              = pmac_power_off,
         .halt                   = pmac_halt,
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/process.c b/arch/ppc64/kernel/process.c
index 7a7e027653ad..887005358eb1 100644
--- a/arch/ppc64/kernel/process.c
+++ b/arch/ppc64/kernel/process.c
@@ -54,6 +54,7 @@
 #include <asm/sections.h>
 #include <asm/tlbflush.h>
 #include <asm/time.h>
+#include <asm/plpar_wrappers.h>
 
 #ifndef CONFIG_SMP
 struct task_struct *last_task_used_math = NULL;
@@ -163,7 +164,30 @@ int dump_task_altivec(struct pt_regs *regs, elf_vrregset_t *vrregs)
 
 #endif /* CONFIG_ALTIVEC */
 
+static void set_dabr_spr(unsigned long val)
+{
+        mtspr(SPRN_DABR, val);
+}
+
+int set_dabr(unsigned long dabr)
+{
+        int ret = 0;
+
+        if (firmware_has_feature(FW_FEATURE_XDABR)) {
+                /* We want to catch accesses from kernel and userspace */
+                unsigned long flags = H_DABRX_KERNEL|H_DABRX_USER;
+                ret = plpar_set_xdabr(dabr, flags);
+        } else if (firmware_has_feature(FW_FEATURE_DABR)) {
+                ret = plpar_set_dabr(dabr);
+        } else {
+                set_dabr_spr(dabr);
+        }
+
+        return ret;
+}
+
 DEFINE_PER_CPU(struct cpu_usage, cpu_usage_array);
+static DEFINE_PER_CPU(unsigned long, current_dabr);
 
 struct task_struct *__switch_to(struct task_struct *prev,
                                 struct task_struct *new)
@@ -198,6 +222,11 @@ struct task_struct *__switch_to(struct task_struct *prev,
                 new->thread.regs->msr |= MSR_VEC;
 #endif /* CONFIG_ALTIVEC */
 
+        if (unlikely(__get_cpu_var(current_dabr) != new->thread.dabr)) {
+                set_dabr(new->thread.dabr);
+                __get_cpu_var(current_dabr) = new->thread.dabr;
+        }
+
         flush_tlb_pending();
 
         new_thread = &new->thread;
@@ -334,6 +363,11 @@ void flush_thread(void)
                 last_task_used_altivec = NULL;
 #endif /* CONFIG_ALTIVEC */
 #endif /* CONFIG_SMP */
+
+        if (current->thread.dabr) {
+                current->thread.dabr = 0;
+                set_dabr(0);
+        }
 }
 
 void
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/ptrace.c b/arch/ppc64/kernel/ptrace.c
index 2993f108d96d..85ed3188a91d 100644
--- a/arch/ppc64/kernel/ptrace.c
+++ b/arch/ppc64/kernel/ptrace.c
@@ -17,6 +17,7 @@
  * this archive for more details.
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -206,6 +207,19 @@ int sys_ptrace(long request, long pid, long addr, long data)
                 break;
         }
 
+        case PTRACE_GET_DEBUGREG: {
+                ret = -EINVAL;
+                /* We only support one DABR and no IABRS at the moment */
+                if (addr > 0)
+                        break;
+                ret = put_user(child->thread.dabr,
+                               (unsigned long __user *)data);
+                break;
+        }
+
+        case PTRACE_SET_DEBUGREG:
+                ret = ptrace_set_debugreg(child, addr, data);
+
         case PTRACE_DETACH:
                 ret = ptrace_detach(child, data);
                 break;
@@ -274,6 +288,20 @@ int sys_ptrace(long request, long pid, long addr, long data)
                 break;
         }
 
+#ifdef CONFIG_ALTIVEC
+        case PTRACE_GETVRREGS:
+                /* Get the child altivec register state. */
+                flush_altivec_to_thread(child);
+                ret = get_vrregs((unsigned long __user *)data, child);
+                break;
+
+        case PTRACE_SETVRREGS:
+                /* Set the child altivec register state. */
+                flush_altivec_to_thread(child);
+                ret = set_vrregs(child, (unsigned long __user *)data);
+                break;
+#endif
+
         default:
                 ret = ptrace_request(child, request, addr, data);
                 break;
diff --git a/arch/ppc64/kernel/ptrace32.c b/arch/ppc64/kernel/ptrace32.c
index 16436426c7e2..fb8c22d6084a 100644
--- a/arch/ppc64/kernel/ptrace32.c
+++ b/arch/ppc64/kernel/ptrace32.c
@@ -17,6 +17,7 @@
  * this archive for more details.
  */
 
+#include <linux/config.h>
 #include <linux/kernel.h>
 #include <linux/sched.h>
 #include <linux/mm.h>
@@ -337,6 +338,19 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
                 break;
         }
 
+        case PTRACE_GET_DEBUGREG: {
+                ret = -EINVAL;
+                /* We only support one DABR and no IABRS at the moment */
+                if (addr > 0)
+                        break;
+                ret = put_user(child->thread.dabr, (u32 __user *)data);
+                break;
+        }
+
+        case PTRACE_SET_DEBUGREG:
+                ret = ptrace_set_debugreg(child, addr, data);
+                break;
+
         case PTRACE_DETACH:
                 ret = ptrace_detach(child, data);
                 break;
@@ -405,9 +419,23 @@ int sys32_ptrace(long request, long pid, unsigned long addr, unsigned long data)
                 break;
         }
 
-       case PTRACE_GETEVENTMSG:
-                ret = put_user(child->ptrace_message, (unsigned int __user *) data);
-                break;
+        case PTRACE_GETEVENTMSG:
+                ret = put_user(child->ptrace_message, (unsigned int __user *) data);
+                break;
+
+#ifdef CONFIG_ALTIVEC
+        case PTRACE_GETVRREGS:
+                /* Get the child altivec register state. */
+                flush_altivec_to_thread(child);
+                ret = get_vrregs((unsigned long __user *)data, child);
+                break;
+
+        case PTRACE_SETVRREGS:
+                /* Set the child altivec register state. */
+                flush_altivec_to_thread(child);
+                ret = set_vrregs(child, (unsigned long __user *)data);
+                break;
+#endif
 
         default:
                 ret = ptrace_request(child, request, addr, data);
diff --git a/arch/ppc64/kernel/ras.c b/arch/ppc64/kernel/ras.c
index 3c00f7bfc1b5..41b97dc9cc0a 100644
--- a/arch/ppc64/kernel/ras.c
+++ b/arch/ppc64/kernel/ras.c
@@ -59,8 +59,6 @@ char mce_data_buf[RTAS_ERROR_LOG_MAX]
 /* This is true if we are using the firmware NMI handler (typically LPAR) */
 extern int fwnmi_active;
 
-extern void _exception(int signr, struct pt_regs *regs, int code, unsigned long addr);
-
 static int ras_get_sensor_state_token;
 static int ras_check_exception_token;
 
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..5ac48bd64891 100644
--- a/arch/ppc64/kernel/setup.c
+++ b/arch/ppc64/kernel/setup.c
@@ -1064,8 +1064,6 @@ void __init setup_arch(char **cmdline_p)
 #define PPC64_LINUX_FUNCTION 0x0f000000
 #define PPC64_IPL_MESSAGE 0xc0000000
 #define PPC64_TERM_MESSAGE 0xb0000000
-#define PPC64_ATTN_MESSAGE 0xa0000000
-#define PPC64_DUMP_MESSAGE 0xd0000000
 
 static void ppc64_do_msg(unsigned int src, const char *msg)
 {
@@ -1093,20 +1091,6 @@ void ppc64_terminate_msg(unsigned int src, const char *msg)
         printk("[terminate]%04x %s\n", src, msg);
 }
 
-/* Print something that needs attention (device error, etc) */
-void ppc64_attention_msg(unsigned int src, const char *msg)
-{
-        ppc64_do_msg(PPC64_LINUX_FUNCTION|PPC64_ATTN_MESSAGE|src, msg);
-        printk("[attention]%04x %s\n", src, msg);
-}
-
-/* Print a dump progress message. */
-void ppc64_dump_msg(unsigned int src, const char *msg)
-{
-        ppc64_do_msg(PPC64_LINUX_FUNCTION|PPC64_DUMP_MESSAGE|src, msg);
-        printk("[dump]%04x %s\n", src, msg);
-}
-
 /* This should only be called on processor 0 during calibrate decr */
 void __init setup_default_decr(void)
 {
@@ -1283,7 +1267,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/signal.c b/arch/ppc64/kernel/signal.c
index 49a79a55c32d..347112cca3c0 100644
--- a/arch/ppc64/kernel/signal.c
+++ b/arch/ppc64/kernel/signal.c
@@ -550,6 +550,15 @@ int do_signal(sigset_t *oldset, struct pt_regs *regs)
                 /* Whee!  Actually deliver the signal.  */
                 if (TRAP(regs) == 0x0C00)
                         syscall_restart(regs, &ka);
+
+                /*
+                 * Reenable the DABR before delivering the signal to
+                 * user space. The DABR will have been cleared if it
+                 * triggered inside the kernel.
+                 */
+                if (current->thread.dabr)
+                        set_dabr(current->thread.dabr);
+
                 return handle_signal(signr, &ka, &info, oldset, regs);
         }
 
diff --git a/arch/ppc64/kernel/signal32.c b/arch/ppc64/kernel/signal32.c
index 46f4d6cc7fc9..a8b7a5a56bb4 100644
--- a/arch/ppc64/kernel/signal32.c
+++ b/arch/ppc64/kernel/signal32.c
@@ -970,6 +970,14 @@ int do_signal32(sigset_t *oldset, struct pt_regs *regs)
                 newsp = regs->gpr[1];
         newsp &= ~0xfUL;
 
+        /*
+         * Reenable the DABR before delivering the signal to
+         * user space. The DABR will have been cleared if it
+         * triggered inside the kernel.
+         */
+        if (current->thread.dabr)
+                set_dabr(current->thread.dabr);
+
         /* Whee!  Actually deliver the signal.  */
         if (ka.sa.sa_flags & SA_SIGINFO)
                 ret = handle_rt_signal32(signr, &ka, &info, oldset, regs, newsp);
diff --git a/arch/ppc64/kernel/sys_ppc32.c b/arch/ppc64/kernel/sys_ppc32.c
index 214914a95a50..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);
 }
 
 
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/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/xics.c b/arch/ppc64/kernel/xics.c
index d9dc6f28d050..daf93885dcfa 100644
--- a/arch/ppc64/kernel/xics.c
+++ b/arch/ppc64/kernel/xics.c
@@ -38,7 +38,7 @@ static void xics_mask_and_ack_irq(unsigned int irq);
 static void xics_end_irq(unsigned int irq);
 static void xics_set_affinity(unsigned int irq_nr, cpumask_t cpumask);
 
-struct hw_interrupt_type xics_pic = {
+static struct hw_interrupt_type xics_pic = {
         .typename = " XICS     ",
         .startup = xics_startup,
         .enable = xics_enable_irq,
@@ -48,7 +48,7 @@ struct hw_interrupt_type xics_pic = {
         .set_affinity = xics_set_affinity
 };
 
-struct hw_interrupt_type xics_8259_pic = {
+static struct hw_interrupt_type xics_8259_pic = {
         .typename = " XICS/8259",
         .ack = xics_mask_and_ack_irq,
 };
@@ -89,9 +89,8 @@ static struct xics_ipl __iomem *xics_per_cpu[NR_CPUS];
 static int xics_irq_8259_cascade = 0;
 static int xics_irq_8259_cascade_real = 0;
 static unsigned int default_server = 0xFF;
-/* also referenced in smp.c... */
-unsigned int default_distrib_server = 0;
-unsigned int interrupt_server_size = 8;
+static unsigned int default_distrib_server = 0;
+static unsigned int interrupt_server_size = 8;
 
 /*
  * XICS only has a single IPI, so encode the messages per CPU
@@ -99,10 +98,10 @@ unsigned int interrupt_server_size = 8;
 struct xics_ipi_struct xics_ipi_message[NR_CPUS] __cacheline_aligned;
 
 /* RTAS service tokens */
-int ibm_get_xive;
-int ibm_set_xive;
-int ibm_int_on;
-int ibm_int_off;
+static int ibm_get_xive;
+static int ibm_set_xive;
+static int ibm_int_on;
+static int ibm_int_off;
 
 typedef struct {
         int (*xirr_info_get)(int cpu);
@@ -284,16 +283,17 @@ static void xics_enable_irq(unsigned int virq)
         call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server,
                                 DEFAULT_PRIORITY);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_enable_irq: irq=%d: ibm_set_xive "
-                       "returned %x\n", irq, call_status);
+                printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_set_xive "
+                       "returned %d\n", irq, call_status);
+                printk("set_xive %x, server %x\n", ibm_set_xive, server);
                 return;
         }
 
         /* Now unmask the interrupt (often a no-op) */
         call_status = rtas_call(ibm_int_on, 1, 1, NULL, irq);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_enable_irq: irq=%d: ibm_int_on "
-                       "returned %x\n", irq, call_status);
+                printk(KERN_ERR "xics_enable_irq: irq=%u: ibm_int_on "
+                       "returned %d\n", irq, call_status);
                 return;
         }
 }
@@ -308,8 +308,8 @@ static void xics_disable_real_irq(unsigned int irq)
 
         call_status = rtas_call(ibm_int_off, 1, 1, NULL, irq);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_disable_real_irq: irq=%d: "
-                       "ibm_int_off returned %x\n", irq, call_status);
+                printk(KERN_ERR "xics_disable_real_irq: irq=%u: "
+                       "ibm_int_off returned %d\n", irq, call_status);
                 return;
         }
 
@@ -317,8 +317,8 @@ static void xics_disable_real_irq(unsigned int irq)
         /* Have to set XIVE to 0xff to be able to remove a slot */
         call_status = rtas_call(ibm_set_xive, 3, 1, NULL, irq, server, 0xff);
         if (call_status != 0) {
-                printk(KERN_ERR "xics_disable_irq: irq=%d: ibm_set_xive(0xff)"
-                       " returned %x\n", irq, call_status);
+                printk(KERN_ERR "xics_disable_irq: irq=%u: ibm_set_xive(0xff)"
+                       " returned %d\n", irq, call_status);
                 return;
         }
 }
@@ -380,7 +380,7 @@ int xics_get_irq(struct pt_regs *regs)
                 if (irq == NO_IRQ)
                         irq = real_irq_to_virt_slowpath(vec);
                 if (irq == NO_IRQ) {
-                        printk(KERN_ERR "Interrupt %d (real) is invalid,"
+                        printk(KERN_ERR "Interrupt %u (real) is invalid,"
                                " disabling it.\n", vec);
                         xics_disable_real_irq(vec);
                 } else
@@ -622,7 +622,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
         status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
 
         if (status) {
-                printk(KERN_ERR "xics_set_affinity: irq=%d ibm,get-xive "
+                printk(KERN_ERR "xics_set_affinity: irq=%u ibm,get-xive "
                        "returns %d\n", irq, status);
                 return;
         }
@@ -641,7 +641,7 @@ static void xics_set_affinity(unsigned int virq, cpumask_t cpumask)
                                 irq, newmask, xics_status[1]);
 
         if (status) {
-                printk(KERN_ERR "xics_set_affinity: irq=%d ibm,set-xive "
+                printk(KERN_ERR "xics_set_affinity: irq=%u ibm,set-xive "
                        "returns %d\n", irq, status);
                 return;
         }
@@ -720,7 +720,7 @@ void xics_migrate_irqs_away(void)
 
                 status = rtas_call(ibm_get_xive, 1, 3, xics_status, irq);
                 if (status) {
-                        printk(KERN_ERR "migrate_irqs_away: irq=%d "
+                        printk(KERN_ERR "migrate_irqs_away: irq=%u "
                                         "ibm,get-xive returns %d\n",
                                         virq, status);
                         goto unlock;
@@ -734,7 +734,7 @@ void xics_migrate_irqs_away(void)
                 if (xics_status[0] != get_hard_smp_processor_id(cpu))
                         goto unlock;
 
-                printk(KERN_WARNING "IRQ %d affinity broken off cpu %u\n",
+                printk(KERN_WARNING "IRQ %u affinity broken off cpu %u\n",
                        virq, cpu);
 
                 /* Reset affinity to all cpus */
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 772f0714a5b7..7fbc68bbb739 100644
--- a/arch/ppc64/mm/fault.c
+++ b/arch/ppc64/mm/fault.c
@@ -77,6 +77,28 @@ static int store_updates_sp(struct pt_regs *regs)
         return 0;
 }
 
+static void do_dabr(struct pt_regs *regs, unsigned long error_code)
+{
+        siginfo_t info;
+
+        if (notify_die(DIE_DABR_MATCH, "dabr_match", regs, error_code,
+                        11, SIGSEGV) == NOTIFY_STOP)
+                return;
+
+        if (debugger_dabr_match(regs))
+                return;
+
+        /* Clear the DABR */
+        set_dabr(0);
+
+        /* Deliver the signal to userspace */
+        info.si_signo = SIGTRAP;
+        info.si_errno = 0;
+        info.si_code = TRAP_HWBKPT;
+        info.si_addr = (void __user *)regs->nip;
+        force_sig_info(SIGTRAP, &info, current);
+}
+
 /*
  * The error_code parameter is
  *  - DSISR for a non-SLB data access fault,
@@ -111,12 +133,9 @@ int __kprobes do_page_fault(struct pt_regs *regs, unsigned long address,
         if (!user_mode(regs) && (address >= TASK_SIZE))
                 return SIGSEGV;
 
-        if (error_code & DSISR_DABRMATCH) {
-                if (notify_die(DIE_DABR_MATCH, "dabr_match", regs, error_code,
-                                        11, SIGSEGV) == NOTIFY_STOP)
-                        return 0;
-                if (debugger_dabr_match(regs))
-                        return 0;
+        if (error_code & DSISR_DABRMATCH) {
+                do_dabr(regs, error_code);
+                return 0;
         }
 
         if (in_atomic() || mm == NULL) {
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/ppc64/xmon/privinst.h b/arch/ppc64/xmon/privinst.h
index 183c3e400258..02eb40dac0b3 100644
--- a/arch/ppc64/xmon/privinst.h
+++ b/arch/ppc64/xmon/privinst.h
@@ -46,7 +46,6 @@ GSETSPR(287, pvr)
 GSETSPR(1008, hid0)
 GSETSPR(1009, hid1)
 GSETSPR(1010, iabr)
-GSETSPR(1013, dabr)
 GSETSPR(1023, pir)
 
 static inline void store_inst(void *p)
diff --git a/arch/ppc64/xmon/xmon.c b/arch/ppc64/xmon/xmon.c
index 45908b10acd3..74e63a886a69 100644
--- a/arch/ppc64/xmon/xmon.c
+++ b/arch/ppc64/xmon/xmon.c
@@ -586,6 +586,8 @@ int xmon_dabr_match(struct pt_regs *regs)
 {
         if ((regs->msr & (MSR_IR|MSR_PR|MSR_SF)) != (MSR_IR|MSR_SF))
                 return 0;
+        if (dabr.enabled == 0)
+                return 0;
         xmon_core(regs, 0);
         return 1;
 }
@@ -628,20 +630,6 @@ int xmon_fault_handler(struct pt_regs *regs)
         return 0;
 }
 
-/* On systems with a hypervisor, we can't set the DABR
-   (data address breakpoint register) directly. */
-static void set_controlled_dabr(unsigned long val)
-{
-#ifdef CONFIG_PPC_PSERIES
-        if (systemcfg->platform == PLATFORM_PSERIES_LPAR) {
-                int rc = plpar_hcall_norets(H_SET_DABR, val);
-                if (rc != H_Success)
-                        xmon_printf("Warning: setting DABR failed (%d)\n", rc);
-        } else
-#endif
-                set_dabr(val);
-}
-
 static struct bpt *at_breakpoint(unsigned long pc)
 {
         int i;
@@ -728,7 +716,7 @@ static void insert_bpts(void)
 static void insert_cpu_bpts(void)
 {
         if (dabr.enabled)
-                set_controlled_dabr(dabr.address | (dabr.enabled & 7));
+                set_dabr(dabr.address | (dabr.enabled & 7));
         if (iabr && cpu_has_feature(CPU_FTR_IABR))
                 set_iabr(iabr->address
                          | (iabr->enabled & (BP_IABR|BP_IABR_TE)));
@@ -756,7 +744,7 @@ static void remove_bpts(void)
 
 static void remove_cpu_bpts(void)
 {
-        set_controlled_dabr(0);
+        set_dabr(0);
         if (cpu_has_feature(CPU_FTR_IABR))
                 set_iabr(0);
 }
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/compat_linux.c b/arch/s390/kernel/compat_linux.c
index 18610cea03a2..ed877d0f27e6 100644
--- a/arch/s390/kernel/compat_linux.c
+++ b/arch/s390/kernel/compat_linux.c
@@ -678,7 +678,7 @@ asmlinkage long sys32_sendfile(int out_fd, int in_fd, compat_off_t *offset, size
         ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
         set_fs(old_fs);
         
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
                 
         return ret;
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/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/Makefile b/arch/sh/Makefile
index b5635635b5ee..4a3049080b41 100644
--- a/arch/sh/Makefile
+++ b/arch/sh/Makefile
@@ -152,10 +152,10 @@ endif
         @touch $@
 
 
-prepare: maketools include/asm-sh/.cpu include/asm-sh/.mach
+archprepare: 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/sh64/Makefile b/arch/sh64/Makefile
index b4fd8e13fea9..8ca57ffa2b70 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)
+archprepare: 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/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/module.c b/arch/sparc/kernel/module.c
index 7931d6f92819..787d5f1347ec 100644
--- a/arch/sparc/kernel/module.c
+++ b/arch/sparc/kernel/module.c
@@ -10,6 +10,7 @@
 #include <linux/vmalloc.h>
 #include <linux/fs.h>
 #include <linux/string.h>
+#include <linux/ctype.h>
 
 void *module_alloc(unsigned long size)
 {
@@ -37,7 +38,7 @@ void module_free(struct module *mod, void *module_region)
 }
 
 /* Make generic code ignore STT_REGISTER dummy undefined symbols,
- * and replace references to .func with func as in ppc64's dedotify.
+ * and replace references to .func with _Func
  */
 int module_frob_arch_sections(Elf_Ehdr *hdr,
                               Elf_Shdr *sechdrs,
@@ -64,8 +65,10 @@ int module_frob_arch_sections(Elf_Ehdr *hdr,
                                 sym[i].st_shndx = SHN_ABS;
                         else {
                                 char *name = strtab + sym[i].st_name;
-                                if (name[0] == '.')
-                                        memmove(name, name+1, strlen(name));
+                                if (name[0] == '.') {
+                                        name[0] = '_';
+                                        name[1] = toupper(name[1]);
+                                }
                         }
                 }
         }
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..1c8fd0fd9305 100644
--- a/arch/sparc/kernel/sparc_ksyms.c
+++ b/arch/sparc/kernel/sparc_ksyms.c
@@ -97,34 +97,17 @@ extern void ___rw_write_enter(void);
 /* Alias functions whose names begin with "." and export the aliases.
  * The module references will be fixed up by module_frob_arch_sections.
  */
-#define DOT_ALIAS2(__ret, __x, __arg1, __arg2) \
-        extern __ret __x(__arg1, __arg2); \
-        asm(".weak " #__x);\
-        asm(#__x "=." #__x);
-
-DOT_ALIAS2(int, div, int, int)
-DOT_ALIAS2(int, mul, int, int)
-DOT_ALIAS2(int, rem, int, int)
-DOT_ALIAS2(unsigned, udiv, unsigned, unsigned)
-DOT_ALIAS2(unsigned, umul, unsigned, unsigned)
-DOT_ALIAS2(unsigned, urem, unsigned, unsigned)
-
-#undef DOT_ALIAS2
+extern int _Div(int, int);
+extern int _Mul(int, int);
+extern int _Rem(int, int);
+extern unsigned _Udiv(unsigned, unsigned);
+extern unsigned _Umul(unsigned, unsigned);
+extern 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);
@@ -330,12 +313,12 @@ EXPORT_SYMBOL(__lshrdi3);
 EXPORT_SYMBOL(__muldi3);
 EXPORT_SYMBOL(__divdi3);
 
-EXPORT_SYMBOL(rem);
-EXPORT_SYMBOL(urem);
-EXPORT_SYMBOL(mul);
-EXPORT_SYMBOL(umul);
-EXPORT_SYMBOL(div);
-EXPORT_SYMBOL(udiv);
+EXPORT_SYMBOL(_Rem);
+EXPORT_SYMBOL(_Urem);
+EXPORT_SYMBOL(_Mul);
+EXPORT_SYMBOL(_Umul);
+EXPORT_SYMBOL(_Div);
+EXPORT_SYMBOL(_Udiv);
 
 #ifdef CONFIG_DEBUG_BUGVERBOSE
 EXPORT_SYMBOL(do_BUG);
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/lib/mul.S b/arch/sparc/lib/mul.S
index 83dffbc2f62f..da693560d878 100644
--- a/arch/sparc/lib/mul.S
+++ b/arch/sparc/lib/mul.S
@@ -16,7 +16,9 @@
  */
 
         .globl .mul
+        .globl _Mul
 .mul:
+_Mul:   /* needed for export */
         mov     %o0, %y         ! multiplier -> Y
         andncc  %o0, 0xfff, %g0 ! test bits 12..31
         be      Lmul_shortway   ! if zero, can do it the short way
diff --git a/arch/sparc/lib/rem.S b/arch/sparc/lib/rem.S
index 44508148d055..bf015a90d07e 100644
--- a/arch/sparc/lib/rem.S
+++ b/arch/sparc/lib/rem.S
@@ -43,7 +43,9 @@
 
 
         .globl .rem
+        .globl _Rem
 .rem:
+_Rem:   /* needed for export */
         ! compute sign of result; if neither is negative, no problem
         orcc    %o1, %o0, %g0   ! either negative?
         bge     2f                      ! no, go do the divide
diff --git a/arch/sparc/lib/sdiv.S b/arch/sparc/lib/sdiv.S
index e0ad80b6f63d..af9451629d0b 100644
--- a/arch/sparc/lib/sdiv.S
+++ b/arch/sparc/lib/sdiv.S
@@ -43,7 +43,9 @@
 
 
         .globl .div
+        .globl _Div
 .div:
+_Div:   /* needed for export */
         ! compute sign of result; if neither is negative, no problem
         orcc    %o1, %o0, %g0   ! either negative?
         bge     2f                      ! no, go do the divide
diff --git a/arch/sparc/lib/udiv.S b/arch/sparc/lib/udiv.S
index 2abfc6b0f3e9..169e01da6715 100644
--- a/arch/sparc/lib/udiv.S
+++ b/arch/sparc/lib/udiv.S
@@ -43,7 +43,9 @@
 
 
         .globl .udiv
+        .globl _Udiv
 .udiv:
+_Udiv:  /* needed for export */
 
         ! Ready to divide.  Compute size of quotient; scale comparand.
         orcc    %o1, %g0, %o5
diff --git a/arch/sparc/lib/umul.S b/arch/sparc/lib/umul.S
index a784720a8a22..f0e5b20a2536 100644
--- a/arch/sparc/lib/umul.S
+++ b/arch/sparc/lib/umul.S
@@ -21,7 +21,9 @@
  */
 
         .globl .umul
+        .globl _Umul
 .umul:
+_Umul:  /* needed for export */
         or      %o0, %o1, %o4
         mov     %o0, %y         ! multiplier -> Y
 
diff --git a/arch/sparc/lib/urem.S b/arch/sparc/lib/urem.S
index ec7f0c502c56..6b92bdc8b04c 100644
--- a/arch/sparc/lib/urem.S
+++ b/arch/sparc/lib/urem.S
@@ -41,7 +41,9 @@
  */
 
         .globl .urem
+        .globl _Urem
 .urem:
+_Urem:  /* needed for export */
 
         ! Ready to divide.  Compute size of quotient; scale comparand.
         orcc    %o1, %g0, %o5
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/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/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/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/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..ce987266dac6 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -103,12 +103,11 @@ 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
 
-prepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
+archprepare: $(ARCH_SYMLINKS) $(SYS_HEADERS) $(GEN_HEADERS)
 
 LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
 LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
@@ -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-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/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/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/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/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/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/x86_64/Kconfig b/arch/x86_64/Kconfig
index 8f868b67ef0f..e63323e03ea9 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -152,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
@@ -474,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/Makefile b/arch/x86_64/boot/Makefile
index f4399c701b77..18c6e915d69b 100644
--- a/arch/x86_64/boot/Makefile
+++ b/arch/x86_64/boot/Makefile
@@ -46,7 +46,7 @@ cmd_image = $(obj)/tools/build $(BUILDFLAGS) $(obj)/bootsect $(obj)/setup \
 $(obj)/bzImage: $(obj)/bootsect $(obj)/setup \
                               $(obj)/vmlinux.bin $(obj)/tools/build FORCE
         $(call if_changed,image)
-        @echo 'Kernel: $@ is ready'
+        @echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
 
 $(obj)/vmlinux.bin: $(obj)/compressed/vmlinux FORCE
         $(call if_changed,objcopy)
diff --git a/arch/x86_64/boot/compressed/misc.c b/arch/x86_64/boot/compressed/misc.c
index b38d5b8b5fb8..0e10fd84c7cc 100644
--- a/arch/x86_64/boot/compressed/misc.c
+++ b/arch/x86_64/boot/compressed/misc.c
@@ -83,7 +83,7 @@ static unsigned char *real_mode; /* Pointer to real-mode data */
 #endif
 #define SCREEN_INFO (*(struct screen_info *)(real_mode+0))
 
-extern char input_data[];
+extern unsigned char input_data[];
 extern int input_len;
 
 static long bytes_out = 0;
@@ -288,7 +288,7 @@ void setup_normal_output_buffer(void)
 #else
         if ((ALT_MEM_K > EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) < 1024) error("Less than 2MB of memory");
 #endif
-        output_data = (char *)__PHYSICAL_START; /* Normally Points to 1M */
+        output_data = (unsigned char *)__PHYSICAL_START; /* Normally Points to 1M */
         free_mem_end_ptr = (long)real_mode;
 }
 
@@ -305,7 +305,7 @@ void setup_output_buffer_if_we_run_high(struct moveparams *mv)
 #else
         if ((ALT_MEM_K > EXT_MEM_K ? ALT_MEM_K : EXT_MEM_K) < (3*1024)) error("Less than 4MB of memory");
 #endif  
-        mv->low_buffer_start = output_data = (char *)LOW_BUFFER_START;
+        mv->low_buffer_start = output_data = (unsigned char *)LOW_BUFFER_START;
         low_buffer_end = ((unsigned int)real_mode > LOW_BUFFER_MAX
           ? LOW_BUFFER_MAX : (unsigned int)real_mode) & ~0xfff;
         low_buffer_size = low_buffer_end - LOW_BUFFER_START;
diff --git a/arch/x86_64/defconfig b/arch/x86_64/defconfig
index b97a61e1c71c..f8db7e500fbf 100644
--- a/arch/x86_64/defconfig
+++ b/arch/x86_64/defconfig
@@ -1,11 +1,12 @@
 #
 # Automatically generated make config: don't edit
-# Linux kernel version: 2.6.13-rc6-git3
-# Fri Aug 12 16:40:34 2005
+# Linux kernel version: 2.6.13-git11
+# Mon Sep 12 16:16:16 2005
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
 CONFIG_X86=y
+CONFIG_SEMAPHORE_SLEEPERS=y
 CONFIG_MMU=y
 CONFIG_RWSEM_GENERIC_SPINLOCK=y
 CONFIG_GENERIC_CALIBRATE_DELAY=y
@@ -13,6 +14,7 @@ CONFIG_X86_CMPXCHG=y
 CONFIG_EARLY_PRINTK=y
 CONFIG_GENERIC_ISA_DMA=y
 CONFIG_GENERIC_IOMAP=y
+CONFIG_ARCH_MAY_HAVE_PC_FDC=y
 
 #
 # Code maturity level options
@@ -26,6 +28,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32
 # General setup
 #
 CONFIG_LOCALVERSION=""
+CONFIG_LOCALVERSION_AUTO=y
 CONFIG_SWAP=y
 CONFIG_SYSVIPC=y
 CONFIG_POSIX_MQUEUE=y
@@ -37,6 +40,7 @@ CONFIG_KOBJECT_UEVENT=y
 CONFIG_IKCONFIG=y
 CONFIG_IKCONFIG_PROC=y
 # CONFIG_CPUSETS is not set
+CONFIG_INITRAMFS_SOURCE=""
 # CONFIG_EMBEDDED is not set
 CONFIG_KALLSYMS=y
 CONFIG_KALLSYMS_ALL=y
@@ -102,6 +106,7 @@ CONFIG_DISCONTIGMEM_MANUAL=y
 CONFIG_DISCONTIGMEM=y
 CONFIG_FLAT_NODE_MEM_MAP=y
 CONFIG_NEED_MULTIPLE_NODES=y
+# CONFIG_SPARSEMEM_STATIC is not set
 CONFIG_HAVE_ARCH_EARLY_PFN_TO_NID=y
 CONFIG_HAVE_DEC_LOCK=y
 CONFIG_NR_CPUS=32
@@ -122,6 +127,7 @@ CONFIG_HZ=250
 CONFIG_GENERIC_HARDIRQS=y
 CONFIG_GENERIC_IRQ_PROBE=y
 CONFIG_ISA_DMA_API=y
+CONFIG_GENERIC_PENDING_IRQ=y
 
 #
 # Power management options
@@ -135,8 +141,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 +155,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
 
@@ -198,7 +200,6 @@ CONFIG_UNORDERED_IO=y
 # CONFIG_PCIEPORTBUS is not set
 CONFIG_PCI_MSI=y
 # CONFIG_PCI_LEGACY_PROC is not set
-# CONFIG_PCI_NAMES is not set
 # CONFIG_PCI_DEBUG is not set
 
 #
@@ -238,7 +239,10 @@ CONFIG_INET=y
 CONFIG_IP_MULTICAST=y
 # CONFIG_IP_ADVANCED_ROUTER is not set
 CONFIG_IP_FIB_HASH=y
-# CONFIG_IP_PNP is not set
+CONFIG_IP_PNP=y
+CONFIG_IP_PNP_DHCP=y
+# CONFIG_IP_PNP_BOOTP is not set
+# CONFIG_IP_PNP_RARP is not set
 # CONFIG_NET_IPIP is not set
 # CONFIG_NET_IPGRE is not set
 # CONFIG_IP_MROUTE is not set
@@ -248,8 +252,8 @@ CONFIG_IP_FIB_HASH=y
 # 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=y
+CONFIG_INET_DIAG=y
+CONFIG_INET_TCP_DIAG=y
 # CONFIG_TCP_CONG_ADVANCED is not set
 CONFIG_TCP_CONG_BIC=y
 CONFIG_IPV6=y
@@ -262,6 +266,11 @@ CONFIG_IPV6=y
 # CONFIG_NETFILTER is not set
 
 #
+# DCCP Configuration (EXPERIMENTAL)
+#
+# CONFIG_IP_DCCP is not set
+
+#
 # SCTP Configuration (EXPERIMENTAL)
 #
 # CONFIG_IP_SCTP is not set
@@ -284,9 +293,11 @@ CONFIG_IPV6=y
 # 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
@@ -333,7 +344,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_LBD=y
 # CONFIG_CDROM_PKTCDVD is not set
 
@@ -413,6 +423,7 @@ CONFIG_IDEDMA_AUTO=y
 #
 # SCSI device support
 #
+# CONFIG_RAID_ATTRS is not set
 CONFIG_SCSI=y
 # CONFIG_SCSI_PROC_FS is not set
 
@@ -436,7 +447,7 @@ CONFIG_BLK_DEV_SD=y
 #
 # SCSI Transport Attributes
 #
-# CONFIG_SCSI_SPI_ATTRS is not set
+CONFIG_SCSI_SPI_ATTRS=y
 # CONFIG_SCSI_FC_ATTRS is not set
 # CONFIG_SCSI_ISCSI_ATTRS is not set
 
@@ -462,6 +473,7 @@ CONFIG_SCSI_SATA=y
 # CONFIG_SCSI_SATA_AHCI is not set
 # CONFIG_SCSI_SATA_SVW is not set
 CONFIG_SCSI_ATA_PIIX=y
+# CONFIG_SCSI_SATA_MV is not set
 # CONFIG_SCSI_SATA_NV is not set
 # CONFIG_SCSI_SATA_PROMISE is not set
 # CONFIG_SCSI_SATA_QSTOR is not set
@@ -541,6 +553,11 @@ CONFIG_TUN=y
 # CONFIG_ARCNET is not set
 
 #
+# PHY device support
+#
+# CONFIG_PHYLIB is not set
+
+#
 # Ethernet (10 or 100Mbit)
 #
 CONFIG_NET_ETHERNET=y
@@ -590,6 +607,7 @@ CONFIG_E1000=y
 # CONFIG_HAMACHI is not set
 # CONFIG_YELLOWFIN is not set
 # CONFIG_R8169 is not set
+# CONFIG_SIS190 is not set
 # CONFIG_SKGE is not set
 # CONFIG_SK98LIN is not set
 # CONFIG_VIA_VELOCITY is not set
@@ -599,6 +617,7 @@ CONFIG_TIGON3=y
 #
 # Ethernet (10000 Mbit)
 #
+# CONFIG_CHELSIO_T1 is not set
 # CONFIG_IXGB is not set
 CONFIG_S2IO=m
 # CONFIG_S2IO_NAPI is not set
@@ -753,7 +772,6 @@ CONFIG_MAX_RAW_DEVS=256
 # I2C support
 #
 # CONFIG_I2C is not set
-# CONFIG_I2C_SENSOR is not set
 
 #
 # Dallas's 1-wire bus
@@ -764,6 +782,7 @@ CONFIG_MAX_RAW_DEVS=256
 # Hardware Monitoring support
 #
 CONFIG_HWMON=y
+# CONFIG_HWMON_VID is not set
 # CONFIG_HWMON_DEBUG_CHIP is not set
 
 #
@@ -772,6 +791,10 @@ CONFIG_HWMON=y
 # CONFIG_IBM_ASM is not set
 
 #
+# Multimedia Capabilities Port drivers
+#
+
+#
 # Multimedia devices
 #
 # CONFIG_VIDEO_DEV is not set
@@ -862,9 +885,8 @@ CONFIG_USB_UHCI_HCD=y
 #
 # USB Device Class drivers
 #
-# CONFIG_USB_AUDIO is not set
+# CONFIG_OBSOLETE_OSS_USB_DRIVER is not set
 # CONFIG_USB_BLUETOOTH_TTY is not set
-# CONFIG_USB_MIDI is not set
 # CONFIG_USB_ACM is not set
 CONFIG_USB_PRINTER=y
 
@@ -881,6 +903,7 @@ CONFIG_USB_STORAGE=y
 # CONFIG_USB_STORAGE_SDDR09 is not set
 # CONFIG_USB_STORAGE_SDDR55 is not set
 # CONFIG_USB_STORAGE_JUMPSHOT is not set
+# CONFIG_USB_STORAGE_ONETOUCH is not set
 
 #
 # USB Input Devices
@@ -897,6 +920,7 @@ CONFIG_USB_HIDINPUT=y
 # 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
@@ -980,6 +1004,8 @@ CONFIG_USB_MON=y
 # Firmware Drivers
 #
 # CONFIG_EDD is not set
+# CONFIG_DELL_RBU is not set
+CONFIG_DCDBAS=m
 
 #
 # File systems
@@ -1004,10 +1030,6 @@ CONFIG_REISERFS_FS_POSIX_ACL=y
 # CONFIG_REISERFS_FS_SECURITY is not set
 # CONFIG_JFS_FS is not set
 CONFIG_FS_POSIX_ACL=y
-
-#
-# XFS support
-#
 # CONFIG_XFS_FS is not set
 # CONFIG_MINIX_FS is not set
 # CONFIG_ROMFS_FS is not set
@@ -1016,6 +1038,7 @@ CONFIG_INOTIFY=y
 CONFIG_DNOTIFY=y
 CONFIG_AUTOFS_FS=y
 # CONFIG_AUTOFS4_FS is not set
+# CONFIG_FUSE_FS is not set
 
 #
 # CD-ROM/DVD Filesystems
@@ -1041,12 +1064,11 @@ CONFIG_FAT_DEFAULT_IOCHARSET="iso8859-1"
 CONFIG_PROC_FS=y
 CONFIG_PROC_KCORE=y
 CONFIG_SYSFS=y
-# CONFIG_DEVPTS_FS_XATTR is not set
 CONFIG_TMPFS=y
-# CONFIG_TMPFS_XATTR is not set
 CONFIG_HUGETLBFS=y
 CONFIG_HUGETLB_PAGE=y
 CONFIG_RAMFS=y
+# CONFIG_RELAYFS_FS is not set
 
 #
 # Miscellaneous filesystems
@@ -1078,6 +1100,7 @@ CONFIG_NFSD_V3=y
 # CONFIG_NFSD_V3_ACL is not set
 # CONFIG_NFSD_V4 is not set
 CONFIG_NFSD_TCP=y
+CONFIG_ROOT_NFS=y
 CONFIG_LOCKD=y
 CONFIG_LOCKD_V4=y
 CONFIG_EXPORTFS=y
@@ -1090,6 +1113,7 @@ CONFIG_SUNRPC=y
 # 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
@@ -1154,6 +1178,7 @@ CONFIG_OPROFILE=y
 CONFIG_DEBUG_KERNEL=y
 CONFIG_MAGIC_SYSRQ=y
 CONFIG_LOG_BUF_SHIFT=18
+CONFIG_DETECT_SOFTLOCKUP=y
 # CONFIG_SCHEDSTATS is not set
 # CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_SPINLOCK is not set
@@ -1161,6 +1186,7 @@ CONFIG_LOG_BUF_SHIFT=18
 # CONFIG_DEBUG_KOBJECT is not set
 # CONFIG_DEBUG_INFO is not set
 CONFIG_DEBUG_FS=y
+# CONFIG_FRAME_POINTER is not set
 CONFIG_INIT_DEBUG=y
 # CONFIG_IOMMU_DEBUG is not set
 CONFIG_KPROBES=y
@@ -1184,5 +1210,6 @@ CONFIG_KPROBES=y
 # Library routines
 #
 # CONFIG_CRC_CCITT is not set
+# CONFIG_CRC16 is not set
 CONFIG_CRC32=y
 # CONFIG_LIBCRC32C 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 f174083d5567..e0eb0c712fe9 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>    
@@ -55,20 +55,34 @@
  * with the int 0x80 path.
  */     
 ENTRY(ia32_sysenter_target)
-        CFI_STARTPROC
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,0
+        CFI_REGISTER    rsp,rbp
         swapgs
         movq    %gs:pda_kernelstack, %rsp
         addq    $(PDA_STACKOFFSET),%rsp 
         sti     
         movl    %ebp,%ebp               /* zero extension */
         pushq   $__USER32_DS
+        CFI_ADJUST_CFA_OFFSET 8
+        /*CFI_REL_OFFSET ss,0*/
         pushq   %rbp
+        CFI_ADJUST_CFA_OFFSET 8
+        CFI_REL_OFFSET rsp,0
         pushfq
+        CFI_ADJUST_CFA_OFFSET 8
+        /*CFI_REL_OFFSET rflags,0*/
         movl    $VSYSCALL32_SYSEXIT, %r10d
+        CFI_REGISTER rip,r10
         pushq   $__USER32_CS
+        CFI_ADJUST_CFA_OFFSET 8
+        /*CFI_REL_OFFSET cs,0*/
         movl    %eax, %eax
         pushq   %r10
+        CFI_ADJUST_CFA_OFFSET 8
+        CFI_REL_OFFSET rip,0
         pushq   %rax
+        CFI_ADJUST_CFA_OFFSET 8
         cld
         SAVE_ARGS 0,0,1
         /* no need to do an access_ok check here because rbp has been
@@ -79,6 +93,7 @@ ENTRY(ia32_sysenter_target)
         .previous       
         GET_THREAD_INFO(%r10)
         testl  $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
+        CFI_REMEMBER_STATE
         jnz  sysenter_tracesys
 sysenter_do_call:       
         cmpl    $(IA32_NR_syscalls),%eax
@@ -94,14 +109,20 @@ sysenter_do_call:
         andl  $~0x200,EFLAGS-R11(%rsp) 
         RESTORE_ARGS 1,24,1,1,1,1
         popfq
+        CFI_ADJUST_CFA_OFFSET -8
+        /*CFI_RESTORE rflags*/
         popq    %rcx                            /* User %esp */
+        CFI_ADJUST_CFA_OFFSET -8
+        CFI_REGISTER rsp,rcx
         movl    $VSYSCALL32_SYSEXIT,%edx        /* User %eip */
+        CFI_REGISTER rip,rdx
         swapgs
         sti             /* sti only takes effect after the next instruction */
         /* sysexit */
         .byte   0xf, 0x35
 
 sysenter_tracesys:
+        CFI_RESTORE_STATE
         SAVE_REST
         CLEAR_RREGS
         movq    $-ENOSYS,RAX(%rsp)      /* really needed? */
@@ -140,21 +161,28 @@ sysenter_tracesys:
  * with the int 0x80 path.      
  */     
 ENTRY(ia32_cstar_target)
-        CFI_STARTPROC
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,0
+        CFI_REGISTER    rip,rcx
+        /*CFI_REGISTER  rflags,r11*/
         swapgs
         movl    %esp,%r8d
+        CFI_REGISTER    rsp,r8
         movq    %gs:pda_kernelstack,%rsp
         sti
         SAVE_ARGS 8,1,1
         movl    %eax,%eax       /* zero extension */
         movq    %rax,ORIG_RAX-ARGOFFSET(%rsp)
         movq    %rcx,RIP-ARGOFFSET(%rsp)
+        CFI_REL_OFFSET rip,RIP-ARGOFFSET
         movq    %rbp,RCX-ARGOFFSET(%rsp) /* this lies slightly to ptrace */
         movl    %ebp,%ecx
         movq    $__USER32_CS,CS-ARGOFFSET(%rsp)
         movq    $__USER32_DS,SS-ARGOFFSET(%rsp)
         movq    %r11,EFLAGS-ARGOFFSET(%rsp)
+        /*CFI_REL_OFFSET rflags,EFLAGS-ARGOFFSET*/
         movq    %r8,RSP-ARGOFFSET(%rsp) 
+        CFI_REL_OFFSET rsp,RSP-ARGOFFSET
         /* no need to do an access_ok check here because r8 has been
            32bit zero extended */ 
         /* hardware stack frame is complete now */      
@@ -164,6 +192,7 @@ ENTRY(ia32_cstar_target)
         .previous       
         GET_THREAD_INFO(%r10)
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%r10)
+        CFI_REMEMBER_STATE
         jnz   cstar_tracesys
 cstar_do_call:  
         cmpl $IA32_NR_syscalls,%eax
@@ -177,12 +206,16 @@ cstar_do_call:
         jnz  int_ret_from_sys_call
         RESTORE_ARGS 1,-ARG_SKIP,1,1,1
         movl RIP-ARGOFFSET(%rsp),%ecx
+        CFI_REGISTER rip,rcx
         movl EFLAGS-ARGOFFSET(%rsp),%r11d       
+        /*CFI_REGISTER rflags,r11*/
         movl RSP-ARGOFFSET(%rsp),%esp
+        CFI_RESTORE rsp
         swapgs
         sysretl
         
 cstar_tracesys: 
+        CFI_RESTORE_STATE
         SAVE_REST
         CLEAR_RREGS
         movq $-ENOSYS,RAX(%rsp) /* really needed? */
@@ -226,11 +259,18 @@ ia32_badarg:
  */                             
 
 ENTRY(ia32_syscall)
-        CFI_STARTPROC
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,SS+8-RIP
+        /*CFI_REL_OFFSET        ss,SS-RIP*/
+        CFI_REL_OFFSET  rsp,RSP-RIP
+        /*CFI_REL_OFFSET        rflags,EFLAGS-RIP*/
+        /*CFI_REL_OFFSET        cs,CS-RIP*/
+        CFI_REL_OFFSET  rip,RIP-RIP
         swapgs  
         sti
         movl %eax,%eax
         pushq %rax
+        CFI_ADJUST_CFA_OFFSET 8
         cld
         /* note the registers are not zero extended to the sf.
            this could be a problem. */
@@ -278,6 +318,8 @@ quiet_ni_syscall:
         jmp  ia32_ptregs_common 
         .endm
 
+        CFI_STARTPROC
+
         PTREGSCALL stub32_rt_sigreturn, sys32_rt_sigreturn, %rdi
         PTREGSCALL stub32_sigreturn, sys32_sigreturn, %rdi
         PTREGSCALL stub32_sigaltstack, sys32_sigaltstack, %rdx
@@ -290,8 +332,9 @@ quiet_ni_syscall:
         PTREGSCALL stub32_rt_sigsuspend, sys_rt_sigsuspend, %rdx
 
 ENTRY(ia32_ptregs_common)
-        CFI_STARTPROC
         popq %r11
+        CFI_ADJUST_CFA_OFFSET -8
+        CFI_REGISTER rip, r11
         SAVE_REST
         call *%rax
         RESTORE_REST
diff --git a/arch/x86_64/ia32/sys_ia32.c b/arch/x86_64/ia32/sys_ia32.c
index 04d80406ce4f..5389df610e78 100644
--- a/arch/x86_64/ia32/sys_ia32.c
+++ b/arch/x86_64/ia32/sys_ia32.c
@@ -751,7 +751,7 @@ sys32_sendfile(int out_fd, int in_fd, compat_off_t __user *offset, s32 count)
         ret = sys_sendfile(out_fd, in_fd, offset ? &of : NULL, count);
         set_fs(old_fs);
         
-        if (!ret && offset && put_user(of, offset))
+        if (offset && put_user(of, offset))
                 return -EFAULT;
                 
         return ret;
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..bcdd0a805fe7 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
@@ -46,3 +46,4 @@ microcode-$(subst m,y,$(CONFIG_MICROCODE))  += ../../i386/kernel/microcode.o
 intel_cacheinfo-y               += ../../i386/kernel/cpu/intel_cacheinfo.o
 quirks-y                        += ../../i386/kernel/quirks.o
 i8237-y                         += ../../i386/kernel/i8237.o
+msr-$(subst m,y,$(CONFIG_X86_MSR))  += ../../i386/kernel/msr.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..867a0ebee177 100644
--- a/arch/x86_64/kernel/acpi/sleep.c
+++ b/arch/x86_64/kernel/acpi/sleep.c
@@ -34,7 +34,6 @@
 #include <linux/slab.h>
 #include <linux/pci.h>
 #include <linux/bootmem.h>
-#include <linux/irq.h>
 #include <linux/acpi.h>
 #include <asm/mpspec.h>
 #include <asm/io.h>
@@ -47,7 +46,6 @@
 #include <asm/proto.h>
 #include <asm/tlbflush.h>
 
-
 /* --------------------------------------------------------------------------
                               Low-Level Sleep Support
    -------------------------------------------------------------------------- */
@@ -77,11 +75,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 +89,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 +107,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 +127,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/aperture.c b/arch/x86_64/kernel/aperture.c
index c9a6b812e926..962ad4823b6a 100644
--- a/arch/x86_64/kernel/aperture.c
+++ b/arch/x86_64/kernel/aperture.c
@@ -245,6 +245,8 @@ void __init iommu_hole_init(void)
                 
         if (aper_alloc) { 
                 /* Got the aperture from the AGP bridge */
+        } else if (swiotlb && !valid_agp) {
+                /* Do nothing */
         } else if ((!no_iommu && end_pfn >= 0xffffffff>>PAGE_SHIFT) ||
                    force_iommu ||
                    valid_agp ||
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c
index 375d369570ca..b6e7715d877f 100644
--- a/arch/x86_64/kernel/apic.c
+++ b/arch/x86_64/kernel/apic.c
@@ -18,7 +18,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
@@ -109,11 +108,8 @@ void clear_local_APIC(void)
         if (maxlvt >= 4)
                 apic_write_around(APIC_LVTPC, APIC_LVT_MASKED);
         v = GET_APIC_VERSION(apic_read(APIC_LVR));
-        if (APIC_INTEGRATED(v)) {       /* !82489DX */
-                if (maxlvt > 3)         /* Due to Pentium errata 3AP and 11AP. */
-                        apic_write(APIC_ESR, 0);
-                apic_read(APIC_ESR);
-        }
+        apic_write(APIC_ESR, 0);
+        apic_read(APIC_ESR);
 }
 
 void __init connect_bsp_APIC(void)
@@ -316,8 +312,6 @@ void __init init_bsp_APIC(void)
          */
         apic_write_around(APIC_LVT0, APIC_DM_EXTINT);
         value = APIC_DM_NMI;
-        if (!APIC_INTEGRATED(ver))              /* 82489DX */
-                value |= APIC_LVT_LEVEL_TRIGGER;
         apic_write_around(APIC_LVT1, value);
 }
 
@@ -325,14 +319,6 @@ void __cpuinit setup_local_APIC (void)
 {
         unsigned int value, ver, maxlvt;
 
-        /* Pound the ESR really hard over the head with a big hammer - mbligh */
-        if (esr_disable) {
-                apic_write(APIC_ESR, 0);
-                apic_write(APIC_ESR, 0);
-                apic_write(APIC_ESR, 0);
-                apic_write(APIC_ESR, 0);
-        }
-
         value = apic_read(APIC_LVR);
         ver = GET_APIC_VERSION(value);
 
@@ -430,15 +416,11 @@ void __cpuinit setup_local_APIC (void)
                 value = APIC_DM_NMI;
         else
                 value = APIC_DM_NMI | APIC_LVT_MASKED;
-        if (!APIC_INTEGRATED(ver))              /* 82489DX */
-                value |= APIC_LVT_LEVEL_TRIGGER;
         apic_write_around(APIC_LVT1, value);
 
-        if (APIC_INTEGRATED(ver) && !esr_disable) {             /* !82489DX */
+        {
                 unsigned oldvalue;
                 maxlvt = get_maxlvt();
-                if (maxlvt > 3)         /* Due to the Pentium erratum 3AP. */
-                        apic_write(APIC_ESR, 0);
                 oldvalue = apic_read(APIC_ESR);
                 value = ERROR_APIC_VECTOR;      // enables sending errors
                 apic_write_around(APIC_LVTERR, value);
@@ -452,17 +434,6 @@ void __cpuinit setup_local_APIC (void)
                         apic_printk(APIC_VERBOSE,
                         "ESR value after enabling vector: %08x, after %08x\n",
                         oldvalue, value);
-        } else {
-                if (esr_disable)        
-                        /* 
-                         * Something untraceble is creating bad interrupts on 
-                         * secondary quads ... for the moment, just leave the
-                         * ESR disabled - we can't do anything useful with the
-                         * errors anyway - mbligh
-                         */
-                        apic_printk(APIC_DEBUG, "Leaving ESR disabled.\n");
-                else 
-                        apic_printk(APIC_DEBUG, "No ESR for 82489DX.\n");
         }
 
         nmi_watchdog_default();
@@ -650,8 +621,7 @@ void __init init_apic_mappings(void)
          * Fetch the APIC ID of the BSP in case we have a
          * default configuration (or the MP table is broken).
          */
-        if (boot_cpu_id == -1U)
-                boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));
+        boot_cpu_id = GET_APIC_ID(apic_read(APIC_ID));
 
 #ifdef CONFIG_X86_IO_APIC
         {
@@ -693,8 +663,6 @@ static void __setup_APIC_LVTT(unsigned int clocks)
 
         ver = GET_APIC_VERSION(apic_read(APIC_LVR));
         lvtt_value = APIC_LVT_TIMER_PERIODIC | LOCAL_TIMER_VECTOR;
-        if (!APIC_INTEGRATED(ver))
-                lvtt_value |= SET_APIC_TIMER_BASE(APIC_TIMER_BASE_DIV);
         apic_write_around(APIC_LVTT, lvtt_value);
 
         /*
@@ -1081,7 +1049,7 @@ int __init APIC_init_uniprocessor (void)
 
         connect_bsp_APIC();
 
-        phys_cpu_present_map = physid_mask_of_physid(0);
+        phys_cpu_present_map = physid_mask_of_physid(boot_cpu_id);
         apic_write_around(APIC_ID, boot_cpu_id);
 
         setup_local_APIC();
diff --git a/arch/x86_64/kernel/asm-offsets.c b/arch/x86_64/kernel/asm-offsets.c
index 35b4c3fcbb37..aaa6d3833517 100644
--- a/arch/x86_64/kernel/asm-offsets.c
+++ b/arch/x86_64/kernel/asm-offsets.c
@@ -39,7 +39,6 @@ int main(void)
         ENTRY(kernelstack); 
         ENTRY(oldrsp); 
         ENTRY(pcurrent); 
-        ENTRY(irqrsp);
         ENTRY(irqcount);
         ENTRY(cpunumber);
         ENTRY(irqstackptr);
diff --git a/arch/x86_64/kernel/crash.c b/arch/x86_64/kernel/crash.c
index d7fa4248501c..535e04466079 100644
--- a/arch/x86_64/kernel/crash.c
+++ b/arch/x86_64/kernel/crash.c
@@ -11,7 +11,6 @@
 #include <linux/types.h>
 #include <linux/kernel.h>
 #include <linux/smp.h>
-#include <linux/irq.h>
 #include <linux/reboot.h>
 #include <linux/kexec.h>
 
diff --git a/arch/x86_64/kernel/e820.c b/arch/x86_64/kernel/e820.c
index 116ac5f53dce..eb7929eea7b3 100644
--- a/arch/x86_64/kernel/e820.c
+++ b/arch/x86_64/kernel/e820.c
@@ -131,7 +131,7 @@ void __init e820_bootmem_free(pg_data_t *pgdat, unsigned long start,unsigned lon
 
                 if (ei->type != E820_RAM || 
                     ei->addr+ei->size <= start || 
-                    ei->addr > end)
+                    ei->addr >= end)
                         continue;
 
                 addr = round_up(ei->addr, PAGE_SIZE);
@@ -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/early_printk.c b/arch/x86_64/kernel/early_printk.c
index 9631c747c5e3..9cd968dd0f5a 100644
--- a/arch/x86_64/kernel/early_printk.c
+++ b/arch/x86_64/kernel/early_printk.c
@@ -5,6 +5,7 @@
 #include <linux/tty.h>
 #include <asm/io.h>
 #include <asm/processor.h>
+#include <asm/fcntl.h>
 
 /* Simple VGA output */
 
@@ -158,6 +159,47 @@ static struct console early_serial_console = {
         .index =        -1,
 };
 
+/* Console interface to a host file on AMD's SimNow! */
+
+static int simnow_fd;
+
+enum {
+        MAGIC1 = 0xBACCD00A,
+        MAGIC2 = 0xCA110000,
+        XOPEN = 5,
+        XWRITE = 4,
+};
+
+static noinline long simnow(long cmd, long a, long b, long c)
+{
+        long ret;
+        asm volatile("cpuid" :
+                     "=a" (ret) :
+                     "b" (a), "c" (b), "d" (c), "0" (MAGIC1), "D" (cmd + MAGIC2));
+        return ret;
+}
+
+void __init simnow_init(char *str)
+{
+        char *fn = "klog";
+        if (*str == '=')
+                fn = ++str;
+        /* error ignored */
+        simnow_fd = simnow(XOPEN, (unsigned long)fn, O_WRONLY|O_APPEND|O_CREAT, 0644);
+}
+
+static void simnow_write(struct console *con, const char *s, unsigned n)
+{
+        simnow(XWRITE, simnow_fd, (unsigned long)s, n);
+}
+
+static struct console simnow_console = {
+        .name =         "simnow",
+        .write =        simnow_write,
+        .flags =        CON_PRINTBUFFER,
+        .index =        -1,
+};
+
 /* Direct interface for emergencies */
 struct console *early_console = &early_vga_console;
 static int early_console_initialized = 0;
@@ -205,6 +247,10 @@ int __init setup_early_printk(char *opt)
                 max_xpos = SCREEN_INFO.orig_video_cols;
                 max_ypos = SCREEN_INFO.orig_video_lines;
                 early_console = &early_vga_console; 
+        } else if (!strncmp(buf, "simnow", 6)) {
+                simnow_init(buf + 6);
+                early_console = &simnow_console;
+                keep_early = 1;
         }
         early_console_initialized = 1;
         register_console(early_console);       
diff --git a/arch/x86_64/kernel/entry.S b/arch/x86_64/kernel/entry.S
index be51dbe1f75e..7937971d1853 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>
@@ -79,16 +79,19 @@
         xorl %eax, %eax
         pushq %rax /* ss */
         CFI_ADJUST_CFA_OFFSET   8
+        /*CFI_REL_OFFSET        ss,0*/
         pushq %rax /* rsp */
         CFI_ADJUST_CFA_OFFSET   8
-        CFI_OFFSET      rip,0
+        CFI_REL_OFFSET  rsp,0
         pushq $(1<<9) /* eflags - interrupts on */
         CFI_ADJUST_CFA_OFFSET   8
+        /*CFI_REL_OFFSET        rflags,0*/
         pushq $__KERNEL_CS /* cs */
         CFI_ADJUST_CFA_OFFSET   8
+        /*CFI_REL_OFFSET        cs,0*/
         pushq \child_rip /* rip */
         CFI_ADJUST_CFA_OFFSET   8
-        CFI_OFFSET      rip,0
+        CFI_REL_OFFSET  rip,0
         pushq   %rax /* orig rax */
         CFI_ADJUST_CFA_OFFSET   8
         .endm
@@ -98,32 +101,39 @@
         CFI_ADJUST_CFA_OFFSET   -(6*8)
         .endm
 
-        .macro  CFI_DEFAULT_STACK
-        CFI_ADJUST_CFA_OFFSET  (SS)
-        CFI_OFFSET      r15,R15-SS
-        CFI_OFFSET      r14,R14-SS
-        CFI_OFFSET      r13,R13-SS
-        CFI_OFFSET      r12,R12-SS
-        CFI_OFFSET      rbp,RBP-SS
-        CFI_OFFSET      rbx,RBX-SS
-        CFI_OFFSET      r11,R11-SS
-        CFI_OFFSET      r10,R10-SS
-        CFI_OFFSET      r9,R9-SS
-        CFI_OFFSET      r8,R8-SS
-        CFI_OFFSET      rax,RAX-SS
-        CFI_OFFSET      rcx,RCX-SS
-        CFI_OFFSET      rdx,RDX-SS
-        CFI_OFFSET      rsi,RSI-SS
-        CFI_OFFSET      rdi,RDI-SS
-        CFI_OFFSET      rsp,RSP-SS
-        CFI_OFFSET      rip,RIP-SS
+        .macro  CFI_DEFAULT_STACK start=1
+        .if \start
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,SS+8
+        .else
+        CFI_DEF_CFA_OFFSET SS+8
+        .endif
+        CFI_REL_OFFSET  r15,R15
+        CFI_REL_OFFSET  r14,R14
+        CFI_REL_OFFSET  r13,R13
+        CFI_REL_OFFSET  r12,R12
+        CFI_REL_OFFSET  rbp,RBP
+        CFI_REL_OFFSET  rbx,RBX
+        CFI_REL_OFFSET  r11,R11
+        CFI_REL_OFFSET  r10,R10
+        CFI_REL_OFFSET  r9,R9
+        CFI_REL_OFFSET  r8,R8
+        CFI_REL_OFFSET  rax,RAX
+        CFI_REL_OFFSET  rcx,RCX
+        CFI_REL_OFFSET  rdx,RDX
+        CFI_REL_OFFSET  rsi,RSI
+        CFI_REL_OFFSET  rdi,RDI
+        CFI_REL_OFFSET  rip,RIP
+        /*CFI_REL_OFFSET        cs,CS*/
+        /*CFI_REL_OFFSET        rflags,EFLAGS*/
+        CFI_REL_OFFSET  rsp,RSP
+        /*CFI_REL_OFFSET        ss,SS*/
         .endm
 /*
  * A newly forked process directly context switches into this.
  */     
 /* rdi: prev */ 
 ENTRY(ret_from_fork)
-        CFI_STARTPROC
         CFI_DEFAULT_STACK
         call schedule_tail
         GET_THREAD_INFO(%rcx)
@@ -172,16 +182,21 @@ rff_trace:
  */                                     
 
 ENTRY(system_call)
-        CFI_STARTPROC
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,0
+        CFI_REGISTER    rip,rcx
+        /*CFI_REGISTER  rflags,r11*/
         swapgs
         movq    %rsp,%gs:pda_oldrsp 
         movq    %gs:pda_kernelstack,%rsp
         sti                                     
         SAVE_ARGS 8,1
         movq  %rax,ORIG_RAX-ARGOFFSET(%rsp) 
-        movq  %rcx,RIP-ARGOFFSET(%rsp)  
+        movq  %rcx,RIP-ARGOFFSET(%rsp)
+        CFI_REL_OFFSET rip,RIP-ARGOFFSET
         GET_THREAD_INFO(%rcx)
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SECCOMP),threadinfo_flags(%rcx)
+        CFI_REMEMBER_STATE
         jnz tracesys
         cmpq $__NR_syscall_max,%rax
         ja badsys
@@ -201,9 +216,12 @@ sysret_check:
         cli
         movl threadinfo_flags(%rcx),%edx
         andl %edi,%edx
+        CFI_REMEMBER_STATE
         jnz  sysret_careful 
         movq RIP-ARGOFFSET(%rsp),%rcx
+        CFI_REGISTER    rip,rcx
         RESTORE_ARGS 0,-ARG_SKIP,1
+        /*CFI_REGISTER  rflags,r11*/
         movq    %gs:pda_oldrsp,%rsp
         swapgs
         sysretq
@@ -211,12 +229,15 @@ sysret_check:
         /* Handle reschedules */
         /* edx: work, edi: workmask */  
 sysret_careful:
+        CFI_RESTORE_STATE
         bt $TIF_NEED_RESCHED,%edx
         jnc sysret_signal
         sti
         pushq %rdi
+        CFI_ADJUST_CFA_OFFSET 8
         call schedule
         popq  %rdi
+        CFI_ADJUST_CFA_OFFSET -8
         jmp sysret_check
 
         /* Handle a signal */ 
@@ -234,8 +255,13 @@ sysret_signal:
 1:      movl $_TIF_NEED_RESCHED,%edi
         jmp sysret_check
         
+badsys:
+        movq $-ENOSYS,RAX-ARGOFFSET(%rsp)
+        jmp ret_from_sys_call
+
         /* Do syscall tracing */
 tracesys:                        
+        CFI_RESTORE_STATE
         SAVE_REST
         movq $-ENOSYS,RAX(%rsp)
         FIXUP_TOP_OF_STACK %rdi
@@ -254,16 +280,29 @@ tracesys:
         RESTORE_TOP_OF_STACK %rbx
         RESTORE_REST
         jmp ret_from_sys_call
+        CFI_ENDPROC
                 
-badsys:
-        movq $-ENOSYS,RAX-ARGOFFSET(%rsp)       
-        jmp ret_from_sys_call
-
 /* 
  * Syscall return path ending with IRET.
  * Has correct top of stack, but partial stack frame.
  */     
-ENTRY(int_ret_from_sys_call)    
+ENTRY(int_ret_from_sys_call)
+        CFI_STARTPROC   simple
+        CFI_DEF_CFA     rsp,SS+8-ARGOFFSET
+        /*CFI_REL_OFFSET        ss,SS-ARGOFFSET*/
+        CFI_REL_OFFSET  rsp,RSP-ARGOFFSET
+        /*CFI_REL_OFFSET        rflags,EFLAGS-ARGOFFSET*/
+        /*CFI_REL_OFFSET        cs,CS-ARGOFFSET*/
+        CFI_REL_OFFSET  rip,RIP-ARGOFFSET
+        CFI_REL_OFFSET  rdx,RDX-ARGOFFSET
+        CFI_REL_OFFSET  rcx,RCX-ARGOFFSET
+        CFI_REL_OFFSET  rax,RAX-ARGOFFSET
+        CFI_REL_OFFSET  rdi,RDI-ARGOFFSET
+        CFI_REL_OFFSET  rsi,RSI-ARGOFFSET
+        CFI_REL_OFFSET  r8,R8-ARGOFFSET
+        CFI_REL_OFFSET  r9,R9-ARGOFFSET
+        CFI_REL_OFFSET  r10,R10-ARGOFFSET
+        CFI_REL_OFFSET  r11,R11-ARGOFFSET
         cli
         testl $3,CS-ARGOFFSET(%rsp)
         je retint_restore_args
@@ -284,8 +323,10 @@ int_careful:
         jnc  int_very_careful
         sti
         pushq %rdi
+        CFI_ADJUST_CFA_OFFSET 8
         call schedule
         popq %rdi
+        CFI_ADJUST_CFA_OFFSET -8
         cli
         jmp int_with_check
 
@@ -297,9 +338,11 @@ int_very_careful:
         testl $(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edx
         jz int_signal
         pushq %rdi
+        CFI_ADJUST_CFA_OFFSET 8
         leaq 8(%rsp),%rdi       # &ptregs -> arg1       
         call syscall_trace_leave
         popq %rdi
+        CFI_ADJUST_CFA_OFFSET -8
         andl $~(_TIF_SYSCALL_TRACE|_TIF_SYSCALL_AUDIT|_TIF_SINGLESTEP),%edi
         cli
         jmp int_restore_rest
@@ -329,6 +372,8 @@ int_restore_rest:
         jmp     ptregscall_common
         .endm
 
+        CFI_STARTPROC
+
         PTREGSCALL stub_clone, sys_clone, %r8
         PTREGSCALL stub_fork, sys_fork, %rdi
         PTREGSCALL stub_vfork, sys_vfork, %rdi
@@ -337,40 +382,49 @@ int_restore_rest:
         PTREGSCALL stub_iopl, sys_iopl, %rsi
 
 ENTRY(ptregscall_common)
-        CFI_STARTPROC
         popq %r11
-        CFI_ADJUST_CFA_OFFSET   -8
+        CFI_ADJUST_CFA_OFFSET -8
+        CFI_REGISTER rip, r11
         SAVE_REST
         movq %r11, %r15
+        CFI_REGISTER rip, r15
         FIXUP_TOP_OF_STACK %r11
         call *%rax
         RESTORE_TOP_OF_STACK %r11
         movq %r15, %r11
+        CFI_REGISTER rip, r11
         RESTORE_REST
         pushq %r11
-        CFI_ADJUST_CFA_OFFSET   8
+        CFI_ADJUST_CFA_OFFSET 8
+        CFI_REL_OFFSET rip, 0
         ret
         CFI_ENDPROC
         
 ENTRY(stub_execve)
         CFI_STARTPROC
         popq %r11
-        CFI_ADJUST_CFA_OFFSET   -8
+        CFI_ADJUST_CFA_OFFSET -8
+        CFI_REGISTER rip, r11
         SAVE_REST
         movq %r11, %r15
+        CFI_REGISTER rip, r15
         FIXUP_TOP_OF_STACK %r11
         call sys_execve
         GET_THREAD_INFO(%rcx)
         bt $TIF_IA32,threadinfo_flags(%rcx)
+        CFI_REMEMBER_STATE
         jc exec_32bit
         RESTORE_TOP_OF_STACK %r11
         movq %r15, %r11
+        CFI_REGISTER rip, r11
         RESTORE_REST
-        push %r11
+        pushq %r11
+        CFI_ADJUST_CFA_OFFSET 8
+        CFI_REL_OFFSET rip, 0
         ret
 
 exec_32bit:
-        CFI_ADJUST_CFA_OFFSET   REST_SKIP
+        CFI_RESTORE_STATE
         movq %rax,RAX(%rsp)
         RESTORE_REST
         jmp int_ret_from_sys_call
@@ -382,7 +436,8 @@ exec_32bit:
  */                
 ENTRY(stub_rt_sigreturn)
         CFI_STARTPROC
-        addq $8, %rsp           
+        addq $8, %rsp
+        CFI_ADJUST_CFA_OFFSET   -8
         SAVE_REST
         movq %rsp,%rdi
         FIXUP_TOP_OF_STACK %r11
@@ -392,6 +447,25 @@ ENTRY(stub_rt_sigreturn)
         jmp int_ret_from_sys_call
         CFI_ENDPROC
 
+/*
+ * initial frame state for interrupts and exceptions
+ */
+        .macro _frame ref
+        CFI_STARTPROC simple
+        CFI_DEF_CFA rsp,SS+8-\ref
+        /*CFI_REL_OFFSET ss,SS-\ref*/
+        CFI_REL_OFFSET rsp,RSP-\ref
+        /*CFI_REL_OFFSET rflags,EFLAGS-\ref*/
+        /*CFI_REL_OFFSET cs,CS-\ref*/
+        CFI_REL_OFFSET rip,RIP-\ref
+        .endm
+
+/* initial frame state for interrupts (and exceptions without error code) */
+#define INTR_FRAME _frame RIP
+/* initial frame state for exceptions with error code (and interrupts with
+   vector already pushed) */
+#define XCPT_FRAME _frame ORIG_RAX
+
 /* 
  * Interrupt entry/exit.
  *
@@ -402,10 +476,6 @@ ENTRY(stub_rt_sigreturn)
 
 /* 0(%rsp): interrupt number */ 
         .macro interrupt func
-        CFI_STARTPROC   simple
-        CFI_DEF_CFA     rsp,(SS-RDI)
-        CFI_REL_OFFSET  rsp,(RSP-ORIG_RAX)
-        CFI_REL_OFFSET  rip,(RIP-ORIG_RAX)
         cld
 #ifdef CONFIG_DEBUG_INFO
         SAVE_ALL        
@@ -425,23 +495,27 @@ ENTRY(stub_rt_sigreturn)
         swapgs  
 1:      incl    %gs:pda_irqcount        # RED-PEN should check preempt count
         movq %gs:pda_irqstackptr,%rax
-        cmoveq %rax,%rsp                                                        
+        cmoveq %rax,%rsp /*todo This needs CFI annotation! */
         pushq %rdi                      # save old stack        
+        CFI_ADJUST_CFA_OFFSET   8
         call \func
         .endm
 
 ENTRY(common_interrupt)
+        XCPT_FRAME
         interrupt do_IRQ
         /* 0(%rsp): oldrsp-ARGOFFSET */
-ret_from_intr:          
+ret_from_intr:
         popq  %rdi
+        CFI_ADJUST_CFA_OFFSET   -8
         cli     
         decl %gs:pda_irqcount
 #ifdef CONFIG_DEBUG_INFO
         movq RBP(%rdi),%rbp
+        CFI_DEF_CFA_REGISTER    rsp
 #endif
-        leaq ARGOFFSET(%rdi),%rsp
-exit_intr:              
+        leaq ARGOFFSET(%rdi),%rsp /*todo This needs CFI annotation! */
+exit_intr:
         GET_THREAD_INFO(%rcx)
         testl $3,CS-ARGOFFSET(%rsp)
         je retint_kernel
@@ -453,9 +527,10 @@ exit_intr:
          */             
 retint_with_reschedule:
         movl $_TIF_WORK_MASK,%edi
-retint_check:                   
+retint_check:
         movl threadinfo_flags(%rcx),%edx
         andl %edi,%edx
+        CFI_REMEMBER_STATE
         jnz  retint_careful
 retint_swapgs:          
         swapgs 
@@ -476,14 +551,17 @@ bad_iret:
         jmp do_exit                     
         .previous       
         
-        /* edi: workmask, edx: work */  
+        /* edi: workmask, edx: work */
 retint_careful:
+        CFI_RESTORE_STATE
         bt    $TIF_NEED_RESCHED,%edx
         jnc   retint_signal
         sti
         pushq %rdi
+        CFI_ADJUST_CFA_OFFSET   8
         call  schedule
         popq %rdi               
+        CFI_ADJUST_CFA_OFFSET   -8
         GET_THREAD_INFO(%rcx)
         cli
         jmp retint_check
@@ -523,7 +601,9 @@ retint_kernel:
  * APIC interrupts.
  */             
         .macro apicinterrupt num,func
+        INTR_FRAME
         pushq $\num-256
+        CFI_ADJUST_CFA_OFFSET 8
         interrupt \func
         jmp ret_from_intr
         CFI_ENDPROC
@@ -536,8 +616,19 @@ ENTRY(thermal_interrupt)
 ENTRY(reschedule_interrupt)
         apicinterrupt RESCHEDULE_VECTOR,smp_reschedule_interrupt
 
-ENTRY(invalidate_interrupt)
-        apicinterrupt INVALIDATE_TLB_VECTOR,smp_invalidate_interrupt
+        .macro INVALIDATE_ENTRY num
+ENTRY(invalidate_interrupt\num)
+        apicinterrupt INVALIDATE_TLB_VECTOR_START+\num,smp_invalidate_interrupt 
+        .endm
+
+        INVALIDATE_ENTRY 0
+        INVALIDATE_ENTRY 1
+        INVALIDATE_ENTRY 2
+        INVALIDATE_ENTRY 3
+        INVALIDATE_ENTRY 4
+        INVALIDATE_ENTRY 5
+        INVALIDATE_ENTRY 6
+        INVALIDATE_ENTRY 7
 
 ENTRY(call_function_interrupt)
         apicinterrupt CALL_FUNCTION_VECTOR,smp_call_function_interrupt
@@ -558,16 +649,23 @@ ENTRY(spurious_interrupt)
  * Exception entry points.
  */             
         .macro zeroentry sym
+        INTR_FRAME
         pushq $0        /* push error code/oldrax */ 
+        CFI_ADJUST_CFA_OFFSET 8
         pushq %rax      /* push real oldrax to the rdi slot */ 
+        CFI_ADJUST_CFA_OFFSET 8
         leaq  \sym(%rip),%rax
         jmp error_entry
+        CFI_ENDPROC
         .endm   
 
         .macro errorentry sym
+        XCPT_FRAME
         pushq %rax
+        CFI_ADJUST_CFA_OFFSET 8
         leaq  \sym(%rip),%rax
         jmp error_entry
+        CFI_ENDPROC
         .endm
 
         /* error code is on the stack already */
@@ -594,10 +692,7 @@ ENTRY(spurious_interrupt)
  * and the exception handler in %rax.   
  */                                             
 ENTRY(error_entry)
-        CFI_STARTPROC   simple
-        CFI_DEF_CFA     rsp,(SS-RDI)
-        CFI_REL_OFFSET  rsp,(RSP-RDI)
-        CFI_REL_OFFSET  rip,(RIP-RDI)
+        _frame RDI
         /* rdi slot contains rax, oldrax contains error code */
         cld     
         subq  $14*8,%rsp
@@ -679,7 +774,9 @@ error_kernelspace:
        /* Reload gs selector with exception handling */
        /* edi:  new selector */ 
 ENTRY(load_gs_index)
+        CFI_STARTPROC
         pushf
+        CFI_ADJUST_CFA_OFFSET 8
         cli
         swapgs
 gs_change:     
@@ -687,7 +784,9 @@ gs_change:
 2:      mfence          /* workaround */
         swapgs
         popf
+        CFI_ADJUST_CFA_OFFSET -8
         ret
+        CFI_ENDPROC
        
         .section __ex_table,"a"
         .align 8
@@ -799,7 +898,7 @@ ENTRY(device_not_available)
 
         /* runs on exception stack */
 KPROBE_ENTRY(debug)
-        CFI_STARTPROC
+        INTR_FRAME
         pushq $0
         CFI_ADJUST_CFA_OFFSET 8         
         paranoidentry do_debug
@@ -809,9 +908,9 @@ KPROBE_ENTRY(debug)
 
         /* runs on exception stack */   
 ENTRY(nmi)
-        CFI_STARTPROC
+        INTR_FRAME
         pushq $-1
-        CFI_ADJUST_CFA_OFFSET 8         
+        CFI_ADJUST_CFA_OFFSET 8
         paranoidentry do_nmi
         /*
          * "Paranoid" exit path from exception stack.
@@ -877,7 +976,7 @@ ENTRY(reserved)
 
         /* runs on exception stack */
 ENTRY(double_fault)
-        CFI_STARTPROC
+        XCPT_FRAME
         paranoidentry do_double_fault
         jmp paranoid_exit
         CFI_ENDPROC
@@ -890,7 +989,7 @@ ENTRY(segment_not_present)
 
         /* runs on exception stack */
 ENTRY(stack_segment)
-        CFI_STARTPROC
+        XCPT_FRAME
         paranoidentry do_stack_segment
         jmp paranoid_exit
         CFI_ENDPROC
@@ -911,7 +1010,7 @@ ENTRY(spurious_interrupt_bug)
 #ifdef CONFIG_X86_MCE
         /* runs on exception stack */
 ENTRY(machine_check)
-        CFI_STARTPROC
+        INTR_FRAME
         pushq $0
         CFI_ADJUST_CFA_OFFSET 8 
         paranoidentry do_machine_check
@@ -923,14 +1022,19 @@ ENTRY(call_debug)
        zeroentry do_call_debug
 
 ENTRY(call_softirq)
+        CFI_STARTPROC
         movq %gs:pda_irqstackptr,%rax
         pushq %r15
+        CFI_ADJUST_CFA_OFFSET 8
         movq %rsp,%r15
+        CFI_DEF_CFA_REGISTER    r15
         incl %gs:pda_irqcount
         cmove %rax,%rsp
         call __do_softirq
         movq %r15,%rsp
+        CFI_DEF_CFA_REGISTER    rsp
         decl %gs:pda_irqcount
         popq %r15
+        CFI_ADJUST_CFA_OFFSET -8
         ret
-
+        CFI_ENDPROC
diff --git a/arch/x86_64/kernel/genapic.c b/arch/x86_64/kernel/genapic.c
index f062aa03bab7..7a64ea181788 100644
--- a/arch/x86_64/kernel/genapic.c
+++ b/arch/x86_64/kernel/genapic.c
@@ -20,7 +20,7 @@
 #include <asm/smp.h>
 #include <asm/ipi.h>
 
-#if defined(CONFIG_ACPI_BUS)
+#if defined(CONFIG_ACPI)
 #include <acpi/acpi_bus.h>
 #endif
 
@@ -45,9 +45,9 @@ void __init clustered_apic_check(void)
         u8 clusters, max_cluster;
         u8 id;
         u8 cluster_cnt[NUM_APIC_CLUSTERS];
-        int num_cpus = 0;
+        int max_apic = 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).
@@ -64,14 +64,15 @@ void __init clustered_apic_check(void)
                 id = bios_cpu_apicid[i];
                 if (id == BAD_APICID)
                         continue;
-                num_cpus++;
+                if (id > max_apic)
+                        max_apic = id;
                 cluster_cnt[APIC_CLUSTERID(id)]++;
         }
 
         /* Don't use clustered mode on AMD platforms. */
         if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD) {
                 genapic = &apic_physflat;
-#ifndef CONFIG_CPU_HOTPLUG
+#ifndef CONFIG_HOTPLUG_CPU
                 /* In the CPU hotplug case we cannot use broadcast mode
                    because that opens a race when a CPU is removed.
                    Stay at physflat mode in this case.
@@ -79,7 +80,7 @@ void __init clustered_apic_check(void)
                    we have ACPI platform support for CPU hotplug
                    we should detect hotplug capablity from ACPI tables and
                    only do this when really needed. -AK */
-                if (num_cpus <= 8)
+                if (max_apic <= 8)
                         genapic = &apic_flat;
 #endif
                 goto print;
@@ -103,9 +104,14 @@ void __init clustered_apic_check(void)
          * (We don't use lowest priority delivery + HW APIC IRQ steering, so
          * can ignore the clustered logical case and go straight to physical.)
          */
-        if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster)
+        if (clusters <= 1 && max_cluster <= 8 && cluster_cnt[0] == max_cluster) {
+#ifdef CONFIG_HOTPLUG_CPU
+                /* Don't use APIC shortcuts in CPU hotplug to avoid races */
+                genapic = &apic_physflat;
+#else
                 genapic = &apic_flat;
-        else
+#endif
+        } else
                 genapic = &apic_cluster;
 
 print:
diff --git a/arch/x86_64/kernel/genapic_cluster.c b/arch/x86_64/kernel/genapic_cluster.c
index f6523dd1bc09..a472d62f899a 100644
--- a/arch/x86_64/kernel/genapic_cluster.c
+++ b/arch/x86_64/kernel/genapic_cluster.c
@@ -51,10 +51,10 @@ static void cluster_init_apic_ldr(void)
                 count = 3;
         id = my_cluster | (1UL << count);
         x86_cpu_to_log_apicid[smp_processor_id()] = id;
-        apic_write_around(APIC_DFR, APIC_DFR_CLUSTER);
+        apic_write(APIC_DFR, APIC_DFR_CLUSTER);
         val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
         val |= SET_APIC_LOGICAL_ID(id);
-        apic_write_around(APIC_LDR, val);
+        apic_write(APIC_LDR, val);
 }
 
 /* Start with all IRQs pointing to boot CPU.  IRQ balancing will shift them. */
diff --git a/arch/x86_64/kernel/genapic_flat.c b/arch/x86_64/kernel/genapic_flat.c
index adc96282a9e2..9da3edb799ea 100644
--- a/arch/x86_64/kernel/genapic_flat.c
+++ b/arch/x86_64/kernel/genapic_flat.c
@@ -38,10 +38,10 @@ static void flat_init_apic_ldr(void)
         num = smp_processor_id();
         id = 1UL << num;
         x86_cpu_to_log_apicid[num] = id;
-        apic_write_around(APIC_DFR, APIC_DFR_FLAT);
+        apic_write(APIC_DFR, APIC_DFR_FLAT);
         val = apic_read(APIC_LDR) & ~APIC_LDR_MASK;
         val |= SET_APIC_LOGICAL_ID(id);
-        apic_write_around(APIC_LDR, val);
+        apic_write(APIC_LDR, val);
 }
 
 static void flat_send_IPI_mask(cpumask_t cpumask, int vector)
@@ -62,7 +62,7 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector)
          * prepare target chip field
          */
         cfg = __prepare_ICR2(mask);
-        apic_write_around(APIC_ICR2, cfg);
+        apic_write(APIC_ICR2, cfg);
 
         /*
          * program the ICR
@@ -72,14 +72,24 @@ static void flat_send_IPI_mask(cpumask_t cpumask, int vector)
         /*
          * Send the IPI. The write to APIC_ICR fires this off.
          */
-        apic_write_around(APIC_ICR, cfg);
+        apic_write(APIC_ICR, cfg);
         local_irq_restore(flags);
 }
 
 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)
@@ -167,9 +177,9 @@ static unsigned int physflat_cpu_mask_to_apicid(cpumask_t cpumask)
 
 struct genapic apic_physflat =  {
         .name = "physical flat",
-        .int_delivery_mode = dest_LowestPrio,
+        .int_delivery_mode = dest_Fixed,
         .int_dest_mode = (APIC_DEST_PHYSICAL != 0),
-        .int_delivery_dest = APIC_DEST_PHYSICAL | APIC_DM_LOWEST,
+        .int_delivery_dest = APIC_DEST_PHYSICAL | APIC_DM_FIXED,
         .target_cpus = physflat_target_cpus,
         .apic_id_registered = flat_apic_id_registered,
         .init_apic_ldr = flat_init_apic_ldr,/*not needed, but shouldn't hurt*/
diff --git a/arch/x86_64/kernel/head.S b/arch/x86_64/kernel/head.S
index 98ff5eb32b9a..4592bf21fcaf 100644
--- a/arch/x86_64/kernel/head.S
+++ b/arch/x86_64/kernel/head.S
@@ -270,7 +270,7 @@ ENTRY(level3_kernel_pgt)
 .org 0x4000
 ENTRY(level2_ident_pgt)
         /* 40MB for bootup.     */
-        .quad   0x0000000000000283
+        .quad   0x0000000000000183
         .quad   0x0000000000200183
         .quad   0x0000000000400183
         .quad   0x0000000000600183
diff --git a/arch/x86_64/kernel/i8259.c b/arch/x86_64/kernel/i8259.c
index a89169095129..b2a238b5a17e 100644
--- a/arch/x86_64/kernel/i8259.c
+++ b/arch/x86_64/kernel/i8259.c
@@ -18,15 +18,12 @@
 #include <asm/atomic.h>
 #include <asm/system.h>
 #include <asm/io.h>
-#include <asm/irq.h>
 #include <asm/hw_irq.h>
 #include <asm/pgtable.h>
 #include <asm/delay.h>
 #include <asm/desc.h>
 #include <asm/apic.h>
 
-#include <linux/irq.h>
-
 /*
  * Common place to define all x86 IRQ vectors
  *
@@ -486,7 +483,14 @@ void spurious_interrupt(void);
 void error_interrupt(void);
 void reschedule_interrupt(void);
 void call_function_interrupt(void);
-void invalidate_interrupt(void);
+void invalidate_interrupt0(void);
+void invalidate_interrupt1(void);
+void invalidate_interrupt2(void);
+void invalidate_interrupt3(void);
+void invalidate_interrupt4(void);
+void invalidate_interrupt5(void);
+void invalidate_interrupt6(void);
+void invalidate_interrupt7(void);
 void thermal_interrupt(void);
 void i8254_timer_resume(void);
 
@@ -562,8 +566,15 @@ void __init init_IRQ(void)
          */
         set_intr_gate(RESCHEDULE_VECTOR, reschedule_interrupt);
 
-        /* IPI for invalidation */
-        set_intr_gate(INVALIDATE_TLB_VECTOR, invalidate_interrupt);
+        /* IPIs for invalidation */
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+0, invalidate_interrupt0);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+1, invalidate_interrupt1);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+2, invalidate_interrupt2);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+3, invalidate_interrupt3);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+4, invalidate_interrupt4);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+5, invalidate_interrupt5);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+6, invalidate_interrupt6);
+        set_intr_gate(INVALIDATE_TLB_VECTOR_START+7, invalidate_interrupt7);
 
         /* IPI for generic function call */
         set_intr_gate(CALL_FUNCTION_VECTOR, call_function_interrupt);
diff --git a/arch/x86_64/kernel/init_task.c b/arch/x86_64/kernel/init_task.c
index c4dc91491157..e0ba5c1043fd 100644
--- a/arch/x86_64/kernel/init_task.c
+++ b/arch/x86_64/kernel/init_task.c
@@ -44,6 +44,6 @@ EXPORT_SYMBOL(init_task);
  * section. Since TSS's are completely CPU-local, we want them
  * on exact cacheline boundaries, to eliminate cacheline ping-pong.
  */ 
-DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_maxaligned_in_smp;
+DEFINE_PER_CPU(struct tss_struct, init_tss) ____cacheline_maxaligned_in_smp = INIT_TSS;
 
 #define ALIGN_TO_4K __attribute__((section(".data.init_task")))
diff --git a/arch/x86_64/kernel/io_apic.c b/arch/x86_64/kernel/io_apic.c
index ba1a744e9bf0..522944a000ad 100644
--- a/arch/x86_64/kernel/io_apic.c
+++ b/arch/x86_64/kernel/io_apic.c
@@ -21,7 +21,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/delay.h>
@@ -45,6 +44,8 @@ int sis_apic_bug; /* not actually supported, dummy for compile */
 
 static int no_timer_check;
 
+int disable_timer_pin_1 __initdata;
+
 static DEFINE_SPINLOCK(ioapic_lock);
 
 /*
@@ -298,6 +299,15 @@ void __init check_ioapic(void)
 #endif
                                         /* RED-PEN skip them on mptables too? */
                                         return;
+                                case PCI_VENDOR_ID_ATI:
+                                        /* All timer interrupts on atiixp
+                                           are doubled. Disable one. */
+                                        if (disable_timer_pin_1 == 0) {
+                                                disable_timer_pin_1 = 1;
+                                                printk(KERN_INFO
+                "ATI board detected. Disabling timer pin 1.\n");
+                                        }
+                                        return;
                                 } 
 
                                 /* No multi-function device? */
@@ -1022,13 +1032,11 @@ void __apicdebuginit print_local_APIC(void * dummy)
         v = apic_read(APIC_TASKPRI);
         printk(KERN_DEBUG "... APIC TASKPRI: %08x (%02x)\n", v, v & APIC_TPRI_MASK);
 
-        if (APIC_INTEGRATED(ver)) {                     /* !82489DX */
-                v = apic_read(APIC_ARBPRI);
-                printk(KERN_DEBUG "... APIC ARBPRI: %08x (%02x)\n", v,
-                        v & APIC_ARBPRI_MASK);
-                v = apic_read(APIC_PROCPRI);
-                printk(KERN_DEBUG "... APIC PROCPRI: %08x\n", v);
-        }
+        v = apic_read(APIC_ARBPRI);
+        printk(KERN_DEBUG "... APIC ARBPRI: %08x (%02x)\n", v,
+                v & APIC_ARBPRI_MASK);
+        v = apic_read(APIC_PROCPRI);
+        printk(KERN_DEBUG "... APIC PROCPRI: %08x\n", v);
 
         v = apic_read(APIC_EOI);
         printk(KERN_DEBUG "... APIC EOI: %08x\n", v);
@@ -1048,12 +1056,8 @@ void __apicdebuginit print_local_APIC(void * dummy)
         printk(KERN_DEBUG "... APIC IRR field:\n");
         print_APIC_bitfield(APIC_IRR);
 
-        if (APIC_INTEGRATED(ver)) {             /* !82489DX */
-                if (maxlvt > 3)         /* Due to the Pentium erratum 3AP. */
-                        apic_write(APIC_ESR, 0);
-                v = apic_read(APIC_ESR);
-                printk(KERN_DEBUG "... APIC ESR: %08x\n", v);
-        }
+        v = apic_read(APIC_ESR);
+        printk(KERN_DEBUG "... APIC ESR: %08x\n", v);
 
         v = apic_read(APIC_ICR);
         printk(KERN_DEBUG "... APIC ICR: %08x\n", v);
@@ -1167,9 +1171,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) {
@@ -1665,6 +1669,8 @@ static inline void check_timer(void)
                                 setup_nmi();
                                 enable_8259A_irq(0);
                         }
+                        if (disable_timer_pin_1 > 0)
+                                clear_IO_APIC_pin(0, pin1);
                         return;
                 }
                 clear_IO_APIC_pin(0, pin1);
@@ -1864,7 +1870,7 @@ device_initcall(ioapic_init_sysfs);
                           ACPI-based IOAPIC Configuration
    -------------------------------------------------------------------------- */
 
-#ifdef CONFIG_ACPI_BOOT
+#ifdef CONFIG_ACPI
 
 #define IO_APIC_MAX_ID          0xFE
 
@@ -1947,7 +1953,7 @@ int io_apic_set_pci_routing (int ioapic, int pin, int irq, int edge_level, int a
         return 0;
 }
 
-#endif /*CONFIG_ACPI_BOOT*/
+#endif /* CONFIG_ACPI */
 
 
 /*
diff --git a/arch/x86_64/kernel/irq.c b/arch/x86_64/kernel/irq.c
index 849a20aec7ca..d6a04a8320a3 100644
--- a/arch/x86_64/kernel/irq.c
+++ b/arch/x86_64/kernel/irq.c
@@ -99,7 +99,6 @@ asmlinkage unsigned int do_IRQ(struct pt_regs *regs)
         unsigned irq = regs->orig_rax & 0xff;
 
         irq_enter();
-        BUG_ON(irq > 256);
 
         __do_IRQ(irq, regs);
         irq_exit();
diff --git a/arch/x86_64/kernel/mce.c b/arch/x86_64/kernel/mce.c
index 8aa56736cde3..969365c0771b 100644
--- a/arch/x86_64/kernel/mce.c
+++ b/arch/x86_64/kernel/mce.c
@@ -17,6 +17,7 @@
 #include <linux/fs.h>
 #include <linux/cpu.h>
 #include <linux/percpu.h>
+#include <linux/ctype.h>
 #include <asm/processor.h> 
 #include <asm/msr.h>
 #include <asm/mce.h>
@@ -56,15 +57,19 @@ void mce_log(struct mce *mce)
         smp_wmb();
         for (;;) {
                 entry = rcu_dereference(mcelog.next);
-                /* When the buffer fills up discard new entries. Assume 
-                   that the earlier errors are the more interesting. */
-                if (entry >= MCE_LOG_LEN) {
-                        set_bit(MCE_OVERFLOW, &mcelog.flags);
-                        return;
+                for (;;) {
+                        /* When the buffer fills up discard new entries. Assume
+                           that the earlier errors are the more interesting. */
+                        if (entry >= MCE_LOG_LEN) {
+                                set_bit(MCE_OVERFLOW, &mcelog.flags);
+                                return;
+                        }
+                        /* Old left over entry. Skip. */
+                        if (mcelog.entry[entry].finished) {
+                                entry++;
+                                continue;
+                        }
                 }
-                /* Old left over entry. Skip. */
-                if (mcelog.entry[entry].finished)
-                        continue;
                 smp_rmb();
                 next = entry + 1;
                 if (cmpxchg(&mcelog.next, entry, next) == entry)
@@ -404,9 +409,15 @@ static ssize_t mce_read(struct file *filp, char __user *ubuf, size_t usize, loff
         }
 
         err = 0;
-        for (i = 0; i < next; i++) {
-                if (!mcelog.entry[i].finished)
-                        continue;
+        for (i = 0; i < next; i++) {            
+                unsigned long start = jiffies;
+                while (!mcelog.entry[i].finished) {
+                        if (!time_before(jiffies, start + 2)) {
+                                memset(mcelog.entry + i,0, sizeof(struct mce));
+                                continue;
+                        }
+                        cpu_relax();
+                }
                 smp_rmb();
                 err |= copy_to_user(buf, mcelog.entry + i, sizeof(struct mce));
                 buf += sizeof(struct mce); 
@@ -479,6 +490,7 @@ static int __init mcheck_disable(char *str)
 
 /* mce=off disables machine check. Note you can reenable it later
    using sysfs.
+   mce=TOLERANCELEVEL (number, see above)
    mce=bootlog Log MCEs from before booting. Disabled by default to work
    around buggy BIOS that leave bogus MCEs.  */
 static int __init mcheck_enable(char *str)
@@ -489,6 +501,8 @@ static int __init mcheck_enable(char *str)
                 mce_dont_init = 1;
         else if (!strcmp(str, "bootlog"))
                 mce_bootlog = 1;
+        else if (isdigit(str[0]))
+                get_option(&str, &tolerant);
         else
                 printk("mce= argument %s ignored. Please use /sys", str); 
         return 0;
@@ -501,10 +515,12 @@ __setup("mce", mcheck_enable);
  * Sysfs support
  */ 
 
-/* On resume clear all MCE state. Don't want to see leftovers from the BIOS. */
+/* On resume clear all MCE state. Don't want to see leftovers from the BIOS.
+   Only one CPU is active at this time, the others get readded later using
+   CPU hotplug. */
 static int mce_resume(struct sys_device *dev)
 {
-        on_each_cpu(mce_init, NULL, 1, 1);
+        mce_init(NULL);
         return 0;
 }
 
diff --git a/arch/x86_64/kernel/mpparse.c b/arch/x86_64/kernel/mpparse.c
index 79c362d03e2e..f16d38d09daf 100644
--- a/arch/x86_64/kernel/mpparse.c
+++ b/arch/x86_64/kernel/mpparse.c
@@ -14,7 +14,6 @@
  */
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/init.h>
 #include <linux/delay.h>
 #include <linux/config.h>
@@ -46,8 +45,6 @@ int acpi_found_madt;
 int apic_version [MAX_APICS];
 unsigned char mp_bus_id_to_type [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
 int mp_bus_id_to_pci_bus [MAX_MP_BUSSES] = { [0 ... MAX_MP_BUSSES-1] = -1 };
-unsigned char pci_bus_to_node [256];
-EXPORT_SYMBOL(pci_bus_to_node);
 
 static int mp_current_pci_id = 0;
 /* I/O APIC entries */
@@ -74,7 +71,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 +81,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 +516,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 +668,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)
@@ -707,7 +702,7 @@ void __init mp_register_lapic (
 
         processor.mpc_type = MP_PROCESSOR;
         processor.mpc_apicid = id;
-        processor.mpc_apicver = 0x10; /* TBD: lapic version */
+        processor.mpc_apicver = GET_APIC_VERSION(apic_read(APIC_LVR));
         processor.mpc_cpuflag = (enabled ? CPU_ENABLED : 0);
         processor.mpc_cpuflag |= (boot_cpu ? CPU_BOOTPROCESSOR : 0);
         processor.mpc_cpufeature = (boot_cpu_data.x86 << 8) | 
@@ -929,11 +924,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 +966,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 +985,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/msr.c b/arch/x86_64/kernel/msr.c
deleted file mode 100644
index 598953ab0154..000000000000
--- a/arch/x86_64/kernel/msr.c
+++ /dev/null
@@ -1,279 +0,0 @@
-/* ----------------------------------------------------------------------- *
- *   
- *   Copyright 2000 H. Peter Anvin - All Rights Reserved
- *
- *   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, Inc., 675 Mass Ave, Cambridge MA 02139,
- *   USA; either version 2 of the License, or (at your option) any later
- *   version; incorporated herein by reference.
- *
- * ----------------------------------------------------------------------- */
-
-/*
- * msr.c
- *
- * x86 MSR access device
- *
- * This device is accessed by lseek() to the appropriate register number
- * and then read/write in chunks of 8 bytes.  A larger size means multiple
- * reads or writes of the same register.
- *
- * This driver uses /dev/cpu/%d/msr where %d is the minor number, and on
- * an SMP box will direct the access to CPU %d.
- */
-
-#include <linux/module.h>
-#include <linux/config.h>
-
-#include <linux/types.h>
-#include <linux/errno.h>
-#include <linux/fcntl.h>
-#include <linux/init.h>
-#include <linux/poll.h>
-#include <linux/smp.h>
-#include <linux/smp_lock.h>
-#include <linux/major.h>
-#include <linux/fs.h>
-
-#include <asm/processor.h>
-#include <asm/msr.h>
-#include <asm/uaccess.h>
-#include <asm/system.h>
-
-/* Note: "err" is handled in a funny way below.  Otherwise one version
-   of gcc or another breaks. */
-
-static inline int wrmsr_eio(u32 reg, u32 eax, u32 edx)
-{
-        int err;
-
-        asm volatile ("1:       wrmsr\n"
-                      "2:\n"
-                      ".section .fixup,\"ax\"\n"
-                      "3:       movl %4,%0\n"
-                      " jmp 2b\n"
-                      ".previous\n"
-                      ".section __ex_table,\"a\"\n"
-                      " .align 8\n" "   .quad 1b,3b\n" ".previous":"=&bDS" (err)
-                      :"a"(eax), "d"(edx), "c"(reg), "i"(-EIO), "0"(0));
-
-        return err;
-}
-
-static inline int rdmsr_eio(u32 reg, u32 *eax, u32 *edx)
-{
-        int err;
-
-        asm volatile ("1:       rdmsr\n"
-                      "2:\n"
-                      ".section .fixup,\"ax\"\n"
-                      "3:       movl %4,%0\n"
-                      " jmp 2b\n"
-                      ".previous\n"
-                      ".section __ex_table,\"a\"\n"
-                      " .align 8\n"
-                      " .quad 1b,3b\n"
-                      ".previous":"=&bDS" (err), "=a"(*eax), "=d"(*edx)
-                      :"c"(reg), "i"(-EIO), "0"(0));
-
-        return err;
-}
-
-#ifdef CONFIG_SMP
-
-struct msr_command {
-        int cpu;
-        int err;
-        u32 reg;
-        u32 data[2];
-};
-
-static void msr_smp_wrmsr(void *cmd_block)
-{
-        struct msr_command *cmd = (struct msr_command *)cmd_block;
-
-        if (cmd->cpu == smp_processor_id())
-                cmd->err = wrmsr_eio(cmd->reg, cmd->data[0], cmd->data[1]);
-}
-
-static void msr_smp_rdmsr(void *cmd_block)
-{
-        struct msr_command *cmd = (struct msr_command *)cmd_block;
-
-        if (cmd->cpu == smp_processor_id())
-                cmd->err = rdmsr_eio(cmd->reg, &cmd->data[0], &cmd->data[1]);
-}
-
-static inline int do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
-{
-        struct msr_command cmd;
-        int ret;
-
-        preempt_disable();
-        if (cpu == smp_processor_id()) {
-                ret = wrmsr_eio(reg, eax, edx);
-        } else {
-                cmd.cpu = cpu;
-                cmd.reg = reg;
-                cmd.data[0] = eax;
-                cmd.data[1] = edx;
-
-                smp_call_function(msr_smp_wrmsr, &cmd, 1, 1);
-                ret = cmd.err;
-        }
-        preempt_enable();
-        return ret;
-}
-
-static inline int do_rdmsr(int cpu, u32 reg, u32 * eax, u32 * edx)
-{
-        struct msr_command cmd;
-        int ret;
-
-        preempt_disable();
-        if (cpu == smp_processor_id()) {
-                ret = rdmsr_eio(reg, eax, edx);
-        } else {
-                cmd.cpu = cpu;
-                cmd.reg = reg;
-
-                smp_call_function(msr_smp_rdmsr, &cmd, 1, 1);
-
-                *eax = cmd.data[0];
-                *edx = cmd.data[1];
-
-                ret = cmd.err;
-        }
-        preempt_enable();
-        return ret;
-}
-
-#else                           /* ! CONFIG_SMP */
-
-static inline int do_wrmsr(int cpu, u32 reg, u32 eax, u32 edx)
-{
-        return wrmsr_eio(reg, eax, edx);
-}
-
-static inline int do_rdmsr(int cpu, u32 reg, u32 *eax, u32 *edx)
-{
-        return rdmsr_eio(reg, eax, edx);
-}
-
-#endif                          /* ! CONFIG_SMP */
-
-static loff_t msr_seek(struct file *file, loff_t offset, int orig)
-{
-        loff_t ret = -EINVAL;
-
-        lock_kernel();
-        switch (orig) {
-        case 0:
-                file->f_pos = offset;
-                ret = file->f_pos;
-                break;
-        case 1:
-                file->f_pos += offset;
-                ret = file->f_pos;
-        }
-        unlock_kernel();
-        return ret;
-}
-
-static ssize_t msr_read(struct file *file, char __user * buf,
-                        size_t count, loff_t * ppos)
-{
-        u32 __user *tmp = (u32 __user *) buf;
-        u32 data[2];
-        size_t rv;
-        u32 reg = *ppos;
-        int cpu = iminor(file->f_dentry->d_inode);
-        int err;
-
-        if (count % 8)
-                return -EINVAL; /* Invalid chunk size */
-
-        for (rv = 0; count; count -= 8) {
-                err = do_rdmsr(cpu, reg, &data[0], &data[1]);
-                if (err)
-                        return err;
-                if (copy_to_user(tmp, &data, 8))
-                        return -EFAULT;
-                tmp += 2;
-        }
-
-        return ((char __user *)tmp) - buf;
-}
-
-static ssize_t msr_write(struct file *file, const char __user *buf,
-                         size_t count, loff_t *ppos)
-{
-        const u32 __user *tmp = (const u32 __user *)buf;
-        u32 data[2];
-        size_t rv;
-        u32 reg = *ppos;
-        int cpu = iminor(file->f_dentry->d_inode);
-        int err;
-
-        if (count % 8)
-                return -EINVAL; /* Invalid chunk size */
-
-        for (rv = 0; count; count -= 8) {
-                if (copy_from_user(&data, tmp, 8))
-                        return -EFAULT;
-                err = do_wrmsr(cpu, reg, data[0], data[1]);
-                if (err)
-                        return err;
-                tmp += 2;
-        }
-
-        return ((char __user *)tmp) - buf;
-}
-
-static int msr_open(struct inode *inode, struct file *file)
-{
-        unsigned int cpu = iminor(file->f_dentry->d_inode);
-        struct cpuinfo_x86 *c = &(cpu_data)[cpu];
-
-        if (cpu >= NR_CPUS || !cpu_online(cpu))
-                return -ENXIO;  /* No such CPU */
-        if (!cpu_has(c, X86_FEATURE_MSR))
-                return -EIO;    /* MSR not supported */
-
-        return 0;
-}
-
-/*
- * File operations we support
- */
-static struct file_operations msr_fops = {
-        .owner = THIS_MODULE,
-        .llseek = msr_seek,
-        .read = msr_read,
-        .write = msr_write,
-        .open = msr_open,
-};
-
-static int __init msr_init(void)
-{
-        if (register_chrdev(MSR_MAJOR, "cpu/msr", &msr_fops)) {
-                printk(KERN_ERR "msr: unable to get major %d for msr\n",
-                       MSR_MAJOR);
-                return -EBUSY;
-        }
-
-        return 0;
-}
-
-static void __exit msr_exit(void)
-{
-        unregister_chrdev(MSR_MAJOR, "cpu/msr");
-}
-
-module_init(msr_init);
-module_exit(msr_exit)
-
-MODULE_AUTHOR("H. Peter Anvin <hpa@zytor.com>");
-MODULE_DESCRIPTION("x86 generic MSR driver");
-MODULE_LICENSE("GPL");
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index caf164959e19..4388b8a5bae7 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -14,7 +14,6 @@
 
 #include <linux/config.h>
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/bootmem.h>
 #include <linux/smp_lock.h>
@@ -488,8 +487,8 @@ void nmi_watchdog_tick (struct pt_regs * regs, unsigned reason)
                                                         == NOTIFY_STOP) {
                                 local_set(&__get_cpu_var(alert_counter), 0);
                                 return;
-                        } 
-                        die_nmi("NMI Watchdog detected LOCKUP on CPU%d", regs);
+                        }
+                        die_nmi("NMI Watchdog detected LOCKUP on CPU %d\n", regs);
                 }
         } else {
                 __get_cpu_var(last_irq_sum) = sum;
diff --git a/arch/x86_64/kernel/pci-gart.c b/arch/x86_64/kernel/pci-gart.c
index 57f35c68aa34..cf0a0315d586 100644
--- a/arch/x86_64/kernel/pci-gart.c
+++ b/arch/x86_64/kernel/pci-gart.c
@@ -191,11 +191,9 @@ static void *dma_alloc_pages(struct device *dev, unsigned gfp, unsigned order)
 {
         struct page *page;
         int node;
-        if (dev->bus == &pci_bus_type) {
-                cpumask_t mask;
-                mask = pcibus_to_cpumask(to_pci_dev(dev)->bus);
-                node = cpu_to_node(first_cpu(mask));
-        } else
+        if (dev->bus == &pci_bus_type)
+                node = pcibus_to_node(to_pci_dev(dev)->bus);
+        else
                 node = numa_node_id();
         page = alloc_pages_node(node, gfp, order);
         return page ? page_address(page) : NULL;
diff --git a/arch/x86_64/kernel/process.c b/arch/x86_64/kernel/process.c
index 8661f82ac70b..b5a89c0bdf59 100644
--- a/arch/x86_64/kernel/process.c
+++ b/arch/x86_64/kernel/process.c
@@ -32,7 +32,6 @@
 #include <linux/a.out.h>
 #include <linux/interrupt.h>
 #include <linux/delay.h>
-#include <linux/irq.h>
 #include <linux/ptrace.h>
 #include <linux/utsname.h>
 #include <linux/random.h>
@@ -123,6 +122,7 @@ static void poll_idle (void)
                         : :
                         "i" (_TIF_NEED_RESCHED), 
                         "m" (current_thread_info()->flags));
+                clear_thread_flag(TIF_POLLING_NRFLAG);
         } else {
                 set_need_resched();
         }
@@ -271,8 +271,11 @@ void __show_regs(struct pt_regs * regs)
 
         printk("\n");
         print_modules();
-        printk("Pid: %d, comm: %.20s %s %s\n", 
-               current->pid, current->comm, print_tainted(), system_utsname.release);
+        printk("Pid: %d, comm: %.20s %s %s %.*s\n",
+                current->pid, current->comm, print_tainted(),
+                system_utsname.release,
+                (int)strcspn(system_utsname.version, " "),
+                system_utsname.version);
         printk("RIP: %04lx:[<%016lx>] ", regs->cs & 0xffff, regs->rip);
         printk_address(regs->rip); 
         printk("\nRSP: %04lx:%016lx  EFLAGS: %08lx\n", regs->ss, regs->rsp, regs->eflags);
@@ -483,33 +486,6 @@ out:
 }
 
 /*
- * This function selects if the context switch from prev to next
- * has to tweak the TSC disable bit in the cr4.
- */
-static inline void disable_tsc(struct task_struct *prev_p,
-                               struct task_struct *next_p)
-{
-        struct thread_info *prev, *next;
-
-        /*
-         * gcc should eliminate the ->thread_info dereference if
-         * has_secure_computing returns 0 at compile time (SECCOMP=n).
-         */
-        prev = prev_p->thread_info;
-        next = next_p->thread_info;
-
-        if (has_secure_computing(prev) || has_secure_computing(next)) {
-                /* slow path here */
-                if (has_secure_computing(prev) &&
-                    !has_secure_computing(next)) {
-                        write_cr4(read_cr4() & ~X86_CR4_TSD);
-                } else if (!has_secure_computing(prev) &&
-                           has_secure_computing(next))
-                        write_cr4(read_cr4() | X86_CR4_TSD);
-        }
-}
-
-/*
  * This special macro can be used to load a debugging register
  */
 #define loaddebug(thread,r) set_debug(thread->debugreg ## r, r)
@@ -627,8 +603,6 @@ struct task_struct *__switch_to(struct task_struct *prev_p, struct task_struct *
                 }
         }
 
-        disable_tsc(prev_p, next_p);
-
         return prev_p;
 }
 
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index b356f8e6adfe..351d8d64c2fb 100644
--- a/arch/x86_64/kernel/setup.c
+++ b/arch/x86_64/kernel/setup.c
@@ -71,7 +71,7 @@ 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();
@@ -336,6 +336,11 @@ static __init void parse_cmdline_early (char ** cmdline_p)
 #endif
 #endif
 
+                if (!memcmp(from, "disable_timer_pin_1", 19))
+                        disable_timer_pin_1 = 1;
+                if (!memcmp(from, "enable_timer_pin_1", 18))
+                        disable_timer_pin_1 = -1;
+
                 if (!memcmp(from, "nolapic", 7) ||
                     !memcmp(from, "disableapic", 11))
                         disable_apic = 1;
@@ -566,7 +571,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 +663,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.
          */
@@ -755,6 +760,24 @@ static void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
         }
 }
 
+#ifdef CONFIG_NUMA
+static int nearby_node(int apicid)
+{
+        int i;
+        for (i = apicid - 1; i >= 0; i--) {
+                int node = apicid_to_node[i];
+                if (node != NUMA_NO_NODE && node_online(node))
+                        return node;
+        }
+        for (i = apicid + 1; i < MAX_LOCAL_APIC; i++) {
+                int node = apicid_to_node[i];
+                if (node != NUMA_NO_NODE && node_online(node))
+                        return node;
+        }
+        return first_node(node_online_map); /* Shouldn't happen */
+}
+#endif
+
 /*
  * On a AMD dual core setup the lower bits of the APIC id distingush the cores.
  * Assumes number of cores is a power of two.
@@ -763,8 +786,11 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
 {
 #ifdef CONFIG_SMP
         int cpu = smp_processor_id();
-        int node = 0;
         unsigned bits;
+#ifdef CONFIG_NUMA
+        int node = 0;
+        unsigned apicid = phys_proc_id[cpu];
+#endif
 
         bits = 0;
         while ((1 << bits) < c->x86_num_cores)
@@ -776,20 +802,32 @@ static void __init amd_detect_cmp(struct cpuinfo_x86 *c)
         phys_proc_id[cpu] >>= bits;
 
 #ifdef CONFIG_NUMA
-        /* When an ACPI SRAT table is available use the mappings from SRAT
-           instead. */
-        if (acpi_numa <= 0) {
-                node = phys_proc_id[cpu];
-                if (!node_online(node))
-                        node = first_node(node_online_map);
-                cpu_to_node[cpu] = node;
-        } else {
-                node = cpu_to_node[cpu];
-        }
+        node = phys_proc_id[cpu];
+        if (apicid_to_node[apicid] != NUMA_NO_NODE)
+                node = apicid_to_node[apicid];
+        if (!node_online(node)) {
+                /* Two possibilities here:
+                   - The CPU is missing memory and no node was created.
+                   In that case try picking one from a nearby CPU
+                   - The APIC IDs differ from the HyperTransport node IDs
+                   which the K8 northbridge parsing fills in.
+                   Assume they are all increased by a constant offset,
+                   but in the same order as the HT nodeids.
+                   If that doesn't result in a usable node fall back to the
+                   path for the previous case.  */
+                int ht_nodeid = apicid - (phys_proc_id[0] << bits);
+                if (ht_nodeid >= 0 &&
+                    apicid_to_node[ht_nodeid] != NUMA_NO_NODE)
+                        node = apicid_to_node[ht_nodeid];
+                /* Pick a nearby node */
+                if (!node_online(node))
+                        node = nearby_node(apicid);
+        }
+        cpu_to_node[cpu] = node;
+
+        printk(KERN_INFO "CPU %d(%d) -> Node %d -> Core %d\n",
+                        cpu, c->x86_num_cores, node, cpu_core_id[cpu]);
 #endif
-
-        printk(KERN_INFO "CPU %d(%d) -> Node %d -> Core %d\n",
-                        cpu, c->x86_num_cores, node, cpu_core_id[cpu]);
 #endif
 }
 
@@ -909,6 +947,25 @@ static int __cpuinit intel_num_cpu_cores(struct cpuinfo_x86 *c)
                 return 1;
 }
 
+static void srat_detect_node(void)
+{
+#ifdef CONFIG_NUMA
+        unsigned apicid, node;
+        int cpu = smp_processor_id();
+
+        /* Don't do the funky fallback heuristics the AMD version employs
+           for now. */
+        apicid = phys_proc_id[cpu];
+        node = apicid_to_node[apicid];
+        if (node == NUMA_NO_NODE)
+                node = 0;
+        cpu_to_node[cpu] = node;
+
+        if (acpi_numa > 0)
+                printk(KERN_INFO "CPU %d -> Node %d\n", cpu, node);
+#endif
+}
+
 static void __cpuinit init_intel(struct cpuinfo_x86 *c)
 {
         /* Cache sizes */
@@ -927,9 +984,11 @@ static void __cpuinit init_intel(struct cpuinfo_x86 *c)
         if (c->x86 >= 15)
                 set_bit(X86_FEATURE_CONSTANT_TSC, &c->x86_capability);
         c->x86_num_cores = intel_num_cpu_cores(c);
+
+        srat_detect_node();
 }
 
-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 e3ffcacc8c90..bd33be24a386 100644
--- a/arch/x86_64/kernel/setup64.c
+++ b/arch/x86_64/kernel/setup64.c
@@ -94,7 +94,7 @@ void __init setup_per_cpu_areas(void)
                 size = PERCPU_ENOUGH_ROOM;
 #endif
 
-        for (i = 0; i < NR_CPUS; i++) { 
+        for_each_cpu_mask (i, cpu_possible_map) {
                 char *ptr;
 
                 if (!NODE_DATA(cpu_to_node(i))) {
@@ -119,7 +119,6 @@ void pda_init(int cpu)
         asm volatile("movl %0,%%fs ; movl %0,%%gs" :: "r" (0)); 
         wrmsrl(MSR_GS_BASE, cpu_pda + cpu);
 
-        pda->me = pda;
         pda->cpunumber = cpu; 
         pda->irqcount = -1;
         pda->kernelstack = 
diff --git a/arch/x86_64/kernel/smp.c b/arch/x86_64/kernel/smp.c
index e5958220d6b8..9db9dda161b4 100644
--- a/arch/x86_64/kernel/smp.c
+++ b/arch/x86_64/kernel/smp.c
@@ -12,7 +12,6 @@
 #include <linux/init.h>
 
 #include <linux/mm.h>
-#include <linux/irq.h>
 #include <linux/delay.h>
 #include <linux/spinlock.h>
 #include <linux/smp_lock.h>
@@ -29,6 +28,8 @@
 #include <asm/proto.h>
 #include <asm/apicdef.h>
 
+#define __cpuinit __init
+
 /*
  *      Smarter SMP flushing macros. 
  *              c/o Linus Torvalds.
@@ -37,19 +38,41 @@
  *      writing to user space from interrupts. (Its not allowed anyway).
  *
  *      Optimizations Manfred Spraul <manfred@colorfullife.com>
+ *
+ *      More scalable flush, from Andi Kleen
+ *
+ *      To avoid global state use 8 different call vectors.
+ *      Each CPU uses a specific vector to trigger flushes on other
+ *      CPUs. Depending on the received vector the target CPUs look into
+ *      the right per cpu variable for the flush data.
+ *
+ *      With more than 8 CPUs they are hashed to the 8 available
+ *      vectors. The limited global vector space forces us to this right now.
+ *      In future when interrupts are split into per CPU domains this could be
+ *      fixed, at the cost of triggering multiple IPIs in some cases.
  */
 
-static cpumask_t flush_cpumask;
-static struct mm_struct * flush_mm;
-static unsigned long flush_va;
-static DEFINE_SPINLOCK(tlbstate_lock);
+union smp_flush_state {
+        struct {
+                cpumask_t flush_cpumask;
+                struct mm_struct *flush_mm;
+                unsigned long flush_va;
 #define FLUSH_ALL       -1ULL
+                spinlock_t tlbstate_lock;
+        };
+        char pad[SMP_CACHE_BYTES];
+} ____cacheline_aligned;
+
+/* State is put into the per CPU data section, but padded
+   to a full cache line because other CPUs can access it and we don't
+   want false sharing in the per cpu data segment. */
+static DEFINE_PER_CPU(union smp_flush_state, flush_state);
 
 /*
  * We cannot call mmdrop() because we are in interrupt context, 
  * instead update mm->cpu_vm_mask.
  */
-static inline void leave_mm (unsigned long cpu)
+static inline void leave_mm(int cpu)
 {
         if (read_pda(mmu_state) == TLBSTATE_OK)
                 BUG();
@@ -101,15 +124,25 @@ static inline void leave_mm (unsigned long cpu)
  *
  * 1) Flush the tlb entries if the cpu uses the mm that's being flushed.
  * 2) Leave the mm if we are in the lazy tlb mode.
+ *
+ * Interrupts are disabled.
  */
 
-asmlinkage void smp_invalidate_interrupt (void)
+asmlinkage void smp_invalidate_interrupt(struct pt_regs *regs)
 {
-        unsigned long cpu;
+        int cpu;
+        int sender;
+        union smp_flush_state *f;
 
-        cpu = get_cpu();
+        cpu = smp_processor_id();
+        /*
+         * orig_rax contains the interrupt vector - 256.
+         * Use that to determine where the sender put the data.
+         */
+        sender = regs->orig_rax + 256 - INVALIDATE_TLB_VECTOR_START;
+        f = &per_cpu(flush_state, sender);
 
-        if (!cpu_isset(cpu, flush_cpumask))
+        if (!cpu_isset(cpu, f->flush_cpumask))
                 goto out;
                 /* 
                  * This was a BUG() but until someone can quote me the
@@ -120,64 +153,63 @@ asmlinkage void smp_invalidate_interrupt (void)
                  * BUG();
                  */
                  
-        if (flush_mm == read_pda(active_mm)) {
+        if (f->flush_mm == read_pda(active_mm)) {
                 if (read_pda(mmu_state) == TLBSTATE_OK) {
-                        if (flush_va == FLUSH_ALL)
+                        if (f->flush_va == FLUSH_ALL)
                                 local_flush_tlb();
                         else
-                                __flush_tlb_one(flush_va);
+                                __flush_tlb_one(f->flush_va);
                 } else
                         leave_mm(cpu);
         }
 out:
         ack_APIC_irq();
-        cpu_clear(cpu, flush_cpumask);
-        put_cpu_no_resched();
+        cpu_clear(cpu, f->flush_cpumask);
 }
 
 static void flush_tlb_others(cpumask_t cpumask, struct mm_struct *mm,
                                                 unsigned long va)
 {
-        cpumask_t tmp;
-        /*
-         * A couple of (to be removed) sanity checks:
-         *
-         * - we do not send IPIs to not-yet booted CPUs.
-         * - current CPU must not be in mask
-         * - mask must exist :)
-         */
-        BUG_ON(cpus_empty(cpumask));
-        cpus_and(tmp, cpumask, cpu_online_map);
-        BUG_ON(!cpus_equal(tmp, cpumask));
-        BUG_ON(cpu_isset(smp_processor_id(), cpumask));
-        if (!mm)
-                BUG();
+        int sender;
+        union smp_flush_state *f;
 
-        /*
-         * I'm not happy about this global shared spinlock in the
-         * MM hot path, but we'll see how contended it is.
-         * Temporarily this turns IRQs off, so that lockups are
-         * detected by the NMI watchdog.
-         */
-        spin_lock(&tlbstate_lock);
-        
-        flush_mm = mm;
-        flush_va = va;
-        cpus_or(flush_cpumask, cpumask, flush_cpumask);
+        /* Caller has disabled preemption */
+        sender = smp_processor_id() % NUM_INVALIDATE_TLB_VECTORS;
+        f = &per_cpu(flush_state, sender);
+
+        /* Could avoid this lock when
+           num_online_cpus() <= NUM_INVALIDATE_TLB_VECTORS, but it is
+           probably not worth checking this for a cache-hot lock. */
+        spin_lock(&f->tlbstate_lock);
+
+        f->flush_mm = mm;
+        f->flush_va = va;
+        cpus_or(f->flush_cpumask, cpumask, f->flush_cpumask);
 
         /*
          * We have to send the IPI only to
          * CPUs affected.
          */
-        send_IPI_mask(cpumask, INVALIDATE_TLB_VECTOR);
+        send_IPI_mask(cpumask, INVALIDATE_TLB_VECTOR_START + sender);
+
+        while (!cpus_empty(f->flush_cpumask))
+                cpu_relax();
 
-        while (!cpus_empty(flush_cpumask))
-                mb();   /* nothing. lockup detection does not belong here */;
+        f->flush_mm = NULL;
+        f->flush_va = 0;
+        spin_unlock(&f->tlbstate_lock);
+}
 
-        flush_mm = NULL;
-        flush_va = 0;
-        spin_unlock(&tlbstate_lock);
+int __cpuinit init_smp_flush(void)
+{
+        int i;
+        for_each_cpu_mask(i, cpu_possible_map) {
+                spin_lock_init(&per_cpu(flush_state.tlbstate_lock, i));
+        }
+        return 0;
 }
+
+core_initcall(init_smp_flush);
         
 void flush_tlb_current_task(void)
 {
@@ -295,8 +327,11 @@ void unlock_ipi_call_lock(void)
 /*
  * this function sends a 'generic call function' IPI to one other CPU
  * in the system.
+ *
+ * cpu is a standard Linux logical CPU number.
  */
-static void __smp_call_function_single (int cpu, void (*func) (void *info), void *info,
+static void
+__smp_call_function_single(int cpu, void (*func) (void *info), void *info,
                                 int nonatomic, int wait)
 {
         struct call_data_struct data;
diff --git a/arch/x86_64/kernel/smpboot.c b/arch/x86_64/kernel/smpboot.c
index 90aeccd15190..e12d7baeb33e 100644
--- a/arch/x86_64/kernel/smpboot.c
+++ b/arch/x86_64/kernel/smpboot.c
@@ -44,7 +44,6 @@
 #include <linux/mm.h>
 #include <linux/kernel_stat.h>
 #include <linux/smp_lock.h>
-#include <linux/irq.h>
 #include <linux/bootmem.h>
 #include <linux/thread_info.h>
 #include <linux/module.h>
@@ -58,6 +57,8 @@
 #include <asm/tlbflush.h>
 #include <asm/proto.h>
 #include <asm/nmi.h>
+#include <asm/irq.h>
+#include <asm/hw_irq.h>
 
 /* Number of siblings per CPU package */
 int smp_num_siblings = 1;
@@ -413,8 +414,13 @@ void __cpuinit smp_callin(void)
 
         /*
          * Get our bogomips.
+         *
+         * Need to enable IRQs because it can take longer and then
+         * the NMI watchdog might kill us.
          */
+        local_irq_enable();
         calibrate_delay();
+        local_irq_disable();
         Dprintk("Stack at about %p\n",&cpuid);
 
         disable_APIC_timer();
@@ -540,8 +546,8 @@ static void inquire_remote_apic(int apicid)
                  */
                 apic_wait_icr_idle();
 
-                apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
-                apic_write_around(APIC_ICR, APIC_DM_REMRD | regs[i]);
+                apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(apicid));
+                apic_write(APIC_ICR, APIC_DM_REMRD | regs[i]);
 
                 timeout = 0;
                 do {
@@ -574,12 +580,12 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
         /*
          * Turn INIT on target chip
          */
-        apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
+        apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
 
         /*
          * Send IPI
          */
-        apic_write_around(APIC_ICR, APIC_INT_LEVELTRIG | APIC_INT_ASSERT
+        apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_INT_ASSERT
                                 | APIC_DM_INIT);
 
         Dprintk("Waiting for send to finish...\n");
@@ -595,10 +601,10 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
         Dprintk("Deasserting INIT.\n");
 
         /* Target chip */
-        apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
+        apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
 
         /* Send IPI */
-        apic_write_around(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);
+        apic_write(APIC_ICR, APIC_INT_LEVELTRIG | APIC_DM_INIT);
 
         Dprintk("Waiting for send to finish...\n");
         timeout = 0;
@@ -610,16 +616,7 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
 
         atomic_set(&init_deasserted, 1);
 
-        /*
-         * Should we send STARTUP IPIs ?
-         *
-         * Determine this based on the APIC version.
-         * If we don't have an integrated APIC, don't send the STARTUP IPIs.
-         */
-        if (APIC_INTEGRATED(apic_version[phys_apicid]))
-                num_starts = 2;
-        else
-                num_starts = 0;
+        num_starts = 2;
 
         /*
          * Run STARTUP IPI loop.
@@ -640,12 +637,11 @@ static int __cpuinit wakeup_secondary_via_INIT(int phys_apicid, unsigned int sta
                  */
 
                 /* Target chip */
-                apic_write_around(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
+                apic_write(APIC_ICR2, SET_APIC_DEST_FIELD(phys_apicid));
 
                 /* Boot on the stack */
                 /* Kick the second */
-                apic_write_around(APIC_ICR, APIC_DM_STARTUP
-                                        | (start_rip >> 12));
+                apic_write(APIC_ICR, APIC_DM_STARTUP | (start_rip >> 12));
 
                 /*
                  * Give the other CPU some time to accept the IPI.
@@ -864,17 +860,6 @@ static __cpuinit void smp_cleanup_boot(void)
          * Reset trampoline flag
          */
         *((volatile int *) phys_to_virt(0x467)) = 0;
-
-#ifndef CONFIG_HOTPLUG_CPU
-        /*
-         * Free pages reserved for SMP bootup.
-         * When you add hotplug CPU support later remove this
-         * Note there is more work to be done for later CPU bootup.
-         */
-
-        free_page((unsigned long) __va(PAGE_SIZE));
-        free_page((unsigned long) __va(SMP_TRAMPOLINE_BASE));
-#endif
 }
 
 /*
@@ -894,23 +879,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 +967,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.c b/arch/x86_64/kernel/suspend.c
index 0612640d91b1..ebb9abf3ce6d 100644
--- a/arch/x86_64/kernel/suspend.c
+++ b/arch/x86_64/kernel/suspend.c
@@ -8,23 +8,8 @@
  */
 
 #include <linux/config.h>
-#include <linux/kernel.h>
-#include <linux/module.h>
-#include <linux/init.h>
-#include <linux/types.h>
-#include <linux/spinlock.h>
-#include <linux/poll.h>
-#include <linux/delay.h>
-#include <linux/sysrq.h>
-#include <linux/proc_fs.h>
-#include <linux/irq.h>
-#include <linux/pm.h>
-#include <linux/device.h>
+#include <linux/smp.h>
 #include <linux/suspend.h>
-#include <asm/uaccess.h>
-#include <asm/acpi.h>
-#include <asm/tlbflush.h>
-#include <asm/io.h>
 #include <asm/proto.h>
 
 struct saved_context saved_context;
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 7b6abe058253..2373cb8b8625 100644
--- a/arch/x86_64/kernel/time.c
+++ b/arch/x86_64/kernel/time.c
@@ -18,7 +18,6 @@
 #include <linux/interrupt.h>
 #include <linux/init.h>
 #include <linux/mc146818rtc.h>
-#include <linux/irq.h>
 #include <linux/time.h>
 #include <linux/ioport.h>
 #include <linux/module.h>
@@ -937,7 +936,6 @@ void __init time_init(void)
         vxtime.mode = VXTIME_TSC;
         vxtime.quot = (1000000L << 32) / vxtime_hz;
         vxtime.tsc_quot = (1000L << 32) / cpu_khz;
-        vxtime.hz = vxtime_hz;
         rdtscll_sync(&vxtime.last_tsc);
         setup_irq(0, &irq0);
 
diff --git a/arch/x86_64/kernel/traps.c b/arch/x86_64/kernel/traps.c
index f238d6078a5a..b5e09e6b5536 100644
--- a/arch/x86_64/kernel/traps.c
+++ b/arch/x86_64/kernel/traps.c
@@ -47,9 +47,6 @@
 #include <asm/proto.h>
 #include <asm/nmi.h>
 
-#include <linux/irq.h>
-
-
 extern struct gate_struct idt_table[256]; 
 
 asmlinkage void divide_error(void);
@@ -324,13 +321,13 @@ void handle_BUG(struct pt_regs *regs)
         if (__copy_from_user(&f, (struct bug_frame *) regs->rip, 
                              sizeof(struct bug_frame)))
                 return; 
-        if ((unsigned long)f.filename < __PAGE_OFFSET || 
+        if (f.filename >= 0 ||
             f.ud2[0] != 0x0f || f.ud2[1] != 0x0b) 
                 return;
-        if (__get_user(tmp, f.filename))
-                f.filename = "unmapped filename"; 
+        if (__get_user(tmp, (char *)(long)f.filename))
+                f.filename = (int)(long)"unmapped filename";
         printk("----------- [cut here ] --------- [please bite here ] ---------\n");
-        printk(KERN_ALERT "Kernel BUG at %.50s:%d\n", f.filename, f.line);
+        printk(KERN_ALERT "Kernel BUG at %.50s:%d\n", (char *)(long)f.filename, f.line);
 } 
 
 #ifdef CONFIG_BUG
@@ -343,30 +340,33 @@ void out_of_line_bug(void)
 static DEFINE_SPINLOCK(die_lock);
 static int die_owner = -1;
 
-void oops_begin(void)
+unsigned long oops_begin(void)
 {
-        int cpu = safe_smp_processor_id(); 
-        /* racy, but better than risking deadlock. */ 
-        local_irq_disable();
+        int cpu = safe_smp_processor_id();
+        unsigned long flags;
+
+        /* racy, but better than risking deadlock. */
+        local_irq_save(flags);
         if (!spin_trylock(&die_lock)) { 
                 if (cpu == die_owner) 
                         /* nested oops. should stop eventually */;
                 else
-                        spin_lock(&die_lock); 
+                        spin_lock(&die_lock);
         }
-        die_owner = cpu; 
+        die_owner = cpu;
         console_verbose();
-        bust_spinlocks(1); 
+        bust_spinlocks(1);
+        return flags;
 }
 
-void oops_end(void)
+void oops_end(unsigned long flags)
 { 
         die_owner = -1;
-        bust_spinlocks(0); 
-        spin_unlock(&die_lock); 
+        bust_spinlocks(0);
+        spin_unlock_irqrestore(&die_lock, flags);
         if (panic_on_oops)
-                panic("Oops"); 
-} 
+                panic("Oops");
+}
 
 void __die(const char * str, struct pt_regs * regs, long err)
 {
@@ -392,10 +392,11 @@ void __die(const char * str, struct pt_regs * regs, long err)
 
 void die(const char * str, struct pt_regs * regs, long err)
 {
-        oops_begin();
+        unsigned long flags = oops_begin();
+
         handle_BUG(regs);
         __die(str, regs, err);
-        oops_end();
+        oops_end(flags);
         do_exit(SIGSEGV); 
 }
 static inline void die_if_kernel(const char * str, struct pt_regs * regs, long err)
@@ -406,7 +407,8 @@ static inline void die_if_kernel(const char * str, struct pt_regs * regs, long e
 
 void die_nmi(char *str, struct pt_regs *regs)
 {
-        oops_begin();
+        unsigned long flags = oops_begin();
+
         /*
          * We are in trouble anyway, lets at least try
          * to get a message out.
@@ -416,7 +418,7 @@ void die_nmi(char *str, struct pt_regs *regs)
         if (panic_on_timeout || panic_on_oops)
                 panic("nmi watchdog");
         printk("console shuts up ...\n");
-        oops_end();
+        oops_end(flags);
         do_exit(SIGSEGV);
 }
 
@@ -790,13 +792,16 @@ asmlinkage void do_coprocessor_error(struct pt_regs *regs)
          */
         cwd = get_fpu_cwd(task);
         swd = get_fpu_swd(task);
-        switch (((~cwd) & swd & 0x3f) | (swd & 0x240)) {
+        switch (swd & ~cwd & 0x3f) {
                 case 0x000:
                 default:
                         break;
                 case 0x001: /* Invalid Op */
-                case 0x041: /* Stack Fault */
-                case 0x241: /* Stack Fault | Direction */
+                        /*
+                         * swd & 0x240 == 0x040: Stack Underflow
+                         * swd & 0x240 == 0x240: Stack Overflow
+                         * User must clear the SF bit (0x40) if set
+                         */
                         info.si_code = FPE_FLTINV;
                         break;
                 case 0x002: /* Denormalize */
diff --git a/arch/x86_64/kernel/vmlinux.lds.S b/arch/x86_64/kernel/vmlinux.lds.S
index d4abb07af52d..6dd642cad2ef 100644
--- a/arch/x86_64/kernel/vmlinux.lds.S
+++ b/arch/x86_64/kernel/vmlinux.lds.S
@@ -194,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/kernel/vsyscall.c b/arch/x86_64/kernel/vsyscall.c
index 2e5734425949..70a0bd16085f 100644
--- a/arch/x86_64/kernel/vsyscall.c
+++ b/arch/x86_64/kernel/vsyscall.c
@@ -107,7 +107,7 @@ static force_inline long time_syscall(long *t)
         return secs;
 }
 
-static int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
+int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz)
 {
         if (unlikely(!__sysctl_vsyscall))
                 return gettimeofday(tv,tz);
@@ -120,7 +120,7 @@ static int __vsyscall(0) vgettimeofday(struct timeval * tv, struct timezone * tz
 
 /* This will break when the xtime seconds get inaccurate, but that is
  * unlikely */
-static time_t __vsyscall(1) vtime(time_t *t)
+time_t __vsyscall(1) vtime(time_t *t)
 {
         if (unlikely(!__sysctl_vsyscall))
                 return time_syscall(t);
@@ -129,12 +129,12 @@ static time_t __vsyscall(1) vtime(time_t *t)
         return __xtime.tv_sec;
 }
 
-static long __vsyscall(2) venosys_0(void)
+long __vsyscall(2) venosys_0(void)
 {
         return -ENOSYS;
 }
 
-static long __vsyscall(3) venosys_1(void)
+long __vsyscall(3) venosys_1(void)
 {
         return -ENOSYS;
 }
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 816732d8858c..b75b872ec154 100644
--- a/arch/x86_64/mm/fault.c
+++ b/arch/x86_64/mm/fault.c
@@ -221,12 +221,13 @@ int unhandled_signal(struct task_struct *tsk, int sig)
 static noinline void pgtable_bad(unsigned long address, struct pt_regs *regs,
                                  unsigned long error_code)
 {
-        oops_begin();
+        unsigned long flags = oops_begin();
+
         printk(KERN_ALERT "%s: Corrupted page table at address %lx\n",
                current->comm, address);
         dump_pagetable(address);
         __die("Bad pagetable", regs, error_code);
-        oops_end();
+        oops_end(flags);
         do_exit(SIGKILL);
 }
 
@@ -304,6 +305,7 @@ asmlinkage void __kprobes do_page_fault(struct pt_regs *regs,
         unsigned long address;
         const struct exception_table_entry *fixup;
         int write;
+        unsigned long flags;
         siginfo_t info;
 
 #ifdef CONFIG_CHECKING
@@ -521,7 +523,7 @@ no_context:
  * terminate things with extreme prejudice.
  */
 
-        oops_begin(); 
+        flags = oops_begin();
 
         if (address < PAGE_SIZE)
                 printk(KERN_ALERT "Unable to handle kernel NULL pointer dereference");
@@ -534,7 +536,7 @@ no_context:
         __die("Oops", regs, error_code);
         /* Executive summary in case the body of the oops scrolled away */
         printk(KERN_EMERG "CR2: %016lx\n", address);
-        oops_end(); 
+        oops_end(flags);
         do_exit(SIGKILL);
 
 /*
diff --git a/arch/x86_64/mm/init.c b/arch/x86_64/mm/init.c
index aa4a5189ecee..e60a1a848de8 100644
--- a/arch/x86_64/mm/init.c
+++ b/arch/x86_64/mm/init.c
@@ -57,31 +57,31 @@ DEFINE_PER_CPU(struct mmu_gather, mmu_gathers);
 
 void show_mem(void)
 {
-        int i, total = 0, reserved = 0;
-        int shared = 0, cached = 0;
+        long i, total = 0, reserved = 0;
+        long shared = 0, cached = 0;
         pg_data_t *pgdat;
         struct page *page;
 
-        printk("Mem-info:\n");
+        printk(KERN_INFO "Mem-info:\n");
         show_free_areas();
-        printk("Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
+        printk(KERN_INFO "Free swap:       %6ldkB\n", nr_swap_pages<<(PAGE_SHIFT-10));
 
         for_each_pgdat(pgdat) {
                for (i = 0; i < pgdat->node_spanned_pages; ++i) {
                         page = pfn_to_page(pgdat->node_start_pfn + i);
                         total++;
-                       if (PageReserved(page))
-                        reserved++;
-                       else if (PageSwapCache(page))
-                        cached++;
-                       else if (page_count(page))
-                               shared += page_count(page) - 1;
+                        if (PageReserved(page))
+                                reserved++;
+                        else if (PageSwapCache(page))
+                                cached++;
+                        else if (page_count(page))
+                                shared += page_count(page) - 1;
                }
         }
-        printk("%d pages of RAM\n", total);
-        printk("%d reserved pages\n",reserved);
-        printk("%d pages shared\n",shared);
-        printk("%d pages swap cached\n",cached);
+        printk(KERN_INFO "%lu pages of RAM\n", total);
+        printk(KERN_INFO "%lu reserved pages\n",reserved);
+        printk(KERN_INFO "%lu pages shared\n",shared);
+        printk(KERN_INFO "%lu pages swap cached\n",cached);
 }
 
 /* References to section boundaries */
@@ -381,41 +381,14 @@ void __init clear_kernel_mapping(unsigned long address, unsigned long size)
         __flush_tlb_all();
 } 
 
-static inline int page_is_ram (unsigned long pagenr)
-{
-        int i;
-
-        for (i = 0; i < e820.nr_map; i++) {
-                unsigned long addr, end;
-
-                if (e820.map[i].type != E820_RAM)       /* not usable memory */
-                        continue;
-                /*
-                 *      !!!FIXME!!! Some BIOSen report areas as RAM that
-                 *      are not. Notably the 640->1Mb area. We need a sanity
-                 *      check here.
-                 */
-                addr = (e820.map[i].addr+PAGE_SIZE-1) >> PAGE_SHIFT;
-                end = (e820.map[i].addr+e820.map[i].size) >> PAGE_SHIFT;
-                if  ((pagenr >= addr) && (pagenr < end))
-                        return 1;
-        }
-        return 0;
-}
-
-extern int swiotlb_force;
-
 static struct kcore_list kcore_mem, kcore_vmalloc, kcore_kernel, kcore_modules,
                          kcore_vsyscall;
 
 void __init mem_init(void)
 {
-        int codesize, reservedpages, datasize, initsize;
-        int tmp;
+        long codesize, reservedpages, datasize, initsize;
 
 #ifdef CONFIG_SWIOTLB
-        if (swiotlb_force)
-                swiotlb = 1;
         if (!iommu_aperture &&
             (end_pfn >= 0xffffffff>>PAGE_SHIFT || force_iommu))
                swiotlb = 1;
@@ -436,25 +409,11 @@ void __init mem_init(void)
 
         /* this will put all low memory onto the freelists */
 #ifdef CONFIG_NUMA
-        totalram_pages += numa_free_all_bootmem();
-        tmp = 0;
-        /* should count reserved pages here for all nodes */ 
+        totalram_pages = numa_free_all_bootmem();
 #else
-
-#ifdef CONFIG_FLATMEM
-        max_mapnr = end_pfn;
-        if (!mem_map) BUG();
-#endif
-
-        totalram_pages += free_all_bootmem();
-
-        for (tmp = 0; tmp < end_pfn; tmp++)
-                /*
-                 * Only count reserved RAM pages
-                 */
-                if (page_is_ram(tmp) && PageReserved(pfn_to_page(tmp)))
-                        reservedpages++;
+        totalram_pages = free_all_bootmem();
 #endif
+        reservedpages = end_pfn - totalram_pages - e820_hole_size(0, end_pfn);
 
         after_bootmem = 1;
 
@@ -471,7 +430,7 @@ void __init mem_init(void)
         kclist_add(&kcore_vsyscall, (void *)VSYSCALL_START, 
                                  VSYSCALL_END - VSYSCALL_START);
 
-        printk("Memory: %luk/%luk available (%dk kernel code, %dk reserved, %dk data, %dk init)\n",
+        printk("Memory: %luk/%luk available (%ldk kernel code, %ldk reserved, %ldk data, %ldk init)\n",
                 (unsigned long) nr_free_pages() << (PAGE_SHIFT-10),
                 end_pfn << (PAGE_SHIFT-10),
                 codesize >> 10,
diff --git a/arch/x86_64/mm/k8topology.c b/arch/x86_64/mm/k8topology.c
index ec35747aacd7..65417b040c1b 100644
--- a/arch/x86_64/mm/k8topology.c
+++ b/arch/x86_64/mm/k8topology.c
@@ -45,10 +45,12 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
         unsigned long prevbase;
         struct node nodes[8];
         int nodeid, i, nb; 
+        unsigned char nodeids[8];
         int found = 0;
         u32 reg;
         unsigned numnodes;
         nodemask_t nodes_parsed;
+        unsigned dualcore = 0;
 
         nodes_clear(nodes_parsed);
 
@@ -67,11 +69,15 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
         prevbase = 0;
         for (i = 0; i < 8; i++) { 
                 unsigned long base,limit; 
-
+                u32 nodeid;
+                
+                /* Undefined before E stepping, but hopefully 0 */
+                dualcore |= ((read_pci_config(0, nb, 3, 0xe8) >> 12) & 3) == 1;
                 base = read_pci_config(0, nb, 1, 0x40 + i*8);
                 limit = read_pci_config(0, nb, 1, 0x44 + i*8);
 
                 nodeid = limit & 7; 
+                nodeids[i] = nodeid;
                 if ((base & 3) == 0) { 
                         if (i < numnodes)
                                 printk("Skipping disabled node %d\n", i); 
@@ -157,8 +163,9 @@ int __init k8_scan_nodes(unsigned long start, unsigned long end)
 
         for (i = 0; i < 8; i++) {
                 if (nodes[i].start != nodes[i].end) { 
-                        /* assume 1:1 NODE:CPU */
-                        cpu_to_node[i] = i; 
+                        nodeid = nodeids[i];
+                        apicid_to_node[nodeid << dualcore] = i;
+                        apicid_to_node[(nodeid << dualcore) + dualcore] = i;
                         setup_node_bootmem(i, nodes[i].start, nodes[i].end); 
                 } 
         }
diff --git a/arch/x86_64/mm/numa.c b/arch/x86_64/mm/numa.c
index 04f7a33e144c..80a49d9bd8a7 100644
--- a/arch/x86_64/mm/numa.c
+++ b/arch/x86_64/mm/numa.c
@@ -28,8 +28,13 @@ bootmem_data_t plat_node_bdata[MAX_NUMNODES];
 int memnode_shift;
 u8  memnodemap[NODEMAPSIZE];
 
-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;
+unsigned char cpu_to_node[NR_CPUS] __read_mostly = {
+        [0 ... NR_CPUS-1] = NUMA_NO_NODE
+};
+unsigned char apicid_to_node[MAX_LOCAL_APIC] __cpuinitdata = {
+        [0 ... MAX_LOCAL_APIC-1] = NUMA_NO_NODE
+};
+cpumask_t node_to_cpumask[MAX_NUMNODES] __read_mostly;
 
 int numa_off __initdata;
 
diff --git a/arch/x86_64/mm/srat.c b/arch/x86_64/mm/srat.c
index 8e3d097a9ddd..4b2e844c15a7 100644
--- a/arch/x86_64/mm/srat.c
+++ b/arch/x86_64/mm/srat.c
@@ -20,14 +20,20 @@
 
 static struct acpi_table_slit *acpi_slit;
 
-/* Internal processor count */
-static unsigned int __initdata num_processors = 0;
-
 static nodemask_t nodes_parsed __initdata;
 static nodemask_t nodes_found __initdata;
 static struct node nodes[MAX_NUMNODES] __initdata;
 static __u8  pxm2node[256] = { [0 ... 255] = 0xff };
 
+static int node_to_pxm(int n);
+
+int pxm_to_node(int pxm)
+{
+        if ((unsigned)pxm >= 256)
+                return 0;
+        return pxm2node[pxm];
+}
+
 static __init int setup_node(int pxm)
 {
         unsigned node = pxm2node[pxm];
@@ -44,14 +50,14 @@ static __init int setup_node(int pxm)
 static __init int conflicting_nodes(unsigned long start, unsigned long end)
 {
         int i;
-        for_each_online_node(i) {
+        for_each_node_mask(i, nodes_parsed) {
                 struct node *nd = &nodes[i];
                 if (nd->start == nd->end)
                         continue;
                 if (nd->end > start && nd->start < end)
-                        return 1;
+                        return i;
                 if (nd->end == end && nd->start == start)
-                        return 1;
+                        return i;
         }
         return -1;
 }
@@ -75,8 +81,11 @@ static __init void cutoff_node(int i, unsigned long start, unsigned long end)
 
 static __init void bad_srat(void)
 {
+        int i;
         printk(KERN_ERR "SRAT: SRAT not used.\n");
         acpi_numa = -1;
+        for (i = 0; i < MAX_LOCAL_APIC; i++)
+                apicid_to_node[i] = NUMA_NO_NODE;
 }
 
 static __init inline int srat_disabled(void)
@@ -104,18 +113,10 @@ acpi_numa_processor_affinity_init(struct acpi_table_processor_affinity *pa)
                 bad_srat();
                 return;
         }
-        if (num_processors >= NR_CPUS) {
-                printk(KERN_ERR "SRAT: Processor #%d (lapic %u) INVALID. (Max ID: %d).\n",
-                        num_processors, pa->apic_id, NR_CPUS);
-                bad_srat();
-                return;
-        }
-        cpu_to_node[num_processors] = node;
+        apicid_to_node[pa->apic_id] = node;
         acpi_numa = 1;
-        printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> CPU %u -> Node %u\n",
-               pxm, pa->apic_id, num_processors, node);
-
-        num_processors++;
+        printk(KERN_INFO "SRAT: PXM %u -> APIC %u -> Node %u\n",
+               pxm, pa->apic_id, node);
 }
 
 /* Callback for parsing of the Proximity Domain <-> Memory Area mappings */
@@ -143,10 +144,15 @@ acpi_numa_memory_affinity_init(struct acpi_table_memory_affinity *ma)
                 printk(KERN_INFO "SRAT: hot plug zone found %lx - %lx \n",
                                 start, end);
         i = conflicting_nodes(start, end);
-        if (i >= 0) {
+        if (i == node) {
+                printk(KERN_WARNING
+                "SRAT: Warning: PXM %d (%lx-%lx) overlaps with itself (%Lx-%Lx)\n",
+                        pxm, start, end, nodes[i].start, nodes[i].end);
+        } else if (i >= 0) {
                 printk(KERN_ERR
-                       "SRAT: pxm %d overlap %lx-%lx with node %d(%Lx-%Lx)\n",
-                       pxm, start, end, i, nodes[i].start, nodes[i].end);
+                       "SRAT: PXM %d (%lx-%lx) overlaps with PXM %d (%Lx-%Lx)\n",
+                       pxm, start, end, node_to_pxm(i),
+                        nodes[i].start, nodes[i].end);
                 bad_srat();
                 return;
         }
@@ -174,6 +180,14 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
         int i;
         if (acpi_numa <= 0)
                 return -1;
+
+        /* First clean up the node list */
+        for_each_node_mask(i, nodes_parsed) {
+                cutoff_node(i, start, end);
+                if (nodes[i].start == nodes[i].end)
+                        node_clear(i, nodes_parsed);
+        }
+
         memnode_shift = compute_hash_shift(nodes, nodes_weight(nodes_parsed));
         if (memnode_shift < 0) {
                 printk(KERN_ERR
@@ -181,16 +195,10 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
                 bad_srat();
                 return -1;
         }
-        for (i = 0; i < MAX_NUMNODES; i++) {
-                if (!node_isset(i, nodes_parsed))
-                        continue;
-                cutoff_node(i, start, end);
-                if (nodes[i].start == nodes[i].end) { 
-                        node_clear(i, nodes_parsed);
-                        continue;
-                }
+
+        /* Finally register nodes */
+        for_each_node_mask(i, nodes_parsed)
                 setup_node_bootmem(i, nodes[i].start, nodes[i].end);
-        }
         for (i = 0; i < NR_CPUS; i++) { 
                 if (cpu_to_node[i] == NUMA_NO_NODE)
                         continue;
@@ -201,7 +209,7 @@ int __init acpi_scan_nodes(unsigned long start, unsigned long end)
         return 0;
 }
 
-int node_to_pxm(int n)
+static int node_to_pxm(int n)
 {
        int i;
        if (pxm2node[n] == n)
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/x86_64/pci/k8-bus.c b/arch/x86_64/pci/k8-bus.c
index d80c323669e0..3acf60ded2a0 100644
--- a/arch/x86_64/pci/k8-bus.c
+++ b/arch/x86_64/pci/k8-bus.c
@@ -58,10 +58,16 @@ fill_mp_bus_to_cpumask(void)
                                 for (j = SECONDARY_LDT_BUS_NUMBER(ldtbus);
                                      j <= SUBORDINATE_LDT_BUS_NUMBER(ldtbus);
                                      j++) { 
-                                        int node = NODE_ID(nid);
+                                        struct pci_bus *bus;
+                                        long node = NODE_ID(nid);
+                                        /* Algorithm a bit dumb, but
+                                           it shouldn't matter here */
+                                        bus = pci_find_bus(0, j);
+                                        if (!bus)
+                                                continue;
                                         if (!node_online(node))
                                                 node = 0;
-                                        pci_bus_to_node[j] = node;
+                                        bus->sysdata = (void *)node;
                                 }               
                         }
                 }
diff --git a/arch/x86_64/pci/mmconfig.c b/arch/x86_64/pci/mmconfig.c
index 657e88aa0902..a0838c4a94e4 100644
--- a/arch/x86_64/pci/mmconfig.c
+++ b/arch/x86_64/pci/mmconfig.c
@@ -111,13 +111,6 @@ static int __init pci_mmcfg_init(void)
             (pci_mmcfg_config[0].base_address == 0))
                 return 0;
 
-        /* Kludge for now. Don't use mmconfig on AMD systems because
-           those have some busses where mmconfig doesn't work,
-           and we don't parse ACPI MCFG well enough to handle that. 
-           Remove when proper handling is added. */
-        if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD)
-                return 0; 
-
         /* RED-PEN i386 doesn't do _nocache right now */
         pci_mmcfg_virt = kmalloc(sizeof(*pci_mmcfg_virt) * pci_mmcfg_config_num, GFP_KERNEL);
         if (pci_mmcfg_virt == NULL) {
diff --git a/arch/xtensa/Makefile b/arch/xtensa/Makefile
index 27847e4ffcbf..98fac8489aed 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
+archprepare: $(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/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>