evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UPSTREAM: Fix build break in fork.c when THREAD_SIZE < PAGE_SIZE

Browse source 
Commit b235beea9e99 ("Clarify naming of thread info/stack allocators")
breaks the build on some powerpc configs, where THREAD_SIZE < PAGE_SIZE:

  kernel/fork.c:235:2: error: implicit declaration of function 'free_thread_stack'
  kernel/fork.c:355:8: error: assignment from incompatible pointer type
    stack = alloc_thread_stack_node(tsk, node);
    ^

Fix it by renaming free_stack() to free_thread_stack(), and updating the
return type of alloc_thread_stack_node().

Fixes: b235beea9e99 ("Clarify naming of thread info/stack allocators")
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Bug: 38331309
Change-Id: I5b7f920b459fb84adf5fc75f83bb488b855c4deb
(cherry picked from commit 9521d39976db20f8ef9b56af66661482a17d5364)
Signed-off-by: Zubin Mithra <zsm@google.com>
This commit is contained in:
Michael Ellerman 2016-06-25 21:53:30 +10:00 • committed by Zubin Mithra
parent 29d0b657c3
commit 2e26e045de
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
kernel/fork.c
View file

@ -176,13 +176,13 @@ static inline void free_thread_stack(unsigned long *stack)
# else # else
static struct kmem_cache *thread_stack_cache; static struct kmem_cache *thread_stack_cache;
static struct thread_info *alloc_thread_stack_node(struct task_struct *tsk, static unsigned long *alloc_thread_stack_node(struct task_struct *tsk,
int node) int node)
{ {
return kmem_cache_alloc_node(thread_stack_cache, THREADINFO_GFP, node); return kmem_cache_alloc_node(thread_stack_cache, THREADINFO_GFP, node);
} }
static void free_stack(unsigned long *stack) static void free_thread_stack(unsigned long *stack)
{ {
kmem_cache_free(thread_stack_cache, stack); kmem_cache_free(thread_stack_cache, stack);
} }