---

yaml
---
r: 119191
b: refs/heads/master
c: 966c8c1
h: refs/heads/master
i:
  119189: bae05ab
  119187: 0d7f9ad
  119183: 558e759
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3fa59dfbc3b223f02c26593be69ce6fc9a940405
+refs/heads/master: 966c8c12dc9e77f931e2281ba25d2f0244b06949

trunk/kernel/kallsyms.c

@@ -304,17 +304,24 @@ int sprint_symbol(char *buffer, unsigned long address)
 	char *modname;
 	const char *name;
 	unsigned long offset, size;
-	char namebuf[KSYM_NAME_LEN];
+	int len;
 
-	name = kallsyms_lookup(address, &size, &offset, &modname, namebuf);
+	name = kallsyms_lookup(address, &size, &offset, &modname, buffer);
 	if (!name)
 		return sprintf(buffer, "0x%lx", address);
 
+	if (name != buffer)
+		strcpy(buffer, name);
+	len = strlen(buffer);
+	buffer += len;
+
 	if (modname)
-		return sprintf(buffer, "%s+%#lx/%#lx [%s]", name, offset,
-				size, modname);
+		len += sprintf(buffer, "+%#lx/%#lx [%s]",
+						offset, size, modname);
 	else
-		return sprintf(buffer, "%s+%#lx/%#lx", name, offset, size);
+		len += sprintf(buffer, "+%#lx/%#lx", offset, size);
+
+	return len;
 }
 
 /* Look up a kernel symbol and print it to the kernel messages. */