2011-03-24 05:54:40

by Nobuhiro Iwamatsu

Subject: [PATCH] sh: Fix build alloc_thread_info_node function

By commit b6a84016bd2598e35ead635147fa53619982648d,
alloc_thread_info was replaced by alloc_thread_info_node.
However, the change of the function name and the addition of the argument
were incomplete.

Signed-off-by: Nobuhiro Iwamatsu <[email protected]>
CC: Eric Dumazet <[email protected]>
---
arch/sh/kernel/process.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/sh/kernel/process.c b/arch/sh/kernel/process.c
index f39ad57..325f98b 100644
--- a/arch/sh/kernel/process.c
+++ b/arch/sh/kernel/process.c
@@ -32,7 +32,7 @@ void free_thread_xstate(struct task_struct *tsk)
#if THREAD_SHIFT < PAGE_SHIFT
static struct kmem_cache *thread_info_cache;

-struct thread_info *alloc_thread_info(struct task_struct *tsk, int node)
+struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
{
struct thread_info *ti;
#ifdef CONFIG_DEBUG_STACK_USAGE
@@ -57,7 +57,7 @@ void thread_info_cache_init(void)
THREAD_SIZE, SLAB_PANIC, NULL);
}
#else
-struct thread_info *alloc_thread_info(struct task_struct *tsk)
+struct thread_info *alloc_thread_info_node(struct task_struct *tsk, int node)
{
#ifdef CONFIG_DEBUG_STACK_USAGE
gfp_t mask = GFP_KERNEL | __GFP_ZERO;
--
1.7.2.3

2011-03-24 06:25:21

by Paul Mundt

Subject: Re: [PATCH] sh: Fix build alloc_thread_info_node function

On Thu, Mar 24, 2011 at 02:47:40PM +0900, Nobuhiro Iwamatsu wrote:
> By commit b6a84016bd2598e35ead635147fa53619982648d,
> alloc_thread_info was replaced by alloc_thread_info_node.
> However, the change of the function name and the addition of the argument
> were incomplete.
>
> Signed-off-by: Nobuhiro Iwamatsu <[email protected]>
> CC: Eric Dumazet <[email protected]>

Applied, thanks.