local_softirq_pending()
kernel/time/tick-sched.c: In function 'tick_nohz_stop_sched_tick':kernel/time/tick-sched.c:229: warning: format '%02x' expects type 'unsigned int', but argument 2 has type '__u64'
I don't think the architecture's local_softirq_pending() should return u64. This is the sort of thing which should be consistent across architectures.
Problem is, we've made such a complete mess of everything that this is a bitch to fix.
The obvious and moderately clean fix is:
include/asm-s390/hardirq.h renamed from include/asm-s390/hardirq.h~a +15 -1
@@ -25,10 +25,24 @@ typedef struct {unsigned int __softirq_pending; } irq_cpustat_t; -#define local_softirq_pending () (S390_lowcore.softirq_pending) +static inline unsigned int local_softirq_pending (void ) +{ +return S390_lowcore.softirq_pending; +} + +static inline void set_softirq_pending (unsigned int val) +{ + S390_lowcore.softirq_pending = val; +} + +static inline void or_softirq_pending (unsigned int val) +{ + S390_lowcore.softirq_pending |= val; +}#define __ARCH_IRQ_STAT#define __ARCH_HAS_DO_SOFTIRQ +#define __ARCH_SET_SOFTIRQ_PENDING#define HARDIRQ_BITS 8
But that doesn't work because sometimes this 'orrible crap from linux/interrupt.h:
#ifndef __ARCH_SET_SOFTIRQ_PENDING
#define set_softirq_pending(x) (local_softirq_pending() = (x)) #define or_softirq_pending(x) (local_softirq_pending() |= (x)) #endif
gets included first, which screws up include/asm-s390/hardirq.h.
So I'll cheerfully drop it into someone else's lap. A sensible fix would be to remove that nonsense from linux/interrupt.h (which appears to have been added for x86) and give each architecture its own local_softirq_pending(), set_softirq_pending() and or_softirq_pending(). Very much preferably for avoiding any ^+#define...
btw, there's a naming inconsistency here. Shouldn't they be
local_softirq_pendingset_local_softirq_pendingor_local_softirq_pending
?
btw2, why do we need a per-arch or_softirq_pending()? Can't that just be built from set_softirq_pending() and local_softirq_pending() in generic code?
Quoted 10 lines · Andrew Morton
kernel/time/tick-sched.c: In function 'tick_nohz_stop_sched_tick':kernel/time/tick-sched.c:229: warning: format '%02x' expects type 'unsigned int', but argument 2 has type '__u64'I don't think the architecture's
local_softirq_pending()should return u64. This is the sort of thing which should be consistent across architectures.Problem is, we've made such a complete mess of everything that this is a bitch to fix.
The obvious and moderately clean fix is:
I think I will just change the type of softirq_pending in s390's struct lowcore from __u64 to __u32. That should be the least intrusive "fix" for this problem.