Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 178039
b: refs/heads/master
c: 7334215
h: refs/heads/master
i:
  178037: 5042689
  178035: 565f4fd
  178031: be4cc73
v: v3
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Dec 17, 2009
1 parent 3be3c3b commit ca80a35
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 234da7bcdc7aaa935846534c3b726dbc79a9cdd5
refs/heads/master: 733421516b42c44b9e21f1793c430cc801ef8324
4 changes: 2 additions & 2 deletions trunk/include/linux/sched.h
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,8 @@ print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
#define TASK_WAKEKILL 128
#define TASK_WAKING 256

#define TASK_STATE_TO_CHAR_STR "RSDTtZX"

/* Convenience macros for the sake of set_task_state */
#define TASK_KILLABLE (TASK_WAKEKILL | TASK_UNINTERRUPTIBLE)
#define TASK_STOPPED (TASK_WAKEKILL | __TASK_STOPPED)
Expand Down Expand Up @@ -2595,8 +2597,6 @@ static inline void mm_init_owner(struct mm_struct *mm, struct task_struct *p)
}
#endif /* CONFIG_MM_OWNER */

#define TASK_STATE_TO_CHAR_STR "RSDTtZX"

#endif /* __KERNEL__ */

#endif

0 comments on commit ca80a35

Please sign in to comment.