summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Howells <dhowells@redhat.com>2011-03-29 14:05:12 +0100
committerDavid Howells <dhowells@redhat.com>2011-03-29 14:05:12 +0100
commit5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1 (patch)
tree774a13f78efc0fa9d8f642082caf183781c6bcd7
parentf55f199b7d76a01e7ce9d1c3bb004327e075c327 (diff)
downloadop-kernel-dev-5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1.zip
op-kernel-dev-5ef9bdde9cd8e7f9d43a975b47f520ca64cbd0a1.tar.gz
FRV: Missing node arg in alloc_thread_info_node() macro
There are two alloc_thread_info_node() macros defined (one for debugging and one for normal). The commit that changed them most recently: commit b6a84016bd2598e35ead635147fa53619982648d Author: Eric Dumazet <eric.dumazet@gmail.com> Date: Tue Mar 22 16:30:42 2011 -0700 Subject: mm: NUMA aware alloc_thread_info_node() didn't add the node argument into the macro argument list for the normal macro. This results in the following error: kernel/fork.c:267:39: error: macro "alloc_thread_info_node" passed 2 arguments, but takes just 1 kernel/fork.c: In function 'dup_task_struct': kernel/fork.c:267: error: 'alloc_thread_info_node' undeclared (first use in this function) kernel/fork.c:267: error: (Each undeclared identifier is reported only once kernel/fork.c:267: error: for each function it appears in.) Signed-off-by: David Howells <dhowells@redhat.com>
-rw-r--r--arch/frv/include/asm/thread_info.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/frv/include/asm/thread_info.h b/arch/frv/include/asm/thread_info.h
index 8582e9c..08179f3 100644
--- a/arch/frv/include/asm/thread_info.h
+++ b/arch/frv/include/asm/thread_info.h
@@ -87,7 +87,7 @@ register struct thread_info *__current_thread_info asm("gr15");
#define alloc_thread_info_node(tsk, node) \
kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)
#else
-#define alloc_thread_info_node(tsk) \
+#define alloc_thread_info_node(tsk, node) \
kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)
#endif
OpenPOWER on IntegriCloud