lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'v2.6.31-rc8' into sched/core

Browse Source 
Merge reason: bump from rc5 to rc8, but also pick up TP_perf_assign()
              API, a patch will be queued that depends on it.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Ingo Molnar
2009-09-02 08:20:32 +02:00
parent 84e9dabf6e 326ba5010a
commit f14eff1cc2
896 changed files with 12076 additions and 6876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
include/linux/sched.h
View File

@@ -1199,6 +1199,7 @@ struct task_struct {
* a short time
*/
unsigned char fpu_counter;
s8 oomkilladj; /* OOM kill score adjustment (bit shift). */
#ifdef CONFIG_BLK_DEV_IO_TRACE
unsigned int btrace_seq;
#endif