The patch titled drivers/dma/ioat_dma.c: make 3 functions static has been removed from the -mm tree. Its filename was i-oat-add-support-for-msi-and-msi-x-fix.patch This patch was dropped because it was folded into i-oat-add-support-for-msi-and-msi-x.patch ------------------------------------------------------ Subject: drivers/dma/ioat_dma.c: make 3 functions static From: Adrian Bunk <bunk@xxxxxxxxxx> This patch makes three needlessly global functions static. Signed-off-by: Adrian Bunk <bunk@xxxxxxxxxx> Cc: Shannon Nelson <shannon.nelson@xxxxxxxxx> Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- drivers/dma/ioat_dma.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff -puN drivers/dma/ioat_dma.c~i-oat-add-support-for-msi-and-msi-x-fix drivers/dma/ioat_dma.c --- a/drivers/dma/ioat_dma.c~i-oat-add-support-for-msi-and-msi-x-fix +++ a/drivers/dma/ioat_dma.c @@ -47,8 +47,8 @@ static void ioat_dma_start_null_desc(struct ioat_dma_chan *ioat_chan); static void ioat_dma_memcpy_cleanup(struct ioat_dma_chan *ioat_chan); -struct ioat_dma_chan *ioat_lookup_chan_by_index(struct ioatdma_device *device, - int index) +static struct ioat_dma_chan *ioat_lookup_chan_by_index(struct ioatdma_device *device, + int index) { return device->idx[index]; } @@ -716,7 +716,7 @@ MODULE_PARM_DESC(ioat_interrupt_style, * ioat_dma_setup_interrupts - setup interrupt handler * @device: ioat device */ -int ioat_dma_setup_interrupts(struct ioatdma_device *device) +static int ioat_dma_setup_interrupts(struct ioatdma_device *device) { struct ioat_dma_chan *ioat_chan; int err, i, j, msixcnt; @@ -826,7 +826,7 @@ err_no_irq: * ioat_dma_remove_interrupts - remove whatever interrupts were set * @device: ioat device */ -void ioat_dma_remove_interrupts(struct ioatdma_device *device) +static void ioat_dma_remove_interrupts(struct ioatdma_device *device) { struct ioat_dma_chan *ioat_chan; int i; _ Patches currently in -mm which might be from bunk@xxxxxxxxxx are origin.patch uml-fix-inlines.patch i-oat-add-support-for-msi-and-msi-x.patch i-oat-add-support-for-msi-and-msi-x-fix.patch kernel-time-timekeepingc-cleanups.patch make-fs-libfscsimple_commit_write-static.patch allow-disabling-dnotify-without-embedded.patch use-erestart_restartblock-if-poll-is-interrupted-by-a-signal-fix.patch remove-include-asm-ipch.patch n_hdlcc-fix-check-after-use.patch kernel-sys_nic-add-dummy-sys_ni_syscall-prototype.patch make-kernel-profilectime_hook-static.patch drivers-block-ccissc-fix-check-after-use.patch remove-fs-ext2-balloccreserve_blocks.patch pm3fb-mtrr-support-and-noaccel-option-make-pm3fb_init-static-again.patch bitmaph-remove-dead-artifacts.patch sysctl-parport-remove-binary-paths-fix.patch sysctl-error-on-bad-sysctl-tables-kernel-sysctl_checkc-must-include-linux-stringh.patch memory-controller-add-per-container-lru-and-reclaim-v7-cleanup.patch memory-controller-add-switch-to-control-what-type-of-pages-to-limit-v7-cleanup.patch remove-asm-bitopsh-includes.patch forbid-asm-bitopsh-direct-inclusion.patch alpha-lock-bitops-fix.patch reiser4-cryptcompress-misc-fixups-make-3-functions-static.patch remove-asm-bitopsh-includes-reiser4.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