aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-25 06:11:02 -0400
commit59e52534172d845ebffb0d7e85fc56fb7b857051 (patch)
tree49552e03f1bdb413cd8b5f7542e91770688d7047 /kernel
parent73692d9bb58ecc2fa73f4b2bfcf6eadaa6d49a26 (diff)
parent0d89e54c8249645404283436d952afc261a04e1e (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (59 commits) MAINTAINERS: linux-m32r is moderated for non-subscribers linux@lists.openrisc.net is moderated for non-subscribers Drop default from "DM365 codec select" choice parisc: Kconfig: cleanup Kernel page size default Kconfig: remove redundant CONFIG_ prefix on two symbols cris: remove arch/cris/arch-v32/lib/nand_init.S microblaze: add missing CONFIG_ prefixes h8300: drop puzzling Kconfig dependencies MAINTAINERS: microblaze-uclinux@itee.uq.edu.au is moderated for non-subscribers tty: drop superfluous dependency in Kconfig ARM: mxc: fix Kconfig typo 'i.MX51' Fix file references in Kconfig files aic7xxx: fix Kconfig references to READMEs Fix file references in drivers/ide/ thinkpad_acpi: Fix printk typo 'bluestooth' bcmring: drop commented out line in Kconfig btmrvl_sdio: fix typo 'btmrvl_sdio_sd6888' doc: raw1394: Trivial typo fix CIFS: Don't free volume_info->UNC until we are entirely done with it. treewide: Correct spelling of successfully in comments ...
Diffstat (limited to 'kernel')
-rw-r--r--kernel/async.c4
-rw-r--r--kernel/futex.c10
-rw-r--r--kernel/sched.c2
3 files changed, 8 insertions, 8 deletions
diff --git a/kernel/async.c b/kernel/async.c
index d5fe7af0de2..4c2843c0043 100644
--- a/kernel/async.c
+++ b/kernel/async.c
@@ -120,7 +120,7 @@ static void async_run_entry_fn(struct work_struct *work)
120 struct async_entry *entry = 120 struct async_entry *entry =
121 container_of(work, struct async_entry, work); 121 container_of(work, struct async_entry, work);
122 unsigned long flags; 122 unsigned long flags;
123 ktime_t calltime, delta, rettime; 123 ktime_t uninitialized_var(calltime), delta, rettime;
124 124
125 /* 1) move self to the running queue */ 125 /* 1) move self to the running queue */
126 spin_lock_irqsave(&async_lock, flags); 126 spin_lock_irqsave(&async_lock, flags);
@@ -269,7 +269,7 @@ EXPORT_SYMBOL_GPL(async_synchronize_full_domain);
269void async_synchronize_cookie_domain(async_cookie_t cookie, 269void async_synchronize_cookie_domain(async_cookie_t cookie,
270 struct list_head *running) 270 struct list_head *running)
271{ 271{
272 ktime_t starttime, delta, endtime; 272 ktime_t uninitialized_var(starttime), delta, endtime;
273 273
274 if (initcall_debug && system_state == SYSTEM_BOOTING) { 274 if (initcall_debug && system_state == SYSTEM_BOOTING) {
275 printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current)); 275 printk(KERN_DEBUG "async_waiting @ %i\n", task_pid_nr(current));
diff --git a/kernel/futex.c b/kernel/futex.c
index 11cbe052b2e..1511dff0cfd 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -854,7 +854,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
854{ 854{
855 struct task_struct *new_owner; 855 struct task_struct *new_owner;
856 struct futex_pi_state *pi_state = this->pi_state; 856 struct futex_pi_state *pi_state = this->pi_state;
857 u32 curval, newval; 857 u32 uninitialized_var(curval), newval;
858 858
859 if (!pi_state) 859 if (!pi_state)
860 return -EINVAL; 860 return -EINVAL;
@@ -916,7 +916,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
916 916
917static int unlock_futex_pi(u32 __user *uaddr, u32 uval) 917static int unlock_futex_pi(u32 __user *uaddr, u32 uval)
918{ 918{
919 u32 oldval; 919 u32 uninitialized_var(oldval);
920 920
921 /* 921 /*
922 * There is no waiter, so we unlock the futex. The owner died 922 * There is no waiter, so we unlock the futex. The owner died
@@ -1576,7 +1576,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
1576 u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; 1576 u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
1577 struct futex_pi_state *pi_state = q->pi_state; 1577 struct futex_pi_state *pi_state = q->pi_state;
1578 struct task_struct *oldowner = pi_state->owner; 1578 struct task_struct *oldowner = pi_state->owner;
1579 u32 uval, curval, newval; 1579 u32 uval, uninitialized_var(curval), newval;
1580 int ret; 1580 int ret;
1581 1581
1582 /* Owner died? */ 1582 /* Owner died? */
@@ -1793,7 +1793,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
1793 * 1793 *
1794 * Returns: 1794 * Returns:
1795 * 0 - uaddr contains val and hb has been locked 1795 * 0 - uaddr contains val and hb has been locked
1796 * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlcoked 1796 * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlocked
1797 */ 1797 */
1798static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, 1798static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
1799 struct futex_q *q, struct futex_hash_bucket **hb) 1799 struct futex_q *q, struct futex_hash_bucket **hb)
@@ -2481,7 +2481,7 @@ err_unlock:
2481 */ 2481 */
2482int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi) 2482int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)
2483{ 2483{
2484 u32 uval, nval, mval; 2484 u32 uval, uninitialized_var(nval), mval;
2485 2485
2486retry: 2486retry:
2487 if (get_user(uval, uaddr)) 2487 if (get_user(uval, uaddr))
diff --git a/kernel/sched.c b/kernel/sched.c
index b50b0f0c9aa..8aa00803c1e 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -1739,7 +1739,7 @@ static inline void __set_task_cpu(struct task_struct *p, unsigned int cpu)
1739#ifdef CONFIG_SMP 1739#ifdef CONFIG_SMP
1740 /* 1740 /*
1741 * After ->cpu is set up to a new value, task_rq_lock(p, ...) can be 1741 * After ->cpu is set up to a new value, task_rq_lock(p, ...) can be
1742 * successfuly executed on another CPU. We must ensure that updates of 1742 * successfully executed on another CPU. We must ensure that updates of
1743 * per-task data have been completed by this moment. 1743 * per-task data have been completed by this moment.
1744 */ 1744 */
1745 smp_wmb(); 1745 smp_wmb();