Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge tag 'fix_id-194593' #645

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Merge tag 'fix_id-194593' #645

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions Documentation/filesystems/proc.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,10 +324,10 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7)
cmin_flt number of minor faults with child's
maj_flt number of major faults
cmaj_flt number of major faults with child's
utime user mode jiffies
stime kernel mode jiffies
cutime user mode jiffies with child's
cstime kernel mode jiffies with child's
utime user mode USER_HZ
stime kernel mode USER_HZ
cutime user mode USER_HZ with child's
cstime kernel mode USER_HZ with child's
priority priority level
nice nice level
num_threads number of threads
Expand All @@ -353,8 +353,8 @@ Table 1-4: Contents of the stat files (as of 2.6.30-rc7)
rt_priority realtime priority
policy scheduling policy (man sched_setscheduler)
blkio_ticks time spent waiting for block IO
gtime guest time of the task in jiffies
cgtime guest time of the task children in jiffies
gtime guest time of the task in USER_HZ
cgtime guest time of the task children in USER_HZ
start_data address above which program data+bss is placed
end_data address below which program data+bss is placed
start_brk address above which program heap can be expanded with brk()
Expand Down