diff options
| -rw-r--r-- | kernel/trace/ring_buffer.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/kernel/trace/ring_buffer.c b/kernel/trace/ring_buffer.c index 8786c350b4ca..6eef38923b07 100644 --- a/kernel/trace/ring_buffer.c +++ b/kernel/trace/ring_buffer.c | |||
| @@ -701,8 +701,8 @@ static int rb_head_page_set(struct ring_buffer_per_cpu *cpu_buffer, | |||
| 701 | 701 | ||
| 702 | val &= ~RB_FLAG_MASK; | 702 | val &= ~RB_FLAG_MASK; |
| 703 | 703 | ||
| 704 | ret = (unsigned long)cmpxchg(&list->next, | 704 | ret = cmpxchg((unsigned long *)&list->next, |
| 705 | val | old_flag, val | new_flag); | 705 | val | old_flag, val | new_flag); |
| 706 | 706 | ||
| 707 | /* check if the reader took the page */ | 707 | /* check if the reader took the page */ |
| 708 | if ((ret & ~RB_FLAG_MASK) != val) | 708 | if ((ret & ~RB_FLAG_MASK) != val) |
| @@ -794,7 +794,7 @@ static int rb_head_page_replace(struct buffer_page *old, | |||
| 794 | val = *ptr & ~RB_FLAG_MASK; | 794 | val = *ptr & ~RB_FLAG_MASK; |
| 795 | val |= RB_PAGE_HEAD; | 795 | val |= RB_PAGE_HEAD; |
| 796 | 796 | ||
| 797 | ret = cmpxchg(ptr, val, &new->list); | 797 | ret = cmpxchg(ptr, val, (unsigned long)&new->list); |
| 798 | 798 | ||
| 799 | return ret == val; | 799 | return ret == val; |
| 800 | } | 800 | } |
