---

yaml --- r: 63066 b: refs/heads/master c: 190644e h: refs/heads/master v: v3
git-mirror · Jul 27, 2007 · d4103d2 · d4103d2
1 parent 0ca079e
commit d4103d2
Show file tree

Hide file tree

Showing 16 changed files with 32 additions and 51 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 715dad5992b1466320c1ac674db46297e57acf21
+refs/heads/master: 190644e180794208bc638179f4d5940fe419bf9c
diff --git a/trunk/arch/arm/Kconfig b/trunk/arch/arm/Kconfig
@@ -341,7 +341,6 @@ 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/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
@@ -630,7 +630,7 @@ void smp_send_stop(void)
 /*
  * not supported here
  */
-int setup_profiling_timer(unsigned int multiplier)
+int __init setup_profiling_timer(unsigned int multiplier)
 {
 	return -EINVAL;
 }

diff --git a/trunk/arch/arm/kernel/traps.c b/trunk/arch/arm/kernel/traps.c
@@ -352,8 +352,10 @@ 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/trunk/arch/arm/mach-sa1100/jornada720.c b/trunk/arch/arm/mach-sa1100/jornada720.c
@@ -3,7 +3,6 @@
  *
  * 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>
  *
@@ -221,16 +220,14 @@ static struct platform_device sa1111_device = {
 	.resource	= sa1111_resources,
 };
 
-static struct platform_device jornada_ssp_device = {
-	.name           = "jornada_ssp",
-	.id             = -1,
+static struct platform_device jornada720_mcu_device = {
+	.name		= "jornada720_mcu",
+	.id		= -1,
 };
 
 static struct platform_device *devices[] __initdata = {
 	&sa1111_device,
-#ifdef CONFIG_SA1100_JORNADA720_SSP
-	&jornada_ssp_device,
-#endif
+	&jornada720_mcu_device,
 	&s1d13xxxfb_device,
 };
 
@@ -239,19 +236,19 @@ static int __init jornada720_init(void)
 	int ret = -ENODEV;
 
 	if (machine_is_jornada720()) {
-		/* we want to use gpio20 as input to drive the clock of our uart 3 */
-		GPDR |= GPIO_GPIO20;	/* Clear gpio20 pin as input */
+		GPDR |= GPIO_GPIO20;
+		/* oscillator setup (line 116 of HP's doc) */
 		TUCR = TUCR_VAL;
-		GPSR = GPIO_GPIO20;	/* start gpio20 pin */
+		/* resetting SA1111 (line 118 of HP's doc) */
+		GPSR = GPIO_GPIO20;
 		udelay(1);
-		GPCR = GPIO_GPIO20;	/* stop gpio20 */
+		GPCR = GPIO_GPIO20;
 		udelay(1);
-		GPSR = GPIO_GPIO20;	/* restart gpio20 */
-		udelay(20);		/* give it some time to restart */
+		GPSR = GPIO_GPIO20;
+		udelay(20);
 
 		ret = platform_add_devices(devices, ARRAY_SIZE(devices));
 	}
-
 	return ret;
 }
 
@@ -348,7 +345,7 @@ static void __init jornada720_mach_init(void)
 }
 
 MACHINE_START(JORNADA720, "HP Jornada 720")
-	/* Maintainer: Kristoffer Ericson <Kristoffer.Ericson@gmail.com> */
+	/* Maintainer: Michael Gernoth <michael@gernoth.net> */
 	.phys_io	= 0x80000000,
 	.io_pg_offst	= ((0xf8000000) >> 18) & 0xfffc,
 	.boot_params	= 0xc0000100,

diff --git a/trunk/arch/arm/mach-sa1100/jornada720_ssp.c b/trunk/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/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig
@@ -425,9 +425,6 @@ 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/trunk/arch/ia64/hp/common/sba_iommu.c b/trunk/arch/ia64/hp/common/sba_iommu.c
@@ -2015,14 +2015,9 @@ 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		= hp_ioc_iommu_device_ids,
+	.ids		= "HWP0001,HWP0004",
 	.ops		= {
 		.add	= acpi_sba_ioc_add,
 	},

