From 27c2bb1891dbd3545bc5c380d79e5e3fe22c20c1 Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Thu, 26 May 2011 16:25:51 -0700 Subject: [PATCH] --- yaml --- r: 252055 b: refs/heads/master c: e130aa70f438855b4a0e13a5249951da001798d4 h: refs/heads/master i: 252053: f6f950fe1b5cb70cb9ca3655936dbcae52270f23 252051: 0172e5c4b53ca43ac3e9a85d1201d36680ac4492 252047: 004e0b4c592e6f11aaccb0a884c6017494196331 v: v3 --- [refs] | 2 +- trunk/fs/proc/array.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 049b33e39968..9aa9db94cce5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0a8cb8e34149251ad1f280fe099a4f971554639a +refs/heads/master: e130aa70f438855b4a0e13a5249951da001798d4 diff --git a/trunk/fs/proc/array.c b/trunk/fs/proc/array.c index 5e4f776b0917..9b45ee84fbcc 100644 --- a/trunk/fs/proc/array.c +++ b/trunk/fs/proc/array.c @@ -131,7 +131,7 @@ static inline void task_name(struct seq_file *m, struct task_struct *p) * you can test for combinations of others with * simple bit tests. */ -static const char *task_state_array[] = { +static const char * const task_state_array[] = { "R (running)", /* 0 */ "S (sleeping)", /* 1 */ "D (disk sleep)", /* 2 */ @@ -147,7 +147,7 @@ static const char *task_state_array[] = { static inline const char *get_task_state(struct task_struct *tsk) { unsigned int state = (tsk->state & TASK_REPORT) | tsk->exit_state; - const char **p = &task_state_array[0]; + const char * const *p = &task_state_array[0]; BUILD_BUG_ON(1 + ilog2(TASK_STATE_MAX) != ARRAY_SIZE(task_state_array));