diff options
| author | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-08-06 12:34:41 +0100 |
| commit | 113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6 (patch) | |
| tree | 90505c4418561b98f773e5f7b549399e2868c239 /kernel/fork.c | |
| parent | c3879956957b8de9fd6cbad604e668fd00c6506c (diff) | |
| parent | 996034b117b467709dec7811ef134063934fa626 (diff) | |
| download | linux-113adf21cf1ed49b57098c1d0d6b38ffbe9ea1e6.tar.bz2 | |
Merge tag 'asoc-fix-v4.2-rc3' into asoc-fix-topology
ASoC: Fixes for v4.2
A lot of small fixes here, a few to the core:
- Fix for binding DAPM stream widgets on devices with prefixes assigned
to them
- Minor fixes for the newly added topology interfaces
- Locking and memory leak fixes for DAPM
- Driver specific fixes
Diffstat (limited to 'kernel/fork.c')
| -rw-r--r-- | kernel/fork.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/kernel/fork.c b/kernel/fork.c index 1bfefc6f96a4..dbd9b8d7b7cc 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -287,6 +287,11 @@ static void set_max_threads(unsigned int max_threads_suggested) max_threads = clamp_t(u64, threads, MIN_THREADS, MAX_THREADS); } +#ifdef CONFIG_ARCH_WANTS_DYNAMIC_TASK_STRUCT +/* Initialized by the architecture: */ +int arch_task_struct_size __read_mostly; +#endif + void __init fork_init(void) { #ifndef CONFIG_ARCH_TASK_STRUCT_ALLOCATOR @@ -295,7 +300,7 @@ void __init fork_init(void) #endif /* create a slab on which task_structs can be allocated */ task_struct_cachep = - kmem_cache_create("task_struct", sizeof(struct task_struct), + kmem_cache_create("task_struct", arch_task_struct_size, ARCH_MIN_TASKALIGN, SLAB_PANIC | SLAB_NOTRACK, NULL); #endif |