24 files changed, 166 insertions, 87 deletions

diff --git a/arch/ia64/configs/sn2_defconfig b/arch/ia64/configs/sn2_defconfig
index e1924cc9687b..ff8bb3770c9d 100644
--- a/arch/ia64/configs/sn2_defconfig
+++ b/arch/ia64/configs/sn2_defconfig
@@ -113,7 +113,7 @@ CONFIG_IOSAPIC=y
 CONFIG_IA64_SGI_SN_XP=m
 CONFIG_FORCE_MAX_ZONEORDER=17
 CONFIG_SMP=y
-CONFIG_NR_CPUS=512
+CONFIG_NR_CPUS=1024
 # CONFIG_HOTPLUG_CPU is not set
 CONFIG_SCHED_SMT=y
 CONFIG_PREEMPT=y
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index 5b7e736f3b49..028a2b95936c 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -249,3 +249,32 @@ time_init (void)
          */
         set_normalized_timespec(&wall_to_monotonic, -xtime.tv_sec, -xtime.tv_nsec);
 }
+
+#define SMALLUSECS 100
+
+void
+udelay (unsigned long usecs)
+{
+        unsigned long start;
+        unsigned long cycles;
+        unsigned long smallusecs;
+
+        /*
+         * Execute the non-preemptible delay loop (because the ITC might
+         * not be synchronized between CPUS) in relatively short time
+         * chunks, allowing preemption between the chunks.
+         */
+        while (usecs > 0) {
+                smallusecs = (usecs > SMALLUSECS) ? SMALLUSECS : usecs;
+                preempt_disable();
+                cycles = smallusecs*local_cpu_data->cyc_per_usec;
+                start = ia64_get_itc();
+
+                while (ia64_get_itc() - start < cycles)
+                        cpu_relax();
+
+                preempt_enable();
+                usecs -= smallusecs;
+        }
+}
+EXPORT_SYMBOL(udelay);
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index c6d40446c2c4..b631cf86ed44 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -53,7 +53,7 @@ static void uncached_ipi_visibility(void *data)
         if ((status != PAL_VISIBILITY_OK) &&
             (status != PAL_VISIBILITY_OK_REMOTE_NEEDED))
                 printk(KERN_DEBUG "pal_prefetch_visibility() returns %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -63,7 +63,7 @@ static void uncached_ipi_mc_drain(void *data)
         status = ia64_pal_mc_drain();
         if (status)
                 printk(KERN_WARNING "ia64_pal_mc_drain() failed with %i on "
-                       "CPU %i\n", status, get_cpu());
+                       "CPU %i\n", status, raw_smp_processor_id());
 }
 
 
@@ -105,7 +105,7 @@ uncached_get_new_chunk(struct gen_pool *poolp)
         status = ia64_pal_prefetch_visibility(PAL_VISIBILITY_PHYSICAL);
 
         dprintk(KERN_INFO "pal_prefetch_visibility() returns %i on cpu %i\n",
-                status, get_cpu());
+                status, raw_smp_processor_id());
 
         if (!status) {
                 status = smp_call_function(uncached_ipi_visibility, NULL, 0, 1);
diff --git a/arch/ia64/kernel/vmlinux.lds.S b/arch/ia64/kernel/vmlinux.lds.S
index 30d8564e9603..73af6267d2ef 100644
--- a/arch/ia64/kernel/vmlinux.lds.S
+++ b/arch/ia64/kernel/vmlinux.lds.S
@@ -177,6 +177,9 @@ SECTIONS
         }
   . = ALIGN(PAGE_SIZE);         /* make sure the gate page doesn't expose kernel data */
 
+  .data.read_mostly : AT(ADDR(.data.read_mostly) - LOAD_OFFSET)
+        { *(.data.read_mostly) }
+
   .data.cacheline_aligned : AT(ADDR(.data.cacheline_aligned) - LOAD_OFFSET)
         { *(.data.cacheline_aligned) }
 