diff --git a/trunk/arch/ia64/hp/sim/simscsi.c b/trunk/arch/ia64/hp/sim/simscsi.c
@@ -101,7 +101,7 @@ simscsi_interrupt (unsigned long val)
 {
 	struct scsi_cmnd *sc;
 
-	while ((sc = queue[rd].sc) != NULL) {
+	while ((sc = queue[rd].sc) != 0) {
 		atomic_dec(&num_reqs);
 		queue[rd].sc = NULL;
 		if (DBG)

diff --git a/trunk/arch/ia64/kernel/acpi.c b/trunk/arch/ia64/kernel/acpi.c
@@ -741,15 +741,16 @@ int __init acpi_boot_init(void)
 
 int acpi_gsi_to_irq(u32 gsi, unsigned int *irq)
 {
-	int tmp;
+	int vector;
 
 	if (has_8259 && gsi < 16)
 		*irq = isa_irq_to_vector(gsi);
 	else {
-		tmp = gsi_to_irq(gsi);
-		if (tmp == -1)
+		vector = gsi_to_vector(gsi);
+		if (vector == -1)
 			return -1;
-		*irq = tmp;
+
+		*irq = vector;
 	}
 	return 0;
 }

diff --git a/trunk/arch/ia64/kernel/irq_ia64.c b/trunk/arch/ia64/kernel/irq_ia64.c
@@ -145,9 +145,6 @@ 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;
@@ -289,7 +286,7 @@ static int __init parse_vector_domain(char *arg)
 		vector_domain_type = VECTOR_DOMAIN_PERCPU;
 		no_int_routing = 1;
 	}
-	return 0;
+	return 1;
 }
 early_param("vector", parse_vector_domain);
 #else

diff --git a/trunk/arch/x86_64/Kconfig b/trunk/arch/x86_64/Kconfig
@@ -765,9 +765,6 @@ config COMPAT
 	depends on IA32_EMULATION
 	default y
 
-config COMPAT_FOR_U64_ALIGNMENT
-	def_bool COMPAT
-
 config SYSVIPC_COMPAT
 	bool
 	depends on COMPAT && SYSVIPC

diff --git a/trunk/drivers/char/agp/ati-agp.c b/trunk/drivers/char/agp/ati-agp.c
@@ -123,21 +123,16 @@ static int ati_create_gatt_pages(int nr_tables)
 
 	for (i = 0; i < nr_tables; i++) {
 		entry = kzalloc(sizeof(struct ati_page_map), GFP_KERNEL);
+		tables[i] = entry;
 		if (entry == NULL) {
-			while (i > 0) {
-				kfree(tables[i-1]);
-				i--;
-			}
-			kfree(tables);
 			retval = -ENOMEM;
 			break;
 		}
-		tables[i] = entry;
 		retval = ati_create_page_map(entry);
 		if (retval != 0)
 			break;
 	}
-	ati_generic_private.num_tables = nr_tables;
+	ati_generic_private.num_tables = i;
 	ati_generic_private.gatt_pages = tables;
 
 	if (retval != 0)

diff --git a/trunk/fs/quota.c b/trunk/fs/quota.c
@@ -387,7 +387,7 @@ asmlinkage long sys_quotactl(unsigned int cmd, const char __user *special, qid_t
 	return ret;
 }
 
-#if defined(CONFIG_COMPAT_FOR_U64_ALIGNMENT)
+#if defined(CONFIG_X86_64) || defined(CONFIG_IA64)
 /*
  * This code works only for 32 bit quota tools over 64 bit OS (x86_64, ia64)
  * and is necessary due to alignment problems.

diff --git a/trunk/include/asm-arm/arch-mxc/uncompress.h b/trunk/include/asm-arm/arch-mxc/uncompress.h
@@ -26,6 +26,7 @@
 #define __MXC_BOOT_UNCOMPRESS
 
 #include <asm/hardware.h>
+#include <asm/processor.h>
 
 #define UART(x) (*(volatile unsigned long *)(serial_port + (x)))
 
@@ -61,7 +62,7 @@ static void putc(int ch)
 	}
 
 	while (!(UART(USR2) & USR2_TXFE))
-		barrier();
+		cpu_relax();
 
 	UART(TXR) = ch;
 }

diff --git a/trunk/sound/soc/pxa/pxa2xx-ac97.c b/trunk/sound/soc/pxa/pxa2xx-ac97.c
@@ -160,9 +160,9 @@ static void pxa2xx_ac97_cold_reset(struct snd_ac97 *ac97)
 	gsr_bits = 0;
 #ifdef CONFIG_PXA27x
 	/* PXA27x Developers Manual section 13.5.2.2.1 */
-	pxa_set_cken(31, 1);
+	pxa_set_cken(1 << 31, 1);
 	udelay(5);
-	pxa_set_cken(31, 0);
+	pxa_set_cken(1 << 31, 0);
 	GCR = GCR_COLD_RST;
 	udelay(50);
 #else