diff options
| author | Simon Kagstrom <simon.kagstrom@netinsight.net> | 2009-12-23 11:08:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-12-28 10:50:13 +0100 |
| commit | d894837f23f491aa7ed167aae767fc07cfe6e6e6 (patch) | |
| tree | 33ee2a3526d3ed9889d385233c9f2feb4bdbc835 | |
| parent | 6b7b284958d47b77d06745b36bc7f36dab769d9b (diff) | |
| download | op-kernel-dev-d894837f23f491aa7ed167aae767fc07cfe6e6e6.zip op-kernel-dev-d894837f23f491aa7ed167aae767fc07cfe6e6e6.tar.gz | |
sched: might_sleep(): Make file parameter const char *
Fixes a warning when building with g++:
warning: deprecated conversion from string constant to 'char*'
And the file parameter use is constant, so mark it as such.
Signed-off-by: Simon Kagstrom <simon.kagstrom@netinsight.net>
Cc: peterz@infradead.org
LKML-Reference: <20091223110818.442d848e@marrow.netinsight.se>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| -rw-r--r-- | include/linux/kernel.h | 5 | ||||
| -rw-r--r-- | kernel/sched.c | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/kernel.h b/include/linux/kernel.h index 3fc9f5a..785d7d1 100644 --- a/include/linux/kernel.h +++ b/include/linux/kernel.h @@ -124,7 +124,7 @@ extern int _cond_resched(void); #endif #ifdef CONFIG_DEBUG_SPINLOCK_SLEEP - void __might_sleep(char *file, int line, int preempt_offset); + void __might_sleep(const char *file, int line, int preempt_offset); /** * might_sleep - annotation for functions that can sleep * @@ -138,7 +138,8 @@ extern int _cond_resched(void); # define might_sleep() \ do { __might_sleep(__FILE__, __LINE__, 0); might_resched(); } while (0) #else - static inline void __might_sleep(char *file, int line, int preempt_offset) { } + static inline void __might_sleep(const char *file, int line, + int preempt_offset) { } # define might_sleep() do { might_resched(); } while (0) #endif diff --git a/kernel/sched.c b/kernel/sched.c index c535cc4..64298a5 100644 --- a/kernel/sched.c +++ b/kernel/sched.c @@ -9694,7 +9694,7 @@ static inline int preempt_count_equals(int preempt_offset) return (nested == PREEMPT_INATOMIC_BASE + preempt_offset); } -void __might_sleep(char *file, int line, int preempt_offset) +void __might_sleep(const char *file, int line, int preempt_offset) { #ifdef in_atomic static unsigned long prev_jiffy; /* ratelimiting */ |