diff --git a/arch/ia64/sn/kernel/sn2/sn2_smp.c b/arch/ia64/sn/kernel/sn2/sn2_smp.c
index 5d54f5f4e926..471bbaa65d1b 100644
--- a/arch/ia64/sn/kernel/sn2/sn2_smp.c
+++ b/arch/ia64/sn/kernel/sn2/sn2_smp.c
@@ -202,7 +202,7 @@ sn2_global_tlb_purge(struct mm_struct *mm, unsigned long start,
                      unsigned long end, unsigned long nbits)
 {
         int i, opt, shub1, cnode, mynasid, cpu, lcpu = 0, nasid, flushed = 0;
-        int mymm = (mm == current->active_mm);
+        int mymm = (mm == current->active_mm && current->mm);
         volatile unsigned long *ptc0, *ptc1;
         unsigned long itc, itc2, flags, data0 = 0, data1 = 0, rr_value;
         short nasids[MAX_NUMNODES], nix;
diff --git a/arch/ppc/syslib/ppc4xx_dma.c b/arch/ppc/syslib/ppc4xx_dma.c
index f15e64285f96..05ccd598dd4e 100644
--- a/arch/ppc/syslib/ppc4xx_dma.c
+++ b/arch/ppc/syslib/ppc4xx_dma.c
@@ -30,6 +30,7 @@
 
 #include <asm/system.h>
 #include <asm/io.h>
+#include <asm/dma.h>
 #include <asm/ppc4xx_dma.h>
 
 ppc_dma_ch_t dma_channels[MAX_PPC4xx_DMA_CHANNELS];
diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index 563301fe5df8..1eb21de9d1b5 100644
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -289,6 +289,8 @@ source "arch/um/Kconfig.net"
 
 source "drivers/net/Kconfig"
 
+source "drivers/connector/Kconfig"
+
 source "fs/Kconfig"
 
 source "security/Kconfig"
diff --git a/arch/um/Makefile-x86_64 b/arch/um/Makefile-x86_64
index 4f118d5cc2ee..38df311e75dc 100644
--- a/arch/um/Makefile-x86_64
+++ b/arch/um/Makefile-x86_64
@@ -12,3 +12,7 @@ CHECKFLAGS  += -m64
 
 ELF_ARCH := i386:x86-64
 ELF_FORMAT := elf64-x86-64
+
+# Not on all 64-bit distros /lib is a symlink to /lib64. PLD is an example.
+
+LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib64
diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/sysdep-i386/stub.h
index 6ba8cbbe0d36..b492b12b4a10 100644
--- a/arch/um/include/sysdep-i386/stub.h
+++ b/arch/um/include/sysdep-i386/stub.h
@@ -6,8 +6,12 @@
 #ifndef __SYSDEP_STUB_H
 #define __SYSDEP_STUB_H
 
+#include <sys/mman.h>
 #include <asm/ptrace.h>
 #include <asm/unistd.h>
+#include "stub-data.h"
+#include "kern_constants.h"
+#include "uml-config.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
@@ -76,23 +80,22 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
         return ret;
 }
 
-static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3,
-                                 long arg4, long arg5, long arg6)
+static inline void trap_myself(void)
 {
-        long ret;
-
-        __asm__ volatile ("push %%ebp ; movl %%eax,%%ebp ; movl %1,%%eax ; "
-                        "int $0x80 ; pop %%ebp"
-                        : "=a" (ret)
-                        : "g" (syscall), "b" (arg1), "c" (arg2), "d" (arg3),
-                          "S" (arg4), "D" (arg5), "0" (arg6));
-
-        return ret;
+        __asm("int3");
 }
 
-static inline void trap_myself(void)
+static inline void remap_stack(int fd, unsigned long offset)
 {
-        __asm("int3");
+        __asm__ volatile ("movl %%eax,%%ebp ; movl %0,%%eax ; int $0x80 ;"
+                          "movl %7, %%ebx ; movl %%eax, (%%ebx)"
+                          : : "g" (STUB_MMAP_NR), "b" (UML_CONFIG_STUB_DATA), 
+                            "c" (UM_KERN_PAGE_SIZE), 
+                            "d" (PROT_READ | PROT_WRITE),
+                            "S" (MAP_FIXED | MAP_SHARED), "D" (fd), 
+                            "a" (offset), 
+                            "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err) 
+                          : "memory");
 }
 
 #endif
