[PATCH][RT] Fix build errors in rtmutex

[PATCH][RT] Fix build errors in rtmutex

[Sven-Thorsten Dietrich]

Subject: Fix up "too few parameters to function" build errors in rtmutex
From: Sven-Thorsten Dietrich <sdietrich@suse.de>

Signed-off-by: Sven-Thorsten Dietrich <sdietrich@suse.de>
Index: b/kernel/rtmutex.c
===================================================================
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -1513,7 +1513,8 @@ int rt_mutex_start_proxy_lock(struct rt_
 
 	mark_rt_mutex_waiters(lock);
 
-	if (!rt_mutex_owner(lock) || try_to_steal_lock(lock, task)) {
+	if (!rt_mutex_owner(lock) || 
+	   try_to_steal_lock(lock, task, STEAL_NORMAL)) {
 		/* We got the lock for task. */
 		debug_rt_mutex_lock(lock);
 		rt_mutex_set_owner(lock, task, 0);
@@ -1522,7 +1523,8 @@ int rt_mutex_start_proxy_lock(struct rt_
 		return 1;
 	}
 
-	ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock);
+	ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock, 
+				     flags);
 
 	if (ret && !waiter->task) {
 		/*
Index: b/kernel/trace/ring_buffer.c
===================================================================
--- a/kernel/trace/ring_buffer.c
+++ b/kernel/trace/ring_buffer.c
@@ -2522,7 +2522,7 @@ ring_buffer_peek(struct ring_buffer *buf
 	if (event && event->type_len == RINGBUF_TYPE_PADDING)
 		rb_advance_reader(cpu_buffer);
 	if (dolock)
-		atomic_)spin_unlock(&cpu_buffer->reader_lock);
+		atomic_spin_unlock(&cpu_buffer->reader_lock);
 	local_irq_restore(flags);
 
 	if (event && event->type_len == RINGBUF_TYPE_PADDING) {

Re: [PATCH][RT] Fix build errors in rtmutex

[John Kacur]

On Thu, Aug 13, 2009 at 6:41 AM, Sven-Thorsten
Dietrich<sdietrich@novell.com> wrote:
> Subject: Fix up "too few parameters to function" build errors in rtmutex
> From: Sven-Thorsten Dietrich <sdietrich@suse.de>
>
> Signed-off-by: Sven-Thorsten Dietrich <sdietrich@suse.de>
> Index: b/kernel/rtmutex.c
> ===================================================================
> --- a/kernel/rtmutex.c
> +++ b/kernel/rtmutex.c
> @@ -1513,7 +1513,8 @@ int rt_mutex_start_proxy_lock(struct rt_
>
>        mark_rt_mutex_waiters(lock);
>
> -       if (!rt_mutex_owner(lock) || try_to_steal_lock(lock, task)) {
> +       if (!rt_mutex_owner(lock) ||
> +          try_to_steal_lock(lock, task, STEAL_NORMAL)) {
>                /* We got the lock for task. */
>                debug_rt_mutex_lock(lock);
>                rt_mutex_set_owner(lock, task, 0);
> @@ -1522,7 +1523,8 @@ int rt_mutex_start_proxy_lock(struct rt_
>                return 1;
>        }
>
> -       ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock);
> +       ret = task_blocks_on_rt_mutex(lock, waiter, task, detect_deadlock,
> +                                    flags);
>
>        if (ret && !waiter->task) {
>                /*
> Index: b/kernel/trace/ring_buffer.c
> ===================================================================
> --- a/kernel/trace/ring_buffer.c
> +++ b/kernel/trace/ring_buffer.c
> @@ -2522,7 +2522,7 @@ ring_buffer_peek(struct ring_buffer *buf
>        if (event && event->type_len == RINGBUF_TYPE_PADDING)
>                rb_advance_reader(cpu_buffer);
>        if (dolock)
> -               atomic_)spin_unlock(&cpu_buffer->reader_lock);
> +               atomic_spin_unlock(&cpu_buffer->reader_lock);
>        local_irq_restore(flags);
>
>        if (event && event->type_len == RINGBUF_TYPE_PADDING) {
>
>

Hi Sven

I have to admit I'm scratching my head over this one, I don't see any
rt trees that it applies to. Which version are you referring to here?

Thanks