The patch titled update uio_interrupt has been removed from the -mm tree. Its filename was update-uio_interrupt.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ Subject: update uio_interrupt From: Andrew Morton <akpm@xxxxxxxx> Cc: Greg KH <greg@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxx> --- drivers/uio/uio_base.c | 4 ++-- drivers/uio/uio_dev.c | 6 +++--- drivers/uio/uio_dummy.c | 7 +++---- include/linux/uio_driver.h | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff -puN Documentation/DocBook/kernel-api.tmpl~update-uio_interrupt Documentation/DocBook/kernel-api.tmpl diff -puN drivers/Kconfig~update-uio_interrupt drivers/Kconfig diff -puN drivers/Makefile~update-uio_interrupt drivers/Makefile diff -puN drivers/uio/Kconfig~update-uio_interrupt drivers/uio/Kconfig diff -puN drivers/uio/Makefile~update-uio_interrupt drivers/uio/Makefile diff -puN drivers/uio/uio_base.c~update-uio_interrupt drivers/uio/uio_base.c --- a/drivers/uio/uio_base.c~update-uio_interrupt +++ a/drivers/uio/uio_base.c @@ -205,7 +205,7 @@ static void uio_do_poll(unsigned long da { struct uio_device *idev = (struct uio_device *)data; - uio_interrupt(-1, idev, NULL); + uio_interrupt(-1, idev); mod_timer(&idev->poll_timer, jiffies + idev->freq); } @@ -232,7 +232,7 @@ int uio_do_oneshot(void *data) ktime_to_timespec(&next, idev->next_event); ktimer_nanosleep(&next, NULL, KTIMER_ABS); ktime_set_scalar(idev->next_event, KTIME_ZERO); - uio_interrupt(-2, idev, NULL); + uio_interrupt(-2, idev); } # endif atomic_dec(&idev->running); diff -puN drivers/uio/uio_dev.c~update-uio_interrupt drivers/uio/uio_dev.c --- a/drivers/uio/uio_dev.c~update-uio_interrupt +++ a/drivers/uio/uio_dev.c @@ -255,12 +255,12 @@ int uio_event_release(struct inode *inod return 0; } -irqreturn_t uio_interrupt(int irq, void *dev_id, struct pt_regs *regs) +irqreturn_t uio_interrupt(int irq, void *dev_id) { - struct uio_device *idev = (struct uio_device *)dev_id; + struct uio_device *idev = dev_id; if (idev->handler) - idev->handler(irq, dev_id, regs); + idev->handler(irq, dev_id); if (idev->event_listener) { atomic_inc(&idev->event); diff -puN drivers/uio/uio_dummy.c~update-uio_interrupt drivers/uio/uio_dummy.c --- a/drivers/uio/uio_dummy.c~update-uio_interrupt +++ a/drivers/uio/uio_dummy.c @@ -14,8 +14,7 @@ #define MEMSIZE 8192 -static irqreturn_t uio_dummy_handler(int irq, void *dev_id, - struct pt_regs *reg); +static irqreturn_t uio_dummy_handler(int irq, void *dev_id); static struct file_operations uio_dummy_fops = { .open = uio_open, @@ -153,9 +152,9 @@ static int uio_dummy_irqsig(struct uio_d io_sig->it_process); } -static irqreturn_t uio_dummy_handler(int irq, void *dev_id, struct pt_regs *reg) +static irqreturn_t uio_dummy_handler(int irq, void *dev_id) { - struct uio_device *idev = (struct uio_device *)dev_id; + struct uio_device *idev = dev_id; uio_dummy_count++; *((long *) idev->physaddr) = uio_dummy_count; diff -puN include/linux/uio_driver.h~update-uio_interrupt include/linux/uio_driver.h --- a/include/linux/uio_driver.h~update-uio_interrupt +++ a/include/linux/uio_driver.h @@ -73,7 +73,7 @@ struct uio_device { enum uio_irq_type irq_type; /* callbacks */ - irqreturn_t (*handler)(int irq, void *dev_id, struct pt_regs *regs); + irqreturn_t (*handler)(int irq, void *dev_id); ssize_t (*event_write)(struct file *filep, const char __user * buf, size_t count, loff_t *ppos); @@ -100,7 +100,7 @@ int uio_mmap(struct file *filep, struct int uio_release(struct inode *inode, struct file *filep); /* event */ -irqreturn_t uio_interrupt(int irq, void *dev_id, struct pt_regs *regs); +irqreturn_t uio_interrupt(int irq, void *dev_id); extern struct file_operations uio_event_fops; #endif /* _LINUX_UIO_DRIVER_H_ */ _ Patches currently in -mm which might be from akpm@xxxxxxxx are origin.patch dm-raid1-fix-waiting-for-io-on-suspend-fix.patch revert-pci-quirk-for-ibm-dock-ii-cardbus-controllers.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 git-dvb.patch git-ia64.patch git-input.patch git-input-fixup.patch git-libata-all.patch via-pata-controller-xfer-fixes-fix.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 net-uninline-xfrm_selector_match.patch net-uninline-skb_put.patch ioat-warning-fix.patch revert-scsi-ips-soft-lockup-during-reset-initialization.patch scsi-ips-soft-lockup-during-reset-initialization-2.patch drivers-scsi-mca_53c9xc-save_flags-cli-removal-fix.patch git-watchdog.patch prep-for-paravirt-be-careful-about-touching-bios-warning-fix.patch paravirtualization-patch-inline-replacements-for-fix-2.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 cciss-set-sector_size-to-2048-for-performance-tidy.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 probe_kernel_address-needs-to-do-set_fs.patch slab-use-probe_kernel_address.patch lockdep-spin_lock_irqsave_nested-fix.patch lockdep-spin_lock_irqsave_nested-fix-2.patch aio-use-prepare_to_wait.patch exar-quad-port-serial-fix.patch vfs_getattr-remove-dead-code.patch ext3-uninline-large-functions.patch ext4-uninline-large-functions.patch uninline-module_put.patch sleep-profiling-fixes.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 log2-implement-a-general-integer-log2-facility-in-the-kernel-ppc-fix.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 mxser-session-warning-fix.patch tty-switch-to-ktermios-and-new-framework-warning-fix.patch tty-switch-to-ktermios-bluetooth-fix.patch char-istallion-correct-fail-paths-fix.patch drivers-isdn-handcrafted-min-max-macro-removal-fix.patch kernel-schedc-whitespace-cleanups-more.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 various-fbdev-files-mark-structs-fix.patch md-allow-reads-that-have-bypassed-the-cache-to-be-retried-on-failure-fix.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_user_wait-retval-fix.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 - 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