commit 99dd30a309b22219bf98146141f27030ab8fff33
author Dmitry Shmidt <dimitrysh@google.com> Wed Oct 28 10:45:04 2015 -0700
committer John Stultz <john.stultz@linaro.org> Tue Feb 16 13:53:29 2016 -0800
tree 6313c731c6f4efef6b76e2fb78c4be32c5c7207d
parent 0a66c43d8ebb8b6d53e52df829ee001f4f4de50b

trace: fix compilation for 4.1

Change-Id: Id88b5d30847bc6d3cfe1d8cd00cbdc975c9712d1
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>

kernel/trace/trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 225d450..5f375d4 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1352,7 +1352,7 @@
 
 #define SAVED_CMDLINES_DEFAULT 128
 #define NO_CMDLINE_MAP UINT_MAX
-static unsigned saved_tgids[SAVED_CMDLINES];
+static unsigned saved_tgids[SAVED_CMDLINES_DEFAULT];
 static arch_spinlock_t trace_cmdline_lock = __ARCH_SPIN_LOCK_UNLOCKED;
 struct saved_cmdlines_buffer {
 	unsigned map_pid_to_cmdline[PID_MAX_DEFAULT+1];
@@ -1641,7 +1641,7 @@
 
 	preempt_disable();
 	arch_spin_lock(&trace_cmdline_lock);
-	map = map_pid_to_cmdline[pid];
+	map = savedcmd->map_pid_to_cmdline[pid];
 	if (map != NO_CMDLINE_MAP)
 		tgid = saved_tgids[map];
 	else
@@ -4215,17 +4215,17 @@
 	int pid;
 	int i;
 
-	file_buf = kmalloc(SAVED_CMDLINES*(16+1+16), GFP_KERNEL);
+	file_buf = kmalloc(SAVED_CMDLINES_DEFAULT*(16+1+16), GFP_KERNEL);
 	if (!file_buf)
 		return -ENOMEM;
 
 	buf = file_buf;
 
-	for (i = 0; i < SAVED_CMDLINES; i++) {
+	for (i = 0; i < SAVED_CMDLINES_DEFAULT; i++) {
 		int tgid;
 		int r;
 
-		pid = map_cmdline_to_pid[i];
+		pid = savedcmd->map_cmdline_to_pid[i];
 		if (pid == -1 || pid == NO_CMDLINE_MAP)
 			continue;