diff --git a/arch/um/include/sysdep-x86_64/stub.h b/arch/um/include/sysdep-x86_64/stub.h
index c41689c13dc9..92e989f81761 100644
--- a/arch/um/include/sysdep-x86_64/stub.h
+++ b/arch/um/include/sysdep-x86_64/stub.h
@@ -6,8 +6,12 @@
 #ifndef __SYSDEP_STUB_H
 #define __SYSDEP_STUB_H
 
+#include <sys/mman.h>
 #include <asm/unistd.h>
 #include <sysdep/ptrace_user.h>
+#include "stub-data.h"
+#include "kern_constants.h"
+#include "uml-config.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
@@ -81,23 +85,23 @@ static inline long stub_syscall5(long syscall, long arg1, long arg2, long arg3,
         return ret;
 }
 
-static inline long stub_syscall6(long syscall, long arg1, long arg2, long arg3,
-                                 long arg4, long arg5, long arg6)
+static inline void trap_myself(void)
 {
-        long ret;
-
-        __asm__ volatile ("movq %5,%%r10 ; movq %6,%%r8 ; "
-                "movq %7, %%r9; " __syscall : "=a" (ret)
-                : "0" (syscall), "D" (arg1), "S" (arg2), "d" (arg3),
-                  "g" (arg4), "g" (arg5), "g" (arg6)
-                : __syscall_clobber, "r10", "r8", "r9" );
-
-        return ret;
+        __asm("int3");
 }
 
-static inline void trap_myself(void)
+static inline void remap_stack(long fd, unsigned long offset)
 {
-        __asm("int3");
+        __asm__ volatile ("movq %4,%%r10 ; movq %5,%%r8 ; "
+                          "movq %6, %%r9; " __syscall "; movq %7, %%rbx ; "
+                          "movq %%rax, (%%rbx)": 
+                          : "a" (STUB_MMAP_NR), "D" (UML_CONFIG_STUB_DATA), 
+                            "S" (UM_KERN_PAGE_SIZE), 
+                            "d" (PROT_READ | PROT_WRITE), 
+                            "g" (MAP_FIXED | MAP_SHARED), "g" (fd), 
+                            "g" (offset),
+                            "i" (&((struct stub_data *) UML_CONFIG_STUB_DATA)->err)
+                          : __syscall_clobber, "r10", "r8", "r9" );
 }
 
 #endif
diff --git a/arch/um/kernel/skas/clone.c b/arch/um/kernel/skas/clone.c
index cb37ce9124a6..47b812b3bca8 100644
--- a/arch/um/kernel/skas/clone.c
+++ b/arch/um/kernel/skas/clone.c
@@ -18,11 +18,10 @@
  * on some systems.
  */
 
-#define STUB_DATA(field) (((struct stub_data *) UML_CONFIG_STUB_DATA)->field)
-
 void __attribute__ ((__section__ (".__syscall_stub")))
 stub_clone_handler(void)
 {
+        struct stub_data *data = (struct stub_data *) UML_CONFIG_STUB_DATA;
         long err;
 
         err = stub_syscall2(__NR_clone, CLONE_PARENT | CLONE_FILES | SIGCHLD,
@@ -35,17 +34,21 @@ stub_clone_handler(void)
         if(err)
                 goto out;
 
-        err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL,
-                            (long) &STUB_DATA(timer), 0);
+        err = stub_syscall3(__NR_setitimer, ITIMER_VIRTUAL, 
+                            (long) &data->timer, 0);
         if(err)
                 goto out;
 
-        err = stub_syscall6(STUB_MMAP_NR, UML_CONFIG_STUB_DATA,
-                            UM_KERN_PAGE_SIZE, PROT_READ | PROT_WRITE,
-                            MAP_FIXED | MAP_SHARED, STUB_DATA(fd),
-                            STUB_DATA(offset));
+        remap_stack(data->fd, data->offset);
+        goto done;
+
  out:
-        /* save current result. Parent: pid; child: retcode of mmap */
-        STUB_DATA(err) = err;
+        /* save current result. 
+         * Parent: pid; 
+         * child: retcode of mmap already saved and it jumps around this 
+         * assignment
+         */
+        data->err = err;
+ done:
         trap_myself();
 }
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index b3fbf125709b..2e41cabd3d93 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -21,11 +21,6 @@ define unprofile
 endef
 
 
