Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d894837f authored by Simon Kagstrom's avatar Simon Kagstrom Committed by Ingo Molnar
Browse files

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: default avatarSimon Kagstrom <simon.kagstrom@netinsight.net>
Cc: peterz@infradead.org
LKML-Reference: <20091223110818.442d848e@marrow.netinsight.se>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 6b7b2849

include/linux/kernel.h

+3 −2
Original line number Diff line number Diff line
@@ -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

kernel/sched.c

+1 −1
Original line number Diff line number Diff line
@@ -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 */