Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1240126 > unrolled thread

[PATCH RT 0/4] Warning fixes for PREEMPT_RT

Back to article view | Back to linux.kernel

Contents

  [PATCH RT 0/4] Warning fixes for PREEMPT_RT Ben Hutchings <ben@decadent.org.uk> - 2015-10-06 04:50 +0200
    [PATCH RT 2/4] rtmutex: Fix rt_mutex_timed_fastlock() slowfn type  mismatch up to 3.10 Ben Hutchings <ben@decadent.org.uk> - 2015-10-06 05:00 +0200
    [PATCH RT 1/4] KVM: lapic: Fix name of timer handler before 3.7 Ben Hutchings <ben@decadent.org.uk> - 2015-10-06 05:00 +0200
    [PATCH RT 4/4] work-simple: Add missing #include <linux/export.h> Ben Hutchings <ben@decadent.org.uk> - 2015-10-06 05:00 +0200
    [PATCH RT 3/4] genirq: Fix pointer cast warning for randomness on  32-bit architectures Ben Hutchings <ben@decadent.org.uk> - 2015-10-06 05:00 +0200

#1240126 — [PATCH RT 0/4] Warning fixes for PREEMPT_RT

[Multipart message — attachments visible in raw view] — view raw

These patches fix various warnings I got when building 3.2.71-rt104;
some of them are applicable to other RT branches as well.

Ben.

Ben Hutchings (4):
  KVM: lapic: Fix name of timer handler before 3.7
  rtmutex: Fix rt_mutex_timed_fastlock() slowfn type mismatch up to 3.10
  genirq: Fix pointer cast warning for randomness on 32-bit
    architectures
  work-simple: Add missing #include <linux/export.h>

 arch/x86/kvm/lapic.c | 4 +---
 kernel/irq/manage.c  | 3 ++-
 kernel/rtmutex.c     | 2 +-
 kernel/work-simple.c | 1 +
 4 files changed, 5 insertions(+), 5 deletions(-)

-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

[toc] | [next] | [standalone]

#1240127 — [PATCH RT 2/4] rtmutex: Fix rt_mutex_timed_fastlock() slowfn type mismatch up to 3.10

[Multipart message — attachments visible in raw view] — view raw

The type of the slowfn parameter is declared incorrectly in some of
the backports, resulting in:

kernel/rtmutex.c: In function 'rt_mutex_timed_futex_lock':
kernel/rtmutex.c:1730:12: warning: passing argument 5 of 'rt_mutex_timed_fastlock' from incompatible pointer type [enabled by default]
kernel/rtmutex.c:1655:1: note: expected 'int (*)(struct rt_mutex *, int,  struct hrtimer_sleeper *, int)' but argument is of type 'int (*)(struct rt_mutex *, int,  struct hrtimer_sleeper *, enum rtmutex_chainwalk)'
kernel/rtmutex.c: In function 'rt_mutex_timed_lock':
kernel/rtmutex.c:1770:12: warning: passing argument 5 of 'rt_mutex_timed_fastlock' from incompatible pointer type [enabled by default]
kernel/rtmutex.c:1655:1: note: expected 'int (*)(struct rt_mutex *, int,  struct hrtimer_sleeper *, int)' but argument is of type 'int (*)(struct rt_mutex *, int,  struct hrtimer_sleeper *, enum rtmutex_chainwalk)'

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: <stable-rt@vger.kernel.org> # 3.2 3.4 3.10
---
 kernel/rtmutex.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c
index 52cab27..26550b6 100644
--- a/kernel/rtmutex.c
+++ b/kernel/rtmutex.c
@@ -1657,7 +1657,7 @@ rt_mutex_timed_fastlock(struct rt_mutex *lock, int state,
 			enum rtmutex_chainwalk chwalk,
 			int (*slowfn)(struct rt_mutex *lock, int state,
 				      struct hrtimer_sleeper *timeout,
-				      int detect_deadlock))
+				      enum rtmutex_chainwalk chwalk))
 {
 	if (chwalk == RT_MUTEX_MIN_CHAINWALK &&
 	    likely(rt_mutex_cmpxchg(lock, NULL, current))) {

-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

[toc] | [prev] | [next] | [standalone]

#1240128 — [PATCH RT 1/4] KVM: lapic: Fix name of timer handler before 3.7

[Multipart message — attachments visible in raw view] — view raw

The timer handler was named kvm_timer_fn, not apic_timer_fn, before
Linux 3.7.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: <stable-rt@vger.kernel.org> # 3.2 3.4
---
 arch/x86/kvm/lapic.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/arch/x86/kvm/lapic.c b/arch/x86/kvm/lapic.c
index 7198be0..c661909 100644
--- a/arch/x86/kvm/lapic.c
+++ b/arch/x86/kvm/lapic.c
@@ -680,15 +680,13 @@ static void update_divide_count(struct kvm_lapic *apic)
 }
 
 
-static enum hrtimer_restart apic_timer_fn(struct hrtimer *data);
-
 static void apic_timer_expired(struct hrtimer *data)
 {
 	int ret, i = 0;
 	enum hrtimer_restart r;
 	struct kvm_timer *ktimer = container_of(data, struct kvm_timer, timer);
 
-	r = apic_timer_fn(data);
+	r = kvm_timer_fn(data);
 
 	if (r == HRTIMER_RESTART) {
 		do {

-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

[toc] | [prev] | [next] | [standalone]

#1240130 — [PATCH RT 4/4] work-simple: Add missing #include <linux/export.h>

[Multipart message — attachments visible in raw view] — view raw

work-simple.c uses EXPORT_SYMBOL_GPL(), defined in <linux/export.h>.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: stable-rt@vger.kernel.org
---
 kernel/work-simple.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/kernel/work-simple.c b/kernel/work-simple.c
index c996f75..e57a052 100644
--- a/kernel/work-simple.c
+++ b/kernel/work-simple.c
@@ -10,6 +10,7 @@
 #include <linux/kthread.h>
 #include <linux/slab.h>
 #include <linux/spinlock.h>
+#include <linux/export.h>
 
 #define SWORK_EVENT_PENDING     (1 << 0)
 
-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

[toc] | [prev] | [next] | [standalone]

#1240131 — [PATCH RT 3/4] genirq: Fix pointer cast warning for randomness on 32-bit architectures

[Multipart message — attachments visible in raw view] — view raw

gcc warns about casting directly from a 32-bit pointer to u64.  In the
current rt patch series we cast to unsigned long to avoid the warning,
but this fix hasn't been backported to all versions.

Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Cc: <stable-rt@vger.kernel.org> # 3.2 3.4
---
 kernel/irq/manage.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kernel/irq/manage.c b/kernel/irq/manage.c
index e4549b2..964cf41 100644
--- a/kernel/irq/manage.c
+++ b/kernel/irq/manage.c
@@ -897,7 +897,8 @@ static int irq_thread(void *data)
 #ifdef CONFIG_PREEMPT_RT_FULL
 			migrate_disable();
 			add_interrupt_randomness(action->irq, 0,
-						 desc->random_ip ^ (u64) action);
+						 desc->random_ip ^
+						 (unsigned long) action);
 			migrate_enable();
 #endif
 		}

-- 
Ben Hutchings
All the simple programs have been written, and all the good names taken.

[toc] | [prev] | [standalone]

Back to top | Article view | linux.kernel

csiph-web