From: Alex Shi <alex.shi@linaro.org>
Date: Mon, 7 Jul 2014 02:48:56 +0000 (+0800)
Subject: Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
X-Git-Tag: firefly_0821_release~3680^2~89
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c30d344580ad053502cf5d81288dcd690791d162;p=firefly-linux-kernel-4.4.55.git

Merge branch 'linux-linaro-lsk' into linux-linaro-lsk-android
---

c30d344580ad053502cf5d81288dcd690791d162
diff --cc kernel/trace/trace.c
index 4c41e22f162b,60f49637b4d5..d215d1cca2d9
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@@ -1439,9 -1437,10 +1439,11 @@@ static int trace_save_cmdline(struct ta
  	}
  
  	memcpy(&saved_cmdlines[idx], tsk->comm, TASK_COMM_LEN);
 +	saved_tgids[idx] = tsk->tgid;
  
  	arch_spin_unlock(&trace_cmdline_lock);
+ 
+ 	return 1;
  }
  
  void trace_find_cmdline(int pid, char comm[])