diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 13:58:22 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-11-28 13:58:22 -0500 |
commit | 9bfb52ad716e74785b2402b7ea17f30e0344b8e8 (patch) | |
tree | a7800b58aab409632940a11b27db19c268064cab /include/linux/sched.h | |
parent | c46f739dd39db3b07ab5deb4e3ec81e1c04a91af (diff) | |
parent | f95e0d1c2ad668c77aa4b272c076faf3aa0d631c (diff) |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: clean up kernel/sched_stat.h
sched: clean up overlong line in kernel/sched_debug.c
sched: clean up, move __sched_text_start/end to sched.h
sched: clean up sd_alloc_ctl_cpu_table() definition
softlockup: fix false positives on CONFIG_NOHZ
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index ee800e7a70de..ac3d496fbd20 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -282,6 +282,10 @@ static inline void touch_all_softlockup_watchdogs(void) | |||
282 | 282 | ||
283 | /* Attach to any functions which should be ignored in wchan output. */ | 283 | /* Attach to any functions which should be ignored in wchan output. */ |
284 | #define __sched __attribute__((__section__(".sched.text"))) | 284 | #define __sched __attribute__((__section__(".sched.text"))) |
285 | |||
286 | /* Linker adds these: start and end of __sched functions */ | ||
287 | extern char __sched_text_start[], __sched_text_end[]; | ||
288 | |||
285 | /* Is this address in the __sched functions? */ | 289 | /* Is this address in the __sched functions? */ |
286 | extern int in_sched_functions(unsigned long addr); | 290 | extern int in_sched_functions(unsigned long addr); |
287 | 291 | ||