diff options
-rw-r--r-- | drivers/cpuidle/governor.c | 4 | ||||
-rw-r--r-- | drivers/infiniband/hw/cxgb3/cxio_hal.c | 2 | ||||
-rw-r--r-- | drivers/media/dvb/frontends/drx397xD.c | 2 | ||||
-rw-r--r-- | drivers/net/ps3_gelic_wireless.h | 2 | ||||
-rw-r--r-- | drivers/net/qla3xxx.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43/main.c | 2 | ||||
-rw-r--r-- | drivers/net/wireless/b43legacy/main.c | 2 | ||||
-rw-r--r-- | include/linux/dm-log-userspace.h | 2 | ||||
-rw-r--r-- | mm/kmemleak.c | 4 | ||||
-rw-r--r-- | mm/memcontrol.c | 2 |
10 files changed, 12 insertions, 12 deletions
diff --git a/drivers/cpuidle/governor.c b/drivers/cpuidle/governor.c index 70b59642a708..724c164d31c9 100644 --- a/drivers/cpuidle/governor.c +++ b/drivers/cpuidle/governor.c | |||
@@ -21,7 +21,7 @@ struct cpuidle_governor *cpuidle_curr_governor; | |||
21 | * __cpuidle_find_governor - finds a governor of the specified name | 21 | * __cpuidle_find_governor - finds a governor of the specified name |
22 | * @str: the name | 22 | * @str: the name |
23 | * | 23 | * |
24 | * Must be called with cpuidle_lock aquired. | 24 | * Must be called with cpuidle_lock acquired. |
25 | */ | 25 | */ |
26 | static struct cpuidle_governor * __cpuidle_find_governor(const char *str) | 26 | static struct cpuidle_governor * __cpuidle_find_governor(const char *str) |
27 | { | 27 | { |
@@ -39,7 +39,7 @@ static struct cpuidle_governor * __cpuidle_find_governor(const char *str) | |||
39 | * @gov: the new target governor | 39 | * @gov: the new target governor |
40 | * | 40 | * |
41 | * NOTE: "gov" can be NULL to specify disabled | 41 | * NOTE: "gov" can be NULL to specify disabled |
42 | * Must be called with cpuidle_lock aquired. | 42 | * Must be called with cpuidle_lock acquired. |
43 | */ | 43 | */ |
44 | int cpuidle_switch_governor(struct cpuidle_governor *gov) | 44 | int cpuidle_switch_governor(struct cpuidle_governor *gov) |
45 | { | 45 | { |
diff --git a/drivers/infiniband/hw/cxgb3/cxio_hal.c b/drivers/infiniband/hw/cxgb3/cxio_hal.c index 72ed3396b721..0677fc7dfd51 100644 --- a/drivers/infiniband/hw/cxgb3/cxio_hal.c +++ b/drivers/infiniband/hw/cxgb3/cxio_hal.c | |||
@@ -589,7 +589,7 @@ static int cxio_hal_destroy_ctrl_qp(struct cxio_rdev *rdev_p) | |||
589 | 589 | ||
590 | /* write len bytes of data into addr (32B aligned address) | 590 | /* write len bytes of data into addr (32B aligned address) |
591 | * If data is NULL, clear len byte of memory to zero. | 591 | * If data is NULL, clear len byte of memory to zero. |
592 | * caller aquires the ctrl_qp lock before the call | 592 | * caller acquires the ctrl_qp lock before the call |
593 | */ | 593 | */ |
594 | static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, | 594 | static int cxio_hal_ctrl_qp_write_mem(struct cxio_rdev *rdev_p, u32 addr, |
595 | u32 len, void *data) | 595 | u32 len, void *data) |
diff --git a/drivers/media/dvb/frontends/drx397xD.c b/drivers/media/dvb/frontends/drx397xD.c index 010075535221..868b78bfae75 100644 --- a/drivers/media/dvb/frontends/drx397xD.c +++ b/drivers/media/dvb/frontends/drx397xD.c | |||
@@ -81,7 +81,7 @@ static struct { | |||
81 | #include "drx397xD_fw.h" | 81 | #include "drx397xD_fw.h" |
82 | }; | 82 | }; |
83 | 83 | ||
84 | /* use only with writer lock aquired */ | 84 | /* use only with writer lock acquired */ |
85 | static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix) | 85 | static void _drx_release_fw(struct drx397xD_state *s, enum fw_ix ix) |
86 | { | 86 | { |
87 | memset(&fw[ix].data[0], 0, sizeof(fw[0].data)); | 87 | memset(&fw[ix].data[0], 0, sizeof(fw[0].data)); |
diff --git a/drivers/net/ps3_gelic_wireless.h b/drivers/net/ps3_gelic_wireless.h index 5b631c6c9775..0a88b535197a 100644 --- a/drivers/net/ps3_gelic_wireless.h +++ b/drivers/net/ps3_gelic_wireless.h | |||
@@ -199,7 +199,7 @@ struct gelic_eurus_rssi_info { | |||
199 | /* for 'stat' member of gelic_wl_info */ | 199 | /* for 'stat' member of gelic_wl_info */ |
200 | enum gelic_wl_info_status_bit { | 200 | enum gelic_wl_info_status_bit { |
201 | GELIC_WL_STAT_CONFIGURED, | 201 | GELIC_WL_STAT_CONFIGURED, |
202 | GELIC_WL_STAT_CH_INFO, /* ch info aquired */ | 202 | GELIC_WL_STAT_CH_INFO, /* ch info acquired */ |
203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ | 203 | GELIC_WL_STAT_ESSID_SET, /* ESSID specified by userspace */ |
204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ | 204 | GELIC_WL_STAT_BSSID_SET, /* BSSID specified by userspace */ |
205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ | 205 | GELIC_WL_STAT_WPA_PSK_SET, /* PMK specified by userspace */ |
diff --git a/drivers/net/qla3xxx.c b/drivers/net/qla3xxx.c index 4c610511eb40..f72643313bab 100644 --- a/drivers/net/qla3xxx.c +++ b/drivers/net/qla3xxx.c | |||
@@ -3651,7 +3651,7 @@ static int ql_adapter_up(struct ql3_adapter *qdev) | |||
3651 | ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); | 3651 | ql_sem_unlock(qdev, QL_DRVR_SEM_MASK); |
3652 | } else { | 3652 | } else { |
3653 | printk(KERN_ERR PFX | 3653 | printk(KERN_ERR PFX |
3654 | "%s: Could not aquire driver lock.\n", | 3654 | "%s: Could not acquire driver lock.\n", |
3655 | ndev->name); | 3655 | ndev->name); |
3656 | goto err_lock; | 3656 | goto err_lock; |
3657 | } | 3657 | } |
diff --git a/drivers/net/wireless/b43/main.c b/drivers/net/wireless/b43/main.c index 86f35827f008..f66efea61667 100644 --- a/drivers/net/wireless/b43/main.c +++ b/drivers/net/wireless/b43/main.c | |||
@@ -2955,7 +2955,7 @@ static void do_periodic_work(struct b43_wldev *dev) | |||
2955 | /* Periodic work locking policy: | 2955 | /* Periodic work locking policy: |
2956 | * The whole periodic work handler is protected by | 2956 | * The whole periodic work handler is protected by |
2957 | * wl->mutex. If another lock is needed somewhere in the | 2957 | * wl->mutex. If another lock is needed somewhere in the |
2958 | * pwork callchain, it's aquired in-place, where it's needed. | 2958 | * pwork callchain, it's acquired in-place, where it's needed. |
2959 | */ | 2959 | */ |
2960 | static void b43_periodic_work_handler(struct work_struct *work) | 2960 | static void b43_periodic_work_handler(struct work_struct *work) |
2961 | { | 2961 | { |
diff --git a/drivers/net/wireless/b43legacy/main.c b/drivers/net/wireless/b43legacy/main.c index 4b60148a5e61..881784b18b0b 100644 --- a/drivers/net/wireless/b43legacy/main.c +++ b/drivers/net/wireless/b43legacy/main.c | |||
@@ -2277,7 +2277,7 @@ static void do_periodic_work(struct b43legacy_wldev *dev) | |||
2277 | /* Periodic work locking policy: | 2277 | /* Periodic work locking policy: |
2278 | * The whole periodic work handler is protected by | 2278 | * The whole periodic work handler is protected by |
2279 | * wl->mutex. If another lock is needed somewhere in the | 2279 | * wl->mutex. If another lock is needed somewhere in the |
2280 | * pwork callchain, it's aquired in-place, where it's needed. | 2280 | * pwork callchain, it's acquired in-place, where it's needed. |
2281 | */ | 2281 | */ |
2282 | static void b43legacy_periodic_work_handler(struct work_struct *work) | 2282 | static void b43legacy_periodic_work_handler(struct work_struct *work) |
2283 | { | 2283 | { |
diff --git a/include/linux/dm-log-userspace.h b/include/linux/dm-log-userspace.h index 8a1f972c0fe9..0c3c3a2110c4 100644 --- a/include/linux/dm-log-userspace.h +++ b/include/linux/dm-log-userspace.h | |||
@@ -363,7 +363,7 @@ | |||
363 | * various request types above. The remaining 24-bits are currently | 363 | * various request types above. The remaining 24-bits are currently |
364 | * set to zero and are reserved for future use and compatibility concerns. | 364 | * set to zero and are reserved for future use and compatibility concerns. |
365 | * | 365 | * |
366 | * User-space should always use DM_ULOG_REQUEST_TYPE to aquire the | 366 | * User-space should always use DM_ULOG_REQUEST_TYPE to acquire the |
367 | * request type from the 'request_type' field to maintain forward compatibility. | 367 | * request type from the 'request_type' field to maintain forward compatibility. |
368 | */ | 368 | */ |
369 | #define DM_ULOG_REQUEST_MASK 0xFF | 369 | #define DM_ULOG_REQUEST_MASK 0xFF |
diff --git a/mm/kmemleak.c b/mm/kmemleak.c index 8bf765c4f58d..13f33b3081ec 100644 --- a/mm/kmemleak.c +++ b/mm/kmemleak.c | |||
@@ -1050,8 +1050,8 @@ static void scan_object(struct kmemleak_object *object) | |||
1050 | unsigned long flags; | 1050 | unsigned long flags; |
1051 | 1051 | ||
1052 | /* | 1052 | /* |
1053 | * Once the object->lock is aquired, the corresponding memory block | 1053 | * Once the object->lock is acquired, the corresponding memory block |
1054 | * cannot be freed (the same lock is aquired in delete_object). | 1054 | * cannot be freed (the same lock is acquired in delete_object). |
1055 | */ | 1055 | */ |
1056 | spin_lock_irqsave(&object->lock, flags); | 1056 | spin_lock_irqsave(&object->lock, flags); |
1057 | if (object->flags & OBJECT_NO_SCAN) | 1057 | if (object->flags & OBJECT_NO_SCAN) |
diff --git a/mm/memcontrol.c b/mm/memcontrol.c index f99f5991d6bb..7226e60e52af 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c | |||
@@ -1720,7 +1720,7 @@ int mem_cgroup_cache_charge(struct page *page, struct mm_struct *mm, | |||
1720 | /* | 1720 | /* |
1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. | 1721 | * While swap-in, try_charge -> commit or cancel, the page is locked. |
1722 | * And when try_charge() successfully returns, one refcnt to memcg without | 1722 | * And when try_charge() successfully returns, one refcnt to memcg without |
1723 | * struct page_cgroup is aquired. This refcnt will be cumsumed by | 1723 | * struct page_cgroup is acquired. This refcnt will be consumed by |
1724 | * "commit()" or removed by "cancel()" | 1724 | * "commit()" or removed by "cancel()" |
1725 | */ | 1725 | */ |
1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, | 1726 | int mem_cgroup_try_charge_swapin(struct mm_struct *mm, |