diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-29 09:42:58 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-29 10:37:07 +0100 |
commit | 0ce74d9296c971b2355c26984ad0bc538e34dd6c (patch) | |
tree | 566d03e2a4f6b42dab9628cd82c93cd61d587467 /kernel/cred-internals.h | |
parent | 1cc4fff0b360aeffeedb7d6db5089d88dd861700 (diff) | |
parent | 3c92ec8ae91ecf59d88c798301833d7cf83f2179 (diff) | |
download | kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.gz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.tar.xz kernel-crypto-0ce74d9296c971b2355c26984ad0bc538e34dd6c.zip |
Merge branch 'linus' into timers/hrtimers
Conflicts:
sound/drivers/pcsp/pcsp.c
Semantic conflict:
sound/core/hrtimer.c
Diffstat (limited to 'kernel/cred-internals.h')
-rw-r--r-- | kernel/cred-internals.h | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/kernel/cred-internals.h b/kernel/cred-internals.h new file mode 100644 index 00000000000..2dc4fc2d0bf --- /dev/null +++ b/kernel/cred-internals.h @@ -0,0 +1,21 @@ +/* Internal credentials stuff + * + * Copyright (C) 2008 Red Hat, Inc. All Rights Reserved. + * Written by David Howells (dhowells@redhat.com) + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public Licence + * as published by the Free Software Foundation; either version + * 2 of the Licence, or (at your option) any later version. + */ + +/* + * user.c + */ +static inline void sched_switch_user(struct task_struct *p) +{ +#ifdef CONFIG_USER_SCHED + sched_move_task(p); +#endif /* CONFIG_USER_SCHED */ +} + |