aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--fs/proc/array.c4
-rw-r--r--include/linux/sched.h12
2 files changed, 8 insertions, 8 deletions
diff --git a/fs/proc/array.c b/fs/proc/array.c
index 07c9cdbcdcac..74f30e0c0381 100644
--- a/fs/proc/array.c
+++ b/fs/proc/array.c
@@ -410,9 +410,9 @@ static int do_task_stat(struct task_struct *task, char * buffer, int whole)
410 /* convert nsec -> ticks */ 410 /* convert nsec -> ticks */
411 start_time = nsec_to_clock_t(start_time); 411 start_time = nsec_to_clock_t(start_time);
412 412
413 res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %lu %lu \ 413 res = sprintf(buffer,"%d (%s) %c %d %d %d %d %d %u %lu \
414%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \ 414%lu %lu %lu %lu %lu %ld %ld %ld %ld %d 0 %llu %lu %ld %lu %lu %lu %lu %lu \
415%lu %lu %lu %lu %lu %lu %lu %lu %d %d %lu %lu %llu\n", 415%lu %lu %lu %lu %lu %lu %lu %lu %d %d %u %u %llu\n",
416 task->pid, 416 task->pid,
417 tcomm, 417 tcomm,
418 state, 418 state,
diff --git a/include/linux/sched.h b/include/linux/sched.h
index a1707583de49..d9acbbb39f96 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -801,8 +801,8 @@ struct task_struct {
801 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */ 801 volatile long state; /* -1 unrunnable, 0 runnable, >0 stopped */
802 struct thread_info *thread_info; 802 struct thread_info *thread_info;
803 atomic_t usage; 803 atomic_t usage;
804 unsigned long flags; /* per process flags, defined below */ 804 unsigned int flags; /* per process flags, defined below */
805 unsigned long ptrace; 805 unsigned int ptrace;
806 806
807 int lock_depth; /* BKL lock depth */ 807 int lock_depth; /* BKL lock depth */
808 808
@@ -825,7 +825,7 @@ struct task_struct {
825 unsigned long long sched_time; /* sched_clock time spent running */ 825 unsigned long long sched_time; /* sched_clock time spent running */
826 enum sleep_type sleep_type; 826 enum sleep_type sleep_type;
827 827
828 unsigned long policy; 828 unsigned int policy;
829 cpumask_t cpus_allowed; 829 cpumask_t cpus_allowed;
830 unsigned int time_slice, first_time_slice; 830 unsigned int time_slice, first_time_slice;
831 831
@@ -845,11 +845,11 @@ struct task_struct {
845 845
846/* task state */ 846/* task state */
847 struct linux_binfmt *binfmt; 847 struct linux_binfmt *binfmt;
848 long exit_state; 848 int exit_state;
849 int exit_code, exit_signal; 849 int exit_code, exit_signal;
850 int pdeath_signal; /* The signal sent when the parent dies */ 850 int pdeath_signal; /* The signal sent when the parent dies */
851 /* ??? */ 851 /* ??? */
852 unsigned long personality; 852 unsigned int personality;
853 unsigned did_exec:1; 853 unsigned did_exec:1;
854 pid_t pid; 854 pid_t pid;
855 pid_t tgid; 855 pid_t tgid;
@@ -881,7 +881,7 @@ struct task_struct {
881 int __user *set_child_tid; /* CLONE_CHILD_SETTID */ 881 int __user *set_child_tid; /* CLONE_CHILD_SETTID */
882 int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */ 882 int __user *clear_child_tid; /* CLONE_CHILD_CLEARTID */
883 883
884 unsigned long rt_priority; 884 unsigned int rt_priority;
885 cputime_t utime, stime; 885 cputime_t utime, stime;
886 unsigned long nvcsw, nivcsw; /* context switch counts */ 886 unsigned long nvcsw, nivcsw; /* context switch counts */
887 struct timespec start_time; 887 struct timespec start_time;