-# The stubs and unmap.o can't try to call mcount or update basic block data
-define unprofile
-        $(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
-endef
-
 # cmd_make_link checks to see if the $(foo-dir) variable starts with a /.  If
 # so, it's considered to be a path relative to $(srcdir) rather than
 # $(srcdir)/arch/$(SUBARCH).  This is because x86_64 wants to get ldt.c from
diff --git a/drivers/char/drm/radeon_cp.c b/drivers/char/drm/radeon_cp.c
index 95ae9e0892ac..501e557cbc86 100644
--- a/drivers/char/drm/radeon_cp.c
+++ b/drivers/char/drm/radeon_cp.c
@@ -1311,7 +1311,7 @@ static void radeon_set_pcigart(drm_radeon_private_t * dev_priv, int on)
 
 static int radeon_do_init_cp(drm_device_t * dev, drm_radeon_init_t * init)
 {
-        drm_radeon_private_t *dev_priv = dev->dev_private;;
+        drm_radeon_private_t *dev_priv = dev->dev_private;
         unsigned int mem_size;
 
         DRM_DEBUG("\n");
diff --git a/drivers/char/watchdog/booke_wdt.c b/drivers/char/watchdog/booke_wdt.c
index c800cce73c1e..b6640606b44d 100644
--- a/drivers/char/watchdog/booke_wdt.c
+++ b/drivers/char/watchdog/booke_wdt.c
@@ -173,7 +173,7 @@ static int __init booke_wdt_init(void)
         int ret = 0;
 
         printk (KERN_INFO "PowerPC Book-E Watchdog Timer Loaded\n");
-        ident.firmware_version = cpu_specs[0].pvr_value;
+        ident.firmware_version = cur_cpu_spec->pvr_value;
 
         ret = misc_register(&booke_wdt_miscdev);
         if (ret) {
diff --git a/drivers/message/i2o/pci.c b/drivers/message/i2o/pci.c
index 81ef306cb124..ee7075fa1ec3 100644
--- a/drivers/message/i2o/pci.c
+++ b/drivers/message/i2o/pci.c
@@ -303,6 +303,7 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
         struct i2o_controller *c;
         int rc;
         struct pci_dev *i960 = NULL;
+        int pci_dev_busy = 0;
 
         printk(KERN_INFO "i2o: Checking for PCI I2O controllers...\n");
 
@@ -395,6 +396,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
         if ((rc = i2o_pci_alloc(c))) {
                 printk(KERN_ERR "%s: DMA / IO allocation for I2O controller "
                        " failed\n", c->name);
+                if (rc == -ENODEV)
+                        pci_dev_busy = 1;
                 goto free_controller;
         }
 
@@ -425,7 +428,8 @@ static int __devinit i2o_pci_probe(struct pci_dev *pdev,
         i2o_iop_free(c);
 
       disable:
-        pci_disable_device(pdev);
+        if (!pci_dev_busy)
+                pci_disable_device(pdev);
 
         return rc;
 }
diff --git a/drivers/mtd/onenand/generic.c b/drivers/mtd/onenand/generic.c
index 48cce431f89f..45c077d0f063 100644
--- a/drivers/mtd/onenand/generic.c
+++ b/drivers/mtd/onenand/generic.c
@@ -12,9 +12,9 @@
  *   This is a device driver for the OneNAND flash for generic boards.
  */
 
-#include <linux/device.h>
 #include <linux/module.h>
 #include <linux/init.h>
+#include <linux/platform_device.h>
 #include <linux/mtd/mtd.h>
 #include <linux/mtd/onenand.h>
 #include <linux/mtd/partitions.h>
@@ -39,7 +39,7 @@ static int __devinit generic_onenand_probe(struct device *dev)
 {
         struct onenand_info *info;
         struct platform_device *pdev = to_platform_device(dev);
-        struct onenand_platform_data *pdata = pdev->dev.platform_data;
+        struct flash_platform_data *pdata = pdev->dev.platform_data;
         struct resource *res = pdev->resource;
         unsigned long size = res->end - res->start + 1;
         int err;
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c
index f67d5d6eb9a6..a53a73fc2a5a 100644
--- a/drivers/mtd/onenand/onenand_base.c
+++ b/drivers/mtd/onenand/onenand_base.c
@@ -940,7 +940,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
         u_char *eccbuf, struct nand_oobinfo *oobsel)
 {
         struct onenand_chip *this = mtd->priv;
-        unsigned char buffer[MAX_ONENAND_PAGESIZE], *pbuf;
+        unsigned char *pbuf;
         size_t total_len, len;
         int i, written = 0;
         int ret = 0;
@@ -975,7 +975,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
         /* Loop until all keve's data has been written */
         len = 0;
         while (count) {
-                pbuf = buffer;
+                pbuf = this->page_buf;
                 /*
                  * If the given tuple is >= pagesize then
                  * write it out from the iov
@@ -995,7 +995,7 @@ static int onenand_writev_ecc(struct mtd_info *mtd, const struct kvec *vecs,
                         int cnt = 0, thislen;
                         while (cnt < mtd->oobblock) {
                                 thislen = min_t(int, mtd->oobblock - cnt, vecs->iov_len - len);
-                                memcpy(buffer + cnt, vecs->iov_base + len, thislen);
+                                memcpy(this->page_buf + cnt, vecs->iov_base + len, thislen);
                                 cnt += thislen;
                                 len += thislen;
 
@@ -1296,6 +1296,12 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
 
         /* Block lock scheme */
         for (block = start; block < end; block++) {
+                /* Set block address */
+                value = onenand_block_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
+                /* Select DataRAM for DDP */
+                value = onenand_bufferram_address(this, block);
+                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS2);
                 /* Set start block address */
                 this->write_word(block, this->base + ONENAND_REG_START_BLOCK_ADDRESS);
                 /* Write unlock command */
@@ -1309,10 +1315,6 @@ static int onenand_unlock(struct mtd_info *mtd, loff_t ofs, size_t len)
                     & ONENAND_CTRL_ONGO)
                         continue;
 
-                /* Set block address for read block status */
-                value = onenand_block_address(this, block);
-                this->write_word(value, this->base + ONENAND_REG_START_ADDRESS1);
-
                 /* Check lock status */
                 status = this->read_word(this->base + ONENAND_REG_WP_STATUS);
                 if (!(status & ONENAND_WP_US))
@@ -1346,7 +1348,6 @@ static void onenand_print_device_info(int device)
 
 static const struct onenand_manufacturers onenand_manuf_ids[] = {
         {ONENAND_MFR_SAMSUNG, "Samsung"},
-        {ONENAND_MFR_UNKNOWN, "Unknown"}
 };
 
 /**
@@ -1357,17 +1358,22 @@ static const struct onenand_manufacturers onenand_manuf_ids[] = {
  */
 static int onenand_check_maf(int manuf)
 {
+        int size = ARRAY_SIZE(onenand_manuf_ids);
+        char *name;
         int i;
 
-        for (i = 0; onenand_manuf_ids[i].id; i++) {
+        for (i = 0; i < size; i++)
                 if (manuf == onenand_manuf_ids[i].id)
                         break;
-        }
 
-        printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n",
-                onenand_manuf_ids[i].name, manuf);
+        if (i < size)
+                name = onenand_manuf_ids[i].name;
+        else
+                name = "Unknown";
+
+        printk(KERN_DEBUG "OneNAND Manufacturer: %s (0x%0x)\n", name, manuf);
 
-        return (i != ONENAND_MFR_UNKNOWN);
+        return (i == size);
 }
 
 /**
@@ -1513,6 +1519,18 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
                 this->read_bufferram = onenand_sync_read_bufferram;
         }
 
+        /* Allocate buffers, if necessary */
+        if (!this->page_buf) {
+                size_t len;
+                len = mtd->oobblock + mtd->oobsize;
+                this->page_buf = kmalloc(len, GFP_KERNEL);
+                if (!this->page_buf) {
+                        printk(KERN_ERR "onenand_scan(): Can't allocate page_buf\n");
+                        return -ENOMEM;
+                }
+                this->options |= ONENAND_PAGEBUF_ALLOC;
+        }
+
         this->state = FL_READY;
         init_waitqueue_head(&this->wq);
         spin_lock_init(&this->chip_lock);
@@ -1574,12 +1592,21 @@ int onenand_scan(struct mtd_info *mtd, int maxchips)
  */
 void onenand_release(struct mtd_info *mtd)
 {
+        struct onenand_chip *this = mtd->priv;
+
 #ifdef CONFIG_MTD_PARTITIONS
         /* Deregister partitions */
         del_mtd_partitions (mtd);
 #endif
         /* Deregister the device */
         del_mtd_device (mtd);
+
+        /* Free bad block table memory, if allocated */
+        if (this->bbm)
+                kfree(this->bbm);
+        /* Buffer allocated by onenand_scan */
+        if (this->options & ONENAND_PAGEBUF_ALLOC)
+                kfree(this->page_buf);
 }
 
 EXPORT_SYMBOL_GPL(onenand_scan);
diff --git a/drivers/mtd/onenand/onenand_bbt.c b/drivers/mtd/onenand/onenand_bbt.c
index f40190f499e1..4510d3361eaa 100644
--- a/drivers/mtd/onenand/onenand_bbt.c
+++ b/drivers/mtd/onenand/onenand_bbt.c
@@ -118,10 +118,10 @@ static int create_bbt(struct mtd_info *mtd, uint8_t *buf, struct nand_bbt_descr
  */
 static inline int onenand_memory_bbt (struct mtd_info *mtd, struct nand_bbt_descr *bd)
 {
-        unsigned char data_buf[MAX_ONENAND_PAGESIZE];
+        struct onenand_chip *this = mtd->priv;
 
         bd->options &= ~NAND_BBT_SCANEMPTY;
-        return create_bbt(mtd, data_buf, bd, -1);
+        return create_bbt(mtd, this->page_buf, bd, -1);
 }
 
 /**
diff --git a/drivers/scsi/dpt_i2o.c b/drivers/scsi/dpt_i2o.c
index 418fc7b896ac..6252b9ddc01e 100644
--- a/drivers/scsi/dpt_i2o.c
+++ b/drivers/scsi/dpt_i2o.c
@@ -660,7 +660,12 @@ static int adpt_abort(struct scsi_cmnd * cmd)
         msg[2] = 0;
         msg[3]= 0; 
         msg[4] = (u32)cmd;
-        if( (rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER)) != 0){
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
+        rcode = adpt_i2o_post_wait(pHba, msg, sizeof(msg), FOREVER);
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                 if(rcode == -EOPNOTSUPP ){
                         printk(KERN_INFO"%s: Abort cmd not supported\n",pHba->name);
                         return FAILED;
@@ -697,10 +702,15 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
         msg[2] = 0;
         msg[3] = 0;
 
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
         old_state = d->state;
         d->state |= DPTI_DEV_RESET;
-        if( (rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER)) ){
-                d->state = old_state;
+        rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
+        d->state = old_state;
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                 if(rcode == -EOPNOTSUPP ){
                         printk(KERN_INFO"%s: Device reset not supported\n",pHba->name);
                         return FAILED;
@@ -708,7 +718,6 @@ static int adpt_device_reset(struct scsi_cmnd* cmd)
                 printk(KERN_INFO"%s: Device reset failed\n",pHba->name);
                 return FAILED;
         } else {
-                d->state = old_state;
                 printk(KERN_INFO"%s: Device reset successful\n",pHba->name);
                 return SUCCESS;
         }
@@ -721,6 +730,7 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
 {
         adpt_hba* pHba;
         u32 msg[4];
+        u32 rcode;
 
         pHba = (adpt_hba*)cmd->device->host->hostdata[0];
         memset(msg, 0, sizeof(msg));
@@ -729,7 +739,12 @@ static int adpt_bus_reset(struct scsi_cmnd* cmd)
         msg[1] = (I2O_HBA_BUS_RESET<<24|HOST_TID<<12|pHba->channel[cmd->device->channel].tid);
         msg[2] = 0;
         msg[3] = 0;
-        if(adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER) ){
+        if (pHba->host)
+                spin_lock_irq(pHba->host->host_lock);
+        rcode = adpt_i2o_post_wait(pHba, msg,sizeof(msg), FOREVER);
+        if (pHba->host)
+                spin_unlock_irq(pHba->host->host_lock);
+        if (rcode != 0) {
                 printk(KERN_WARNING"%s: Bus reset failed.\n",pHba->name);
                 return FAILED;
         } else {
diff --git a/drivers/usb/input/hid-input.c b/drivers/usb/input/hid-input.c
index 9ff25eb520a6..1220a5004a5c 100644
--- a/drivers/usb/input/hid-input.c
+++ b/drivers/usb/input/hid-input.c
@@ -137,6 +137,7 @@ static void hidinput_configure_usage(struct hid_input *hidinput, struct hid_fiel
                         switch (usage->hid & 0xffff) {
                                 case 0xba: map_abs(ABS_RUDDER); break;
                                 case 0xbb: map_abs(ABS_THROTTLE); break;
+                                default:   goto ignore;
                         }
                         break;
 
diff --git a/include/asm-ia64/delay.h b/include/asm-ia64/delay.h
index 57182d6f2b9a..bba702076391 100644
--- a/include/asm-ia64/delay.h
+++ b/include/asm-ia64/delay.h
@@ -84,14 +84,6 @@ __delay (unsigned long loops)
         ia64_delay_loop (loops - 1);
 }
 
-static __inline__ void
-udelay (unsigned long usecs)
-{
-        unsigned long start = ia64_get_itc();
-        unsigned long cycles = usecs*local_cpu_data->cyc_per_usec;
-
-        while (ia64_get_itc() - start < cycles)
-                cpu_relax();
-}
+extern void udelay (unsigned long usecs);
 
 #endif /* _ASM_IA64_DELAY_H */
diff --git a/include/asm-ppc/ppc4xx_dma.h b/include/asm-ppc/ppc4xx_dma.h
index a415001165fa..46a086fff816 100644
--- a/include/asm-ppc/ppc4xx_dma.h
+++ b/include/asm-ppc/ppc4xx_dma.h
@@ -33,9 +33,6 @@
 
 #define MAX_PPC4xx_DMA_CHANNELS         4
 
-/* in arch/ppc/kernel/setup.c -- Cort */
-extern unsigned long DMA_MODE_WRITE, DMA_MODE_READ;
-
 /*
  * Function return status codes
  * These values are used to indicate whether or not the function
diff --git a/include/linux/cache.h b/include/linux/cache.h
index f6b5a46c5f82..0b7ecf3af78a 100644
--- a/include/linux/cache.h
+++ b/include/linux/cache.h
@@ -13,7 +13,7 @@
 #define SMP_CACHE_BYTES L1_CACHE_BYTES
 #endif
 
-#if defined(CONFIG_X86) || defined(CONFIG_SPARC64)
+#if defined(CONFIG_X86) || defined(CONFIG_SPARC64) || defined(CONFIG_IA64)
 #define __read_mostly __attribute__((__section__(".data.read_mostly")))
 #else
 #define __read_mostly
diff --git a/include/linux/mtd/onenand.h b/include/linux/mtd/onenand.h
index f1fd4215686a..7419b5fab133 100644
--- a/include/linux/mtd/onenand.h
+++ b/include/linux/mtd/onenand.h
@@ -17,7 +17,6 @@
 #include <linux/mtd/bbm.h>
 
 #define MAX_BUFFERRAM           2
-#define MAX_ONENAND_PAGESIZE    (2048 + 64)
 
 /* Scan and identify a OneNAND device */
 extern int onenand_scan(struct mtd_info *mtd, int max_chips);
@@ -110,6 +109,7 @@ struct onenand_chip {
         spinlock_t              chip_lock;
         wait_queue_head_t       wq;
         onenand_state_t         state;
+        unsigned char           *page_buf;
 
         struct nand_oobinfo     *autooob;
 
@@ -134,13 +134,12 @@ struct onenand_chip {
  * Options bits
  */
 #define ONENAND_CONT_LOCK               (0x0001)
-
+#define ONENAND_PAGEBUF_ALLOC           (0x1000)
 
 /*
  * OneNAND Flash Manufacturer ID Codes
  */
 #define ONENAND_MFR_SAMSUNG     0xec
-#define ONENAND_MFR_UNKNOWN     0x00
 
 /**
  * struct nand_manufacturers - NAND Flash Manufacturer ID Structure