aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--drivers/dma/timb_dma.c2
-rw-r--r--drivers/usb/core/hub.c2
-rw-r--r--drivers/usb/host/uhci-hcd.c2
-rw-r--r--drivers/watchdog/sbc_epx_c3.c2
-rw-r--r--fs/btrfs/disk-io.c2
-rw-r--r--fs/notify/fanotify/fanotify_user.c2
-rw-r--r--fs/notify/inotify/inotify_user.c2
-rw-r--r--mm/mempolicy.c2
-rw-r--r--mm/shmem.c2
9 files changed, 9 insertions, 9 deletions
diff --git a/drivers/dma/timb_dma.c b/drivers/dma/timb_dma.c
index 3b88a4e7c98a..f69f90a61873 100644
--- a/drivers/dma/timb_dma.c
+++ b/drivers/dma/timb_dma.c
@@ -629,7 +629,7 @@ static int td_control(struct dma_chan *chan, enum dma_ctrl_cmd cmd,
629 desc_node) 629 desc_node)
630 list_move(&td_desc->desc_node, &td_chan->free_list); 630 list_move(&td_desc->desc_node, &td_chan->free_list);
631 631
632 /* now tear down the runnning */ 632 /* now tear down the running */
633 __td_finish(td_chan); 633 __td_finish(td_chan);
634 spin_unlock_bh(&td_chan->lock); 634 spin_unlock_bh(&td_chan->lock);
635 635
diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
index d041c6826e43..bb9a25dbd2cc 100644
--- a/drivers/usb/core/hub.c
+++ b/drivers/usb/core/hub.c
@@ -616,7 +616,7 @@ static int hub_port_disable(struct usb_hub *hub, int port1, int set_state)
616} 616}
617 617
618/* 618/*
619 * Disable a port and mark a logical connnect-change event, so that some 619 * Disable a port and mark a logical connect-change event, so that some
620 * time later khubd will disconnect() any existing usb_device on the port 620 * time later khubd will disconnect() any existing usb_device on the port
621 * and will re-enumerate if there actually is a device attached. 621 * and will re-enumerate if there actually is a device attached.
622 */ 622 */
diff --git a/drivers/usb/host/uhci-hcd.c b/drivers/usb/host/uhci-hcd.c
index cee867829ec9..4f65b14e5e08 100644
--- a/drivers/usb/host/uhci-hcd.c
+++ b/drivers/usb/host/uhci-hcd.c
@@ -471,7 +471,7 @@ static irqreturn_t uhci_irq(struct usb_hcd *hcd)
471 471
472/* 472/*
473 * Store the current frame number in uhci->frame_number if the controller 473 * Store the current frame number in uhci->frame_number if the controller
474 * is runnning. Expand from 11 bits (of which we use only 10) to a 474 * is running. Expand from 11 bits (of which we use only 10) to a
475 * full-sized integer. 475 * full-sized integer.
476 * 476 *
477 * Like many other parts of the driver, this code relies on being polled 477 * Like many other parts of the driver, this code relies on being polled
diff --git a/drivers/watchdog/sbc_epx_c3.c b/drivers/watchdog/sbc_epx_c3.c
index 28f1214457bd..3066a5127ca8 100644
--- a/drivers/watchdog/sbc_epx_c3.c
+++ b/drivers/watchdog/sbc_epx_c3.c
@@ -220,7 +220,7 @@ module_exit(watchdog_exit);
220MODULE_AUTHOR("Calin A. Culianu <calin@ajvar.org>"); 220MODULE_AUTHOR("Calin A. Culianu <calin@ajvar.org>");
221MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC. " 221MODULE_DESCRIPTION("Hardware Watchdog Device for Winsystems EPX-C3 SBC. "
222 "Note that there is no way to probe for this device -- " 222 "Note that there is no way to probe for this device -- "
223 "so only use it if you are *sure* you are runnning on this specific " 223 "so only use it if you are *sure* you are running on this specific "
224 "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!"); 224 "SBC system from Winsystems! It writes to IO ports 0x1ee and 0x1ef!");
225MODULE_LICENSE("GPL"); 225MODULE_LICENSE("GPL");
226MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR); 226MODULE_ALIAS_MISCDEV(WATCHDOG_MINOR);
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index fdce8799b98d..7b658d2107b4 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -2489,7 +2489,7 @@ int close_ctree(struct btrfs_root *root)
2489 * ERROR state on disk. 2489 * ERROR state on disk.
2490 * 2490 *
2491 * 2. when btrfs flips readonly just in btrfs_commit_super, 2491 * 2. when btrfs flips readonly just in btrfs_commit_super,
2492 * and in such case, btrfs cannnot write sb via btrfs_commit_super, 2492 * and in such case, btrfs cannot write sb via btrfs_commit_super,
2493 * and since fs_state has been set BTRFS_SUPER_FLAG_ERROR flag, 2493 * and since fs_state has been set BTRFS_SUPER_FLAG_ERROR flag,
2494 * btrfs will cleanup all FS resources first and write sb then. 2494 * btrfs will cleanup all FS resources first and write sb then.
2495 */ 2495 */
diff --git a/fs/notify/fanotify/fanotify_user.c b/fs/notify/fanotify/fanotify_user.c
index 8b61220cffc5..6b1305dc26c0 100644
--- a/fs/notify/fanotify/fanotify_user.c
+++ b/fs/notify/fanotify/fanotify_user.c
@@ -876,7 +876,7 @@ SYSCALL_ALIAS(sys_fanotify_mark, SyS_fanotify_mark);
876#endif 876#endif
877 877
878/* 878/*
879 * fanotify_user_setup - Our initialization function. Note that we cannnot return 879 * fanotify_user_setup - Our initialization function. Note that we cannot return
880 * error because we have compiled-in VFS hooks. So an (unlikely) failure here 880 * error because we have compiled-in VFS hooks. So an (unlikely) failure here
881 * must result in panic(). 881 * must result in panic().
882 */ 882 */
diff --git a/fs/notify/inotify/inotify_user.c b/fs/notify/inotify/inotify_user.c
index 4cd5d5d78f9f..bd46e7c8a0ef 100644
--- a/fs/notify/inotify/inotify_user.c
+++ b/fs/notify/inotify/inotify_user.c
@@ -841,7 +841,7 @@ out:
841} 841}
842 842
843/* 843/*
844 * inotify_user_setup - Our initialization function. Note that we cannnot return 844 * inotify_user_setup - Our initialization function. Note that we cannot return
845 * error because we have compiled-in VFS hooks. So an (unlikely) failure here 845 * error because we have compiled-in VFS hooks. So an (unlikely) failure here
846 * must result in panic(). 846 * must result in panic().
847 */ 847 */
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 368fc9d23610..a5d79958492c 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -993,7 +993,7 @@ int do_migrate_pages(struct mm_struct *mm,
993 * most recent <s, d> pair that moved (s != d). If we find a pair 993 * most recent <s, d> pair that moved (s != d). If we find a pair
994 * that not only moved, but what's better, moved to an empty slot 994 * that not only moved, but what's better, moved to an empty slot
995 * (d is not set in tmp), then we break out then, with that pair. 995 * (d is not set in tmp), then we break out then, with that pair.
996 * Otherwise when we finish scannng from_tmp, we at least have the 996 * Otherwise when we finish scanning from_tmp, we at least have the
997 * most recent <s, d> pair that moved. If we get all the way through 997 * most recent <s, d> pair that moved. If we get all the way through
998 * the scan of tmp without finding any node that moved, much less 998 * the scan of tmp without finding any node that moved, much less
999 * moved to an empty node, then there is nothing left worth migrating. 999 * moved to an empty node, then there is nothing left worth migrating.
diff --git a/mm/shmem.c b/mm/shmem.c
index 5ee67c990602..3cdb243256f4 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -779,7 +779,7 @@ static int shmem_notify_change(struct dentry *dentry, struct iattr *attr)
779 * If truncating down to a partial page, then 779 * If truncating down to a partial page, then
780 * if that page is already allocated, hold it 780 * if that page is already allocated, hold it
781 * in memory until the truncation is over, so 781 * in memory until the truncation is over, so
782 * truncate_partial_page cannnot miss it were 782 * truncate_partial_page cannot miss it were
783 * it assigned to swap. 783 * it assigned to swap.
784 */ 784 */
785 if (newsize & (PAGE_CACHE_SIZE-1)) { 785 if (newsize & (PAGE_CACHE_SIZE-1)) {