diff options
| author |   Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:17:07 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2011-02-25 06:17:07 +1000 |
| commit | e11d57ca0b6dada29007ce3ad3db6c84034a768f (patch) | |
| tree | 39ad0c208e2cb3da79f958bd0e9d0d12b8e5f8fe /include/linux/taskstats.h | |
| parent | drm/nouveau: fix suspend/resume on GPUs that don't have PM support (diff) | |
| parent | Revert "ttm: Include the 'struct dev' when using the DMA API." (diff) | |
Merge remote-tracking branch 'airlied/drm-core-next' into drm-nouveau-next
Diffstat (limited to 'include/linux/taskstats.h')
| -rw-r--r-- | include/linux/taskstats.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/taskstats.h b/include/linux/taskstats.h index 341dddb55090..2466e550a41d 100644 --- a/include/linux/taskstats.h +++ b/include/linux/taskstats.h @@ -33,7 +33,7 @@ */ -#define TASKSTATS_VERSION 7 +#define TASKSTATS_VERSION 8 #define TS_COMM_LEN 32 /* should be >= TASK_COMM_LEN * in linux/sched.h */ @@ -188,6 +188,7 @@ enum { TASKSTATS_TYPE_STATS, /* taskstats structure */ TASKSTATS_TYPE_AGGR_PID, /* contains pid + stats */ TASKSTATS_TYPE_AGGR_TGID, /* contains tgid + stats */ + TASKSTATS_TYPE_NULL, /* contains nothing */ __TASKSTATS_TYPE_MAX, }; |