From 3961629057fa1ba22c496c93018180a59e2481ea Mon Sep 17 00:00:00 2001 From: Kiyoshi Ueda Date: Fri, 17 Jun 2005 16:15:10 +0200 Subject: [PATCH] --- yaml --- r: 2015 b: refs/heads/master c: db3b5848ea6440968fcdd29b80514d0de044bb7c h: refs/heads/master i: 2013: 9a77afbab918799ab0c97b72bb1af3f2854d7cf6 2011: 8bcd51cb6e3fa3ca0ea9013d5b13a87ca9948590 2007: acaee98945ace94e7e75f5fadc79577ce5098d31 1999: f9efb4c99435a8c74611ce837a235fefcfc67749 1983: a10713e6a823a11a0809112391464d1d7e0ba0d9 v: v3 --- [refs] | 2 +- .../arch/arm/mach-integrator/integrator_cp.c | 1 + trunk/arch/arm/mach-pxa/lubbock.c | 30 ------------------ trunk/arch/arm/mach-pxa/mainstone.c | 31 +------------------ trunk/arch/arm/mach-versatile/core.c | 2 +- trunk/drivers/block/cfq-iosched.c | 9 ++++-- trunk/drivers/ieee1394/sbp2.c | 3 +- trunk/drivers/input/mouse/alps.c | 2 +- trunk/drivers/pci/pci-driver.c | 5 +-- trunk/drivers/usb/net/kaweth.c | 2 +- trunk/fs/binfmt_elf.c | 2 +- .../asm-arm/arch-integrator/platform.h | 4 --- .../include/asm-arm/arch-versatile/platform.h | 16 +++------- trunk/kernel/exit.c | 4 ++- trunk/kernel/posix-timers.c | 1 - 15 files changed, 23 insertions(+), 91 deletions(-) diff --git a/[refs] b/[refs] index fbf7e32a0b5d..9597d5c9ad2e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 794f5bfa77955c4455f6d72d8b0e2bee25f1ff0c +refs/heads/master: db3b5848ea6440968fcdd29b80514d0de044bb7c diff --git a/trunk/arch/arm/mach-integrator/integrator_cp.c b/trunk/arch/arm/mach-integrator/integrator_cp.c index e0a01eef0993..3b948e8c2751 100644 --- a/trunk/arch/arm/mach-integrator/integrator_cp.c +++ b/trunk/arch/arm/mach-integrator/integrator_cp.c @@ -83,6 +83,7 @@ static struct map_desc intcp_io_desc[] __initdata = { { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(INTEGRATOR_DBG_BASE), INTEGRATOR_DBG_BASE, SZ_4K, MT_DEVICE }, { IO_ADDRESS(INTEGRATOR_GPIO_BASE), INTEGRATOR_GPIO_BASE, SZ_4K, MT_DEVICE }, + { 0xfc900000, 0xc9000000, SZ_4K, MT_DEVICE }, { 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE }, { 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE }, }; diff --git a/trunk/arch/arm/mach-pxa/lubbock.c b/trunk/arch/arm/mach-pxa/lubbock.c index f2c9e0d2b24b..dd012d6e2f5c 100644 --- a/trunk/arch/arm/mach-pxa/lubbock.c +++ b/trunk/arch/arm/mach-pxa/lubbock.c @@ -15,7 +15,6 @@ #include #include #include -#include #include #include #include @@ -107,35 +106,6 @@ static void __init lubbock_init_irq(void) set_irq_type(IRQ_GPIO(0), IRQT_FALLING); } -#ifdef CONFIG_PM - -static int lubbock_irq_resume(struct sys_device *dev) -{ - LUB_IRQ_MASK_EN = lubbock_irq_enabled; - return 0; -} - -static struct sysdev_class lubbock_irq_sysclass = { - set_kset_name("cpld_irq"), - .resume = lubbock_irq_resume, -}; - -static struct sys_device lubbock_irq_device = { - .cls = &lubbock_irq_sysclass, -}; - -static int __init lubbock_irq_device_init(void) -{ - int ret = sysdev_class_register(&lubbock_irq_sysclass); - if (ret == 0) - ret = sysdev_register(&lubbock_irq_device); - return ret; -} - -device_initcall(lubbock_irq_device_init); - -#endif - static int lubbock_udc_is_connected(void) { return (LUB_MISC_RD & (1 << 9)) == 0; diff --git a/trunk/arch/arm/mach-pxa/mainstone.c b/trunk/arch/arm/mach-pxa/mainstone.c index 9896afca751f..6823ae28ae6a 100644 --- a/trunk/arch/arm/mach-pxa/mainstone.c +++ b/trunk/arch/arm/mach-pxa/mainstone.c @@ -15,7 +15,6 @@ #include #include -#include #include #include #include @@ -63,6 +62,7 @@ static struct irqchip mainstone_irq_chip = { .unmask = mainstone_unmask_irq, }; + static void mainstone_irq_handler(unsigned int irq, struct irqdesc *desc, struct pt_regs *regs) { @@ -100,35 +100,6 @@ static void __init mainstone_init_irq(void) set_irq_type(IRQ_GPIO(0), IRQT_FALLING); } -#ifdef CONFIG_PM - -static int mainstone_irq_resume(struct sys_device *dev) -{ - MST_INTMSKENA = mainstone_irq_enabled; - return 0; -} - -static struct sysdev_class mainstone_irq_sysclass = { - set_kset_name("cpld_irq"), - .resume = mainstone_irq_resume, -}; - -static struct sys_device mainstone_irq_device = { - .cls = &mainstone_irq_sysclass, -}; - -static int __init mainstone_irq_device_init(void) -{ - int ret = sysdev_class_register(&mainstone_irq_sysclass); - if (ret == 0) - ret = sysdev_register(&mainstone_irq_device); - return ret; -} - -device_initcall(mainstone_irq_device_init); - -#endif - static struct resource smc91x_resources[] = { [0] = { diff --git a/trunk/arch/arm/mach-versatile/core.c b/trunk/arch/arm/mach-versatile/core.c index 302c2a7b9b63..554e1bd30d6e 100644 --- a/trunk/arch/arm/mach-versatile/core.c +++ b/trunk/arch/arm/mach-versatile/core.c @@ -543,7 +543,7 @@ static void versatile_clcd_enable(struct clcd_fb *fb) val |= SYS_CLCD_MODE_5551; break; case 6: - val |= SYS_CLCD_MODE_565_RLSB; + val |= SYS_CLCD_MODE_565_BLSB; break; case 8: val |= SYS_CLCD_MODE_888; diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c index 0ef7a0065ece..2210bacad56a 100644 --- a/trunk/drivers/block/cfq-iosched.c +++ b/trunk/drivers/block/cfq-iosched.c @@ -1202,13 +1202,16 @@ __cfq_get_queue(struct cfq_data *cfqd, unsigned long key, int gfp_mask) if (new_cfqq) { cfqq = new_cfqq; new_cfqq = NULL; - } else if (gfp_mask & __GFP_WAIT) { + } else { spin_unlock_irq(cfqd->queue->queue_lock); new_cfqq = kmem_cache_alloc(cfq_pool, gfp_mask); spin_lock_irq(cfqd->queue->queue_lock); + + if (!new_cfqq && !(gfp_mask & __GFP_WAIT)) + goto out; + goto retry; - } else - goto out; + } memset(cfqq, 0, sizeof(*cfqq)); diff --git a/trunk/drivers/ieee1394/sbp2.c b/trunk/drivers/ieee1394/sbp2.c index ab82d6addd7f..00c7b958361a 100644 --- a/trunk/drivers/ieee1394/sbp2.c +++ b/trunk/drivers/ieee1394/sbp2.c @@ -745,8 +745,7 @@ static struct scsi_id_instance_data *sbp2_alloc_device(struct unit_directory *ud list_add_tail(&scsi_id->scsi_list, &hi->scsi_ids); /* Register our host with the SCSI stack. */ - scsi_host = scsi_host_alloc(&scsi_driver_template, - sizeof (unsigned long)); + scsi_host = scsi_host_alloc(&scsi_driver_template, 0); if (!scsi_host) { SBP2_ERR("failed to register scsi host"); goto failed_alloc; diff --git a/trunk/drivers/input/mouse/alps.c b/trunk/drivers/input/mouse/alps.c index 7bf4be733e9a..42a9f7f6f8cb 100644 --- a/trunk/drivers/input/mouse/alps.c +++ b/trunk/drivers/input/mouse/alps.c @@ -352,7 +352,7 @@ static int alps_reconnect(struct psmouse *psmouse) if (alps_get_status(psmouse, param)) return -1; - if (!(param[0] & 0x04)) + if (param[0] & 0x04) alps_tap_mode(psmouse, 1); if (alps_absolute_mode(psmouse)) { diff --git a/trunk/drivers/pci/pci-driver.c b/trunk/drivers/pci/pci-driver.c index f315df2005bc..fe98553c978f 100644 --- a/trunk/drivers/pci/pci-driver.c +++ b/trunk/drivers/pci/pci-driver.c @@ -393,10 +393,7 @@ int pci_register_driver(struct pci_driver *drv) drv->driver.bus = &pci_bus_type; drv->driver.probe = pci_device_probe; drv->driver.remove = pci_device_remove; - /* FIXME, once all of the existing PCI drivers have been fixed to set - * the pci shutdown function, this test can go away. */ - if (!drv->driver.shutdown) - drv->driver.shutdown = pci_device_shutdown, + drv->driver.shutdown = pci_device_shutdown, drv->driver.owner = drv->owner; drv->driver.kobj.ktype = &pci_driver_kobj_type; pci_init_dynids(&drv->dynids); diff --git a/trunk/drivers/usb/net/kaweth.c b/trunk/drivers/usb/net/kaweth.c index fd6ff4cb2c62..a9a7cf4a38eb 100644 --- a/trunk/drivers/usb/net/kaweth.c +++ b/trunk/drivers/usb/net/kaweth.c @@ -520,7 +520,7 @@ static void int_callback(struct urb *u, struct pt_regs *regs) /* we check the link state to report changes */ if (kaweth->linkstate != (act_state = ( kaweth->intbuffer[STATE_OFFSET] | STATE_MASK) >> STATE_SHIFT)) { - if (act_state) + if (!act_state) netif_carrier_on(kaweth->net); else netif_carrier_off(kaweth->net); diff --git a/trunk/fs/binfmt_elf.c b/trunk/fs/binfmt_elf.c index f8f6b6b76179..c374be51b041 100644 --- a/trunk/fs/binfmt_elf.c +++ b/trunk/fs/binfmt_elf.c @@ -1125,7 +1125,7 @@ static int dump_write(struct file *file, const void *addr, int nr) return file->f_op->write(file, addr, nr, &file->f_pos) == nr; } -static int dump_seek(struct file *file, loff_t off) +static int dump_seek(struct file *file, off_t off) { if (file->f_op->llseek) { if (file->f_op->llseek(file, off, 0) != off) diff --git a/trunk/include/asm-arm/arch-integrator/platform.h b/trunk/include/asm-arm/arch-integrator/platform.h index 96ad3d2a66d1..bd364f5a99bc 100644 --- a/trunk/include/asm-arm/arch-integrator/platform.h +++ b/trunk/include/asm-arm/arch-integrator/platform.h @@ -293,11 +293,7 @@ #define INTEGRATOR_DBG_SWITCH (INTEGRATOR_DBG_BASE + INTEGRATOR_DBG_SWITCH_OFFSET) -#if defined(CONFIG_ARCH_INTEGRATOR_AP) #define INTEGRATOR_GPIO_BASE 0x1B000000 /* GPIO */ -#elif defined(CONFIG_ARCH_INTEGRATOR_CP) -#define INTEGRATOR_GPIO_BASE 0xC9000000 /* GPIO */ -#endif /* ------------------------------------------------------------------------ * KMI keyboard/mouse definitions diff --git a/trunk/include/asm-arm/arch-versatile/platform.h b/trunk/include/asm-arm/arch-versatile/platform.h index a71093e44c58..2598d1f08548 100644 --- a/trunk/include/asm-arm/arch-versatile/platform.h +++ b/trunk/include/asm-arm/arch-versatile/platform.h @@ -498,17 +498,11 @@ /* * IB2 Versatile/AB expansion board definitions */ -#define VERSATILE_IB2_CAMERA_BANK VERSATILE_IB2_BASE -#define VERSATILE_IB2_KBD_DATAREG (VERSATILE_IB2_BASE + 0x01000000) - -/* VICINTSOURCE27 */ -#define VERSATILE_IB2_INT_BASE (VERSATILE_IB2_BASE + 0x02000000) -#define VERSATILE_IB2_IER (VERSATILE_IB2_INT_BASE + 0) -#define VERSATILE_IB2_ISR (VERSATILE_IB2_INT_BASE + 4) - -#define VERSATILE_IB2_CTL_BASE (VERSATILE_IB2_BASE + 0x03000000) -#define VERSATILE_IB2_CTRL (VERSATILE_IB2_CTL_BASE + 0) -#define VERSATILE_IB2_STAT (VERSATILE_IB2_CTL_BASE + 4) +#define VERSATILE_IB2_CAMERA_BANK 0x24000000 +#define VERSATILE_IB2_KBD_DATAREG 0x25000000 +#define VERSATILE_IB2_IER 0x26000000 /* for VICINTSOURCE27 */ +#define VERSATILE_IB2_CTRL 0x27000000 +#define VERSATILE_IB2_STAT 0x27000004 #endif #endif diff --git a/trunk/kernel/exit.c b/trunk/kernel/exit.c index 2ef2ad540201..edaa50b5bbfa 100644 --- a/trunk/kernel/exit.c +++ b/trunk/kernel/exit.c @@ -811,8 +811,10 @@ fastcall NORET_TYPE void do_exit(long code) acct_update_integrals(tsk); update_mem_hiwater(tsk); group_dead = atomic_dec_and_test(&tsk->signal->live); - if (group_dead) + if (group_dead) { + del_timer_sync(&tsk->signal->real_timer); acct_process(code); + } exit_mm(tsk); exit_sem(tsk); diff --git a/trunk/kernel/posix-timers.c b/trunk/kernel/posix-timers.c index cabb63fc9e16..fd316c272260 100644 --- a/trunk/kernel/posix-timers.c +++ b/trunk/kernel/posix-timers.c @@ -1197,7 +1197,6 @@ void exit_itimers(struct signal_struct *sig) tmr = list_entry(sig->posix_timers.next, struct k_itimer, list); itimer_delete(tmr); } - del_timer_sync(&sig->real_timer); } /*