From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 24 Mar 2011 17:07:50 +0000 (-0700)
Subject: Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux... 
X-Git-Tag: v2.6.39-rc1~81
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=3dab04e6978e358ad2307bca563fabd6c5d2c58b;p=~shefty%2Frdma-dev.git

Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300

* 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-2.6-mn10300:
  MN10300: gcc 4.6 vs am33 inline assembly
  MN10300: Deprecate gdbstub
  MN10300: Allow KGDB to use the MN10300 serial ports
  MN10300: Emulate single stepping in KGDB on MN10300
  MN10300: Generalise kernel debugger kernel halt, reboot or power off hook
  KGDB: Notify GDB of machine halt, reboot or power off
  MN10300: Use KGDB
  MN10300: Create generic kernel debugger hooks
  MN10300: Create general kernel debugger cache flushing
  MN10300: Introduce a general config option for kernel debugger hooks
  MN10300: The icache invalidate functions should disable the icache first
  MN10300: gdbstub: Restrict single-stepping to non-preemptable non-SMP configs
---

3dab04e6978e358ad2307bca563fabd6c5d2c58b
diff --cc arch/mn10300/include/asm/thread_info.h
index 8d53f09c878,c139fa17e2e..87c213002d4
--- a/arch/mn10300/include/asm/thread_info.h
+++ b/arch/mn10300/include/asm/thread_info.h
@@@ -124,14 -124,16 +124,18 @@@ static inline unsigned long current_sta
  
  /* thread information allocation */
  #ifdef CONFIG_DEBUG_STACK_USAGE
 -#define alloc_thread_info(tsk) kzalloc(THREAD_SIZE, GFP_KERNEL)
 +#define alloc_thread_info_node(tsk, node)			\
 +		kzalloc_node(THREAD_SIZE, GFP_KERNEL, node)
  #else
 -#define alloc_thread_info(tsk) kmalloc(THREAD_SIZE, GFP_KERNEL)
 +#define alloc_thread_info_node(tsk, node)			\
 +		kmalloc_node(THREAD_SIZE, GFP_KERNEL, node)
  #endif
  
+ #ifndef CONFIG_KGDB
  #define free_thread_info(ti)	kfree((ti))
+ #else
+ extern void free_thread_info(struct thread_info *);
+ #endif
  #define get_thread_info(ti)	get_task_struct((ti)->task)
  #define put_thread_info(ti)	put_task_struct((ti)->task)