11 files changed, 39 insertions, 24 deletions

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 85016313bd11..c8569e862c6b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -341,6 +341,7 @@ config ARCH_PXA
         select ARCH_MTD_XIP
         select GENERIC_GPIO
         select GENERIC_TIME
+        select GENERIC_CLOCKEVENTS
         help
           Support for Intel's PXA2XX processor line.
 
diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index 1b76d87fa335..9746e5293249 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -630,7 +630,7 @@ void smp_send_stop(void)
 /*
  * not supported here
  */
-int __init setup_profiling_timer(unsigned int multiplier)
+int setup_profiling_timer(unsigned int multiplier)
 {
         return -EINVAL;
 }
diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c
index f2114bcf09d5..8ad47619c079 100644
--- a/arch/arm/kernel/traps.c
+++ b/arch/arm/kernel/traps.c
@@ -352,10 +352,8 @@ asmlinkage void __exception do_undefinstr(struct pt_regs *regs)
 
 asmlinkage void do_unexp_fiq (struct pt_regs *regs)
 {
-#ifndef CONFIG_IGNORE_FIQ
         printk("Hmm.  Unexpected FIQ received, but trying to continue\n");
         printk("You may have a hardware problem...\n");
-#endif
 }
 
 /*
diff --git a/arch/arm/mach-sa1100/jornada720.c b/arch/arm/mach-sa1100/jornada720.c
index 64067cd58d36..52ac37d1e23a 100644
--- a/arch/arm/mach-sa1100/jornada720.c
+++ b/arch/arm/mach-sa1100/jornada720.c
@@ -3,6 +3,7 @@
  *
  * HP Jornada720 init code
  *
+ * Copyright (C) 2007 Kristoffer Ericson <Kristoffer.Ericson@gmail.com>
  * Copyright (C) 2006 Filip Zyzniewski <filip.zyzniewski@tefnet.pl>
  *  Copyright (C) 2005 Michael Gernoth <michael@gernoth.net>
  *
@@ -220,14 +221,16 @@ static struct platform_device sa1111_device = {
         .resource       = sa1111_resources,
 };
 
-static struct platform_device jornada720_mcu_device = {
-        .name           = "jornada720_mcu",
-        .id             = -1,
+static struct platform_device jornada_ssp_device = {
+        .name           = "jornada_ssp",
+        .id             = -1,
 };
 
 static struct platform_device *devices[] __initdata = {
         &sa1111_device,
-        &jornada720_mcu_device,
+#ifdef CONFIG_SA1100_JORNADA720_SSP
+        &jornada_ssp_device,
+#endif
         &s1d13xxxfb_device,
 };
 
@@ -236,19 +239,19 @@ static int __init jornada720_init(void)
         int ret = -ENODEV;
 
         if (machine_is_jornada720()) {
-                GPDR |= GPIO_GPIO20;
-                /* oscillator setup (line 116 of HP's doc) */
+                /* we want to use gpio20 as input to drive the clock of our uart 3 */
+                GPDR |= GPIO_GPIO20;    /* Clear gpio20 pin as input */
                 TUCR = TUCR_VAL;
-                /* resetting SA1111 (line 118 of HP's doc) */
-                GPSR = GPIO_GPIO20;
+                GPSR = GPIO_GPIO20;     /* start gpio20 pin */
                 udelay(1);
-                GPCR = GPIO_GPIO20;
+                GPCR = GPIO_GPIO20;     /* stop gpio20 */
                 udelay(1);
-                GPSR = GPIO_GPIO20;
-                udelay(20);
+                GPSR = GPIO_GPIO20;     /* restart gpio20 */
+                udelay(20);             /* give it some time to restart */
 
                 ret = platform_add_devices(devices, ARRAY_SIZE(devices));
         }
+
         return ret;
 }
 
@@ -345,7 +348,7 @@ static void __init jornada720_mach_init(void)
 }
 
 MACHINE_START(JORNADA720, "HP Jornada 720")
-        /* Maintainer: Michael Gernoth <michael@gernoth.net> */
+        /* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
         .phys_io        = 0x80000000,
         .io_pg_offst    = ((0xf8000000) >> 18) & 0xfffc,
         .boot_params    = 0xc0000100,
diff --git a/arch/arm/mach-sa1100/jornada720_ssp.c b/arch/arm/mach-sa1100/jornada720_ssp.c
index 0a45e1ac8ad6..395c39bed7d8 100644
--- a/arch/arm/mach-sa1100/jornada720_ssp.c
+++ b/arch/arm/mach-sa1100/jornada720_ssp.c
@@ -161,7 +161,7 @@ static int __init jornada_ssp_probe(struct platform_device *dev)
         ret = jornada_ssp_inout(GETBRIGHTNESS);
 
         /* seems like it worked, just feed it with TxDummy to get rid of data */
