diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:11:18 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-17 18:11:18 +0200 |
| commit | e6d5a11dad44b8ae18ca8fc4ecb72ccccfa0a2d2 (patch) | |
| tree | 7e3837c8f28e2e969a7b7d040b00676c90bf72c7 /include | |
| parent | Merge branch 'for-linus' of git://git.kernel.dk/data/git/linux-2.6-block (diff) | |
| parent | sched: fix new task startup crash (diff) | |
| download | linux-e6d5a11dad44b8ae18ca8fc4ecb72ccccfa0a2d2.tar.xz linux-e6d5a11dad44b8ae18ca8fc4ecb72ccccfa0a2d2.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched
* git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched:
sched: fix new task startup crash
sched: fix !SYSFS build breakage
sched: fix improper load balance across sched domain
sched: more robust sd-sysctl entry freeing
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 3de5aa210feb..c204ab0d4df1 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -535,10 +535,12 @@ struct user_struct { #ifdef CONFIG_FAIR_USER_SCHED struct task_group *tg; +#ifdef CONFIG_SYSFS struct kset kset; struct subsys_attribute user_attr; struct work_struct work; #endif +#endif }; #ifdef CONFIG_FAIR_USER_SCHED |