The patch titled nozomi-irq-flags-fixes has been added to the -mm tree. Its filename is nozomi-irq-flags-fixes.patch See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find out what to do about this ------------------------------------------------------ Subject: nozomi-irq-flags-fixes From: Andrew Morton <akpm@xxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/char/nozomi.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff -puN drivers/char/nozomi.c~nozomi-irq-flags-fixes drivers/char/nozomi.c --- a/drivers/char/nozomi.c~nozomi-irq-flags-fixes +++ a/drivers/char/nozomi.c @@ -1444,7 +1444,7 @@ static void tty_flip_queue_function(void { dc_t *dc = (dc_t *) tmp_dc; int i; - u32 flags; + unsigned long flags; /* Enable interrupt for that port */ for (i = 0; i < MAX_PORT; i++) { @@ -1620,8 +1620,7 @@ static int __devinit nozomi_card_init(st static void tty_do_close(dc_t * dc, struct port *port) { - - u32 flags; + unsigned long flags; if (down_interruptible(&port->tty_sem)) { return; @@ -1749,7 +1748,7 @@ static int ntty_open(struct tty_struct * s32 index = get_index(tty); struct port *port = get_port_by_tty(tty); dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; if (down_interruptible(&port->tty_sem)) { return -ERESTARTSYS; @@ -1792,7 +1791,7 @@ static int ntty_write(struct tty_struct int rval = -EINVAL; dc_t *dc = get_dc_by_tty(tty); struct port *port = (struct port *)tty->driver_data; - u32 flags; + unsigned long flags; /* D1( "WRITEx: %d, index = %d", count, index); */ @@ -2053,7 +2052,7 @@ static int ntty_ioctl(struct tty_struct { struct port *port = tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; int mask; int rval = -ENOIOCTLCMD; @@ -2126,7 +2125,7 @@ static void ntty_unthrottle(struct tty_s { struct port *port = (struct port *)tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; D1("UNTHROTTLE"); spin_lock_irqsave(&dc->spin_mutex, flags); @@ -2142,7 +2141,7 @@ static void ntty_throttle(struct tty_str { struct port *port = (struct port *)tty->driver_data; dc_t *dc = get_dc_by_tty(tty); - u32 flags; + unsigned long flags; D1("THROTTLE"); spin_lock_irqsave(&dc->spin_mutex, flags); _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch pci-declare-pci_get_device_reverse.patch revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.patch vmscan-fix-temp_priority-race-comments.patch vmscan-fix-temp_priority-in-__zone-reclaim.patch revert-generic_file_buffered_write-handle-zero-length-iovec-segments.patch revert-generic_file_buffered_write-deadlock-on-vectored-write.patch generic_file_buffered_write-cleanup.patch mm-fix-pagecache-write-deadlocks.patch fs-prepare_write-fixes-fuse-fix.patch fs-prepare_write-fixes-fat-fix.patch git-acpi.patch acpi-asus-s3-resume-fix.patch sony_apci-resume.patch git-cpufreq-prep.patch git-cpufreq.patch nozomi-warning-fixes.patch git-dvb.patch git-dvb-fixup.patch git-ia64.patch git-input-fixup.patch git-libata-all.patch pata_marvell-marvell-6101-6145-pata-driver.patch git-mtd.patch git-netdev-all.patch libphy-dont-do-that.patch update-smc91x-driver-with-arm-versatile-board-info.patch drivers-net-ns83820c-add-paramter-to-disable-auto.patch git-net.patch ioat-warning-fix.patch git-pcmcia-fixup.patch git-serial-fixup.patch git-r8169.patch git-scsi-rc-fixes.patch revert-scsi-ips-soft-lockup-during-reset-initialization.patch scsi-ips-soft-lockup-during-reset-initialization-2.patch drivers-scsi-handcrafted-min-max-macro-removal.patch git-scsi-target-fixup.patch git-scsi-target-vs-git-block.patch hid-core-big-endian-fix-fix.patch git-watchdog.patch git-wireless.patch x86_64-dump_trace-atomicity-fix.patch unwinder-speedup-tweaks.patch paravirt-skip-timer-works.patch xfs-rename-uio_read.patch touchkit-ps-2-touchscreen-driver.patch get-rid-of-zone_table.patch new-scheme-to-preempt-swap-token-tidy.patch balance_pdgat-cleanup.patch vmalloc-optimization-cleanup-bugfixes-tweak.patch radix-tree-rcu-lockless-readside.patch acx1xx-wireless-driver.patch swsusp-add-resume_offset-command-line-parameter-rev-2.patch add-include-linux-freezerh-and-move-definitions-from-ueagle-fix.patch deprecate-smbfs-in-favour-of-cifs.patch edac-new-opteron-athlon64-memory-controller-driver.patch kbuild-dont-put-temp-files-in-the-source-tree.patch lockdep-annotate-nfs-nfsd-in-kernel-sockets-tidy.patch drivers-add-lcd-support-3-Kconfig-fix.patch setup_irq-better-mismatch-debugging.patch pktcdvd-bio-write-congestion-using-blk_congestion_wait-fix.patch bug-test-1.patch fsstack-introduce-fsstack_copy_attrinode_-tidy.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-fix.patch log2-implement-a-general-integer-log2-facility-in-the-kernel-vs-git-cryptodev.patch add-process_session-helper-routine-deprecate-old-field-tidy.patch add-process_session-helper-routine-deprecate-old-field-fix-warnings.patch add-process_session-helper-routine-deprecate-old-field-fix-warnings-2.patch fs-cache-provide-a-filesystem-specific-syncable-page-bit-ext4.patch fs-cache-make-kafs-use-fs-cache-fix.patch fs-cache-make-kafs-use-fs-cache-vs-streamline-generic_file_-interfaces-and-filemap.patch nfs-use-local-caching-12-fix.patch fs-cache-cachefiles-a-cache-that-backs-onto-a-mounted-filesystem-log2-fix.patch tty-switch-to-ktermios-and-new-framework-warning-fix.patch tty-switch-to-ktermios-bluetooth-fix.patch drivers-isdn-handcrafted-min-max-macro-removal-fix.patch swap_prefetch-vs-zoned-counters.patch add-include-linux-freezerh-and-move-definitions-from-prefetch.patch readahead-sysctl-parameters.patch make-copy_from_user_inatomic-not-zero-the-tail-on-i386-vs-reiser4.patch resier4-add-include-linux-freezerh-and-move-definitions-from.patch make-kmem_cache_destroy-return-void-reiser4.patch reiser4-hardirq-include-fix.patch reiser4-run-truncate_inode_pages-in-reiser4_delete_inode.patch reiser4-get_sb_dev-fix.patch reiser4-vs-zoned-allocator.patch hpt3xx-rework-rate-filtering-tidy.patch statistics-infrastructure-fix-buffer-overflow-in-histogram-with-linear-tidy.patch gtod-persistent-clock-support-i386.patch hrtimers-state-tracking.patch clockevents-drivers-for-i386.patch gtod-mark-tsc-unusable-for-highres-timers.patch round_jiffies-infrastructure-fix.patch kevent-core-files-fix.patch kevent-core-files-s390-hack.patch kevent-socket-notifications-fix-2.patch kevent-socket-notifications-fix-4.patch kevent-timer-notifications-fix.patch nr_blockdev_pages-in_interrupt-warning.patch device-suspend-debug.patch mutex-subsystem-synchro-test-module-fix.patch slab-leaks3-default-y.patch x86-kmap_atomic-debugging.patch restore-rogue-readahead-printk.patch put_bh-debug.patch acpi_format_exception-debug.patch jmicron-warning-fix.patch squash-ipc-warnings.patch squash-udf-warnings.patch nozomi-irq-flags-fixes.patch - To unsubscribe from this list: send the line "unsubscribe mm-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html