[PATCH -tip 1/2] kernel/fork.c: unused variable 'ret'

[PATCH -tip 1/2] kernel/fork.c: unused variable 'ret'

[Steven Noonan]

Removed the unused variable.

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 kernel/fork.c |    1 -
 1 files changed, 0 insertions(+), 1 deletions(-)

diff --git a/kernel/fork.c b/kernel/fork.c
index ce4003a..fb1f5e9 100644
--- a/kernel/fork.c
+++ b/kernel/fork.c
@@ -822,7 +822,6 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
 static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
 {
 	struct signal_struct *sig;
-	int ret;
 
 	if (clone_flags & CLONE_THREAD) {
 		atomic_inc(&current->signal->count);
-- 
1.6.1

[PATCH -tip 2/2] kernel/sched.c: forward declaration for 'double_rq_lock' missing

[Steven Noonan]

Impact: compile error eliminated

Added 'double_rq_lock' forward declaration, allowing double_rq_lock
to be used in _double_lock_balance().

Signed-off-by: Steven Noonan <steven@uplinklabs.net>
---
 kernel/sched.c |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/kernel/sched.c b/kernel/sched.c
index 8409dba..107c5a2 100644
--- a/kernel/sched.c
+++ b/kernel/sched.c
@@ -125,6 +125,9 @@ DEFINE_TRACE(sched_switch);
 DEFINE_TRACE(sched_migrate_task);
 
 #ifdef CONFIG_SMP
+
+static void double_rq_lock(struct rq *rq1, struct rq *rq2);
+
 /*
  * Divide a load by a sched group cpu_power : (load / sg->__cpu_power)
  * Since cpu_power is a 'constant', we can use a reciprocal divide.
-- 
1.6.1

Re: [PATCH -tip 2/2] kernel/sched.c: forward declaration for 'double_rq_lock' missing

[Ingo Molnar]

* Steven Noonan <steven@uplinklabs.net> wrote:

> Impact: compile error eliminated
> 
> Added 'double_rq_lock' forward declaration, allowing double_rq_lock
> to be used in _double_lock_balance().
> 
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>
> ---
>  kernel/sched.c |    3 +++
>  1 files changed, 3 insertions(+), 0 deletions(-)

applied to tip/sched/urgent, thanks Steven.

I have not seen such build failures myself - could you please send the 
.config that triggers it?

	Ingo

Re: [PATCH -tip 1/2] kernel/fork.c: unused variable 'ret'

[Ingo Molnar]

* Steven Noonan <steven@uplinklabs.net> wrote:

> Removed the unused variable.
> 
> Signed-off-by: Steven Noonan <steven@uplinklabs.net>
> ---
>  kernel/fork.c |    1 -
>  1 files changed, 0 insertions(+), 1 deletions(-)
> 
> diff --git a/kernel/fork.c b/kernel/fork.c
> index ce4003a..fb1f5e9 100644
> --- a/kernel/fork.c
> +++ b/kernel/fork.c
> @@ -822,7 +822,6 @@ static void posix_cpu_timers_init_group(struct signal_struct *sig)
>  static int copy_signal(unsigned long clone_flags, struct task_struct *tsk)
>  {
>  	struct signal_struct *sig;
> -	int ret;
>  
>  	if (clone_flags & CLONE_THREAD) {
>  		atomic_inc(&current->signal->count);

applied to tip/core/urgent, thanks Steve!

	Ingo