diff --git a/[refs] b/[refs] index ea7c7b4fe5b3..fc457c084944 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bd3bff9e20f454b242d979ec2f9a4dca0d5fa06f +refs/heads/master: 7c731e0a495e25e79dc1e9e68772a67a55721a65 diff --git a/trunk/include/linux/sched.h b/trunk/include/linux/sched.h index 717cab8a0c83..6e26f1fdbfe2 100644 --- a/trunk/include/linux/sched.h +++ b/trunk/include/linux/sched.h @@ -2237,6 +2237,8 @@ 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 diff --git a/trunk/kernel/sched.c b/trunk/kernel/sched.c index 463dcdb36ef8..73e600852365 100644 --- a/trunk/kernel/sched.c +++ b/trunk/kernel/sched.c @@ -5729,7 +5729,7 @@ long sys_sched_rr_get_interval(pid_t pid, struct timespec __user *interval) return retval; } -static const char stat_nam[] = "RSDTtZX"; +static const char stat_nam[] = TASK_STATE_TO_CHAR_STR; void sched_show_task(struct task_struct *p) {