diff options
| author |   Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2005-06-15 14:06:48 -0700 |
| commit | f2cbb4f01936a3e4225692e03b084b78c56d386d (patch) | |
| tree | f89f3d8baa250589a38a4dd2df56f84cddae3c76 /include/linux/sched.h | |
| parent | Merge with temp tree to get David's gdb inferior calls patch (diff) | |
| parent | [PATCH] update ppc64 defconfig (diff) | |
| download | linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.tar.xz linux-dev-f2cbb4f01936a3e4225692e03b084b78c56d386d.zip | |
Auto merge with /home/aegl/GIT/linus
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 5f868a588581..4dbb109022f3 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -578,7 +578,7 @@ struct task_struct { unsigned long flags; /* per process flags, defined below */ unsigned long ptrace; - int lock_depth; /* Lock depth */ + int lock_depth; /* BKL lock depth */ int prio, static_prio; struct list_head run_list; @@ -661,7 +661,10 @@ struct task_struct { struct key *thread_keyring; /* keyring private to this thread */ #endif int oomkilladj; /* OOM kill score adjustment (bit shift). */ - char comm[TASK_COMM_LEN]; + char comm[TASK_COMM_LEN]; /* executable name excluding path + - access with [gs]et_task_comm (which lock + it with task_lock()) + - initialized normally by flush_old_exec */ /* file system info */ int link_count, total_link_count; /* ipc stuff */ |