-        if (ret == TxDummy)
+        if (ret == TXDUMMY)
                 jornada_ssp_inout(TXDUMMY);
 
         jornada_ssp_end();
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 36c7b9682aa6..21aa4fc5f8ef 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -425,6 +425,9 @@ config COMPAT
         depends on IA32_SUPPORT
         default y
 
+config COMPAT_FOR_U64_ALIGNMENT
+        def_bool COMPAT
+
 config IA64_MCA_RECOVERY
         tristate "MCA recovery from errors other than TLB."
 
diff --git a/arch/ia64/hp/common/sba_iommu.c b/arch/ia64/hp/common/sba_iommu.c
index cd4adf52f174..e980e7aa2306 100644
--- a/arch/ia64/hp/common/sba_iommu.c
+++ b/arch/ia64/hp/common/sba_iommu.c
@@ -2015,9 +2015,14 @@ acpi_sba_ioc_add(struct acpi_device *device)
         return 0;
 }
 
+static const struct acpi_device_id hp_ioc_iommu_device_ids[] = {
+        {"HWP0001", 0},
+        {"HWP0004", 0},
+        {"", 0},
+};
 static struct acpi_driver acpi_sba_ioc_driver = {
         .name           = "IOC IOMMU Driver",
-        .ids            = "HWP0001,HWP0004",
+        .ids            = hp_ioc_iommu_device_ids,
         .ops            = {
                 .add    = acpi_sba_ioc_add,
         },
diff --git a/arch/ia64/hp/sim/simscsi.c b/arch/ia64/hp/sim/simscsi.c
index bb87682bbb1b..64248b58f63f 100644
--- a/arch/ia64/hp/sim/simscsi.c
+++ b/arch/ia64/hp/sim/simscsi.c
@@ -101,7 +101,7 @@ simscsi_interrupt (unsigned long val)
 {
         struct scsi_cmnd *sc;
 
-        while ((sc = queue[rd].sc) != 0) {
+        while ((sc = queue[rd].sc) != NULL) {
                 atomic_dec(&num_reqs);
                 queue[rd].sc = NULL;
                 if (DBG)
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index c6ede8780ded..3d45d24a9d61 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -741,16 +741,15 @@ int __init acpi_boot_init(void)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
-        int vector;
+        int tmp;
 
         if (has_8259 && gsi < 16)
                 *irq = isa_irq_to_vector(gsi);
         else {
-                vector = gsi_to_vector(gsi);
-                if (vector == -1)
+                tmp = gsi_to_irq(gsi);
+                if (tmp == -1)
                         return -1;
-
-                *irq = vector;
+                *irq = tmp;
         }
         return 0;
 }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index fcb77338cc09..9386b955eed1 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -145,6 +145,9 @@ static int __bind_irq_vector(int irq, int vector, cpumask_t domain)
         int cpu;
         struct irq_cfg *cfg = &irq_cfg[irq];
 
+        BUG_ON((unsigned)irq >= NR_IRQS);
+        BUG_ON((unsigned)vector >= IA64_NUM_VECTORS);
+
         cpus_and(mask, domain, cpu_online_map);
         if (cpus_empty(mask))
                 return -EINVAL;
@@ -286,7 +289,7 @@ static int __init parse_vector_domain(char *arg)
                 vector_domain_type = VECTOR_DOMAIN_PERCPU;
                 no_int_routing = 1;
         }
-        return 1;
+        return 0;
 }
 early_param("vector", parse_vector_domain);
 #else
diff --git a/arch/x86_64/Kconfig b/arch/x86_64/Kconfig
index 45f82ae6d389..ffa036406289 100644
--- a/arch/x86_64/Kconfig
+++ b/arch/x86_64/Kconfig
@@ -765,6 +765,9 @@ config COMPAT
         depends on IA32_EMULATION
         default y
 
+config COMPAT_FOR_U64_ALIGNMENT
+        def_bool COMPAT
+
 config SYSVIPC_COMPAT
         bool
         depends on COMPAT && SYSVIPC