This is a note to let you know that I've just added the patch titled

    cris: fix a build error in kernel/fork.c

to the 3.0-stable tree which can be found at:
    
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
     cris-fix-a-build-error-in-kernel-fork.c.patch
and it can be found in the queue-3.0 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <sta...@kernel.org> know about it.


>From d4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 Mon Sep 17 00:00:00 2001
From: WANG Cong <xiyou.wangc...@gmail.com>
Date: Wed, 3 Aug 2011 16:21:12 -0700
Subject: cris: fix a build error in kernel/fork.c

From: WANG Cong <xiyou.wangc...@gmail.com>

commit d4969213f9e75ec1bfa6ea65c279c64cab7d1bd6 upstream.

Fix this error:

  kernel/fork.c:267: error: implicit declaration of function 
'alloc_thread_info_node'

This is due to renaming alloc_thread_info() to alloc_thread_info_node().

[a...@linux-foundation.org: coding-style fixes]
Reported-by: Geert Uytterhoeven <ge...@linux-m68k.org>
Signed-off-by: WANG Cong <xiyou.wangc...@gmail.com>
Cc: Mikael Starvik <star...@axis.com>
Cc: Jesper Nilsson <jesper.nils...@axis.com>
Signed-off-by: Andrew Morton <a...@linux-foundation.org>
Signed-off-by: Linus Torvalds <torva...@linux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gre...@suse.de>

---
 arch/cris/include/asm/thread_info.h |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

--- a/arch/cris/include/asm/thread_info.h
+++ b/arch/cris/include/asm/thread_info.h
@@ -11,8 +11,6 @@
 
 #ifdef __KERNEL__
 
-#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
-
 #ifndef __ASSEMBLY__
 #include <asm/types.h>
 #include <asm/processor.h>
@@ -67,8 +65,10 @@ struct thread_info {
 
 #define init_thread_info       (init_thread_union.thread_info)
 
+#define __HAVE_ARCH_THREAD_INFO_ALLOCATOR
 /* thread information allocation */
-#define alloc_thread_info(tsk, node) ((struct thread_info *) 
__get_free_pages(GFP_KERNEL,1))
+#define alloc_thread_info_node(tsk, node)      \
+       ((struct thread_info *) __get_free_pages(GFP_KERNEL, 1))
 #define free_thread_info(ti) free_pages((unsigned long) (ti), 1)
 
 #endif /* !__ASSEMBLY__ */


Patches currently in stable-queue which might be from xiyou.wangc...@gmail.com 
are

queue-3.0/cris-add-missing-declaration-of-kgdb_init-and.patch
queue-3.0/cris-fix-a-build-error-in-kernel-fork.c.patch
queue-3.0/cris-fix-a-build-error-in-sync_serial_open.patch
queue-3.0/cris-fix-the-prototype-of-sync_serial_ioctl.patch

_______________________________________________
stable mailing list
stable@linux.kernel.org
http://linux.kernel.org/mailman/listinfo/stable

Reply via email to