From dd3c54abf261b5356a3ac87150bd1634fd968d2b Mon Sep 17 00:00:00 2001
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Date: Mon, 17 Dec 2012 16:01:23 -0800
Subject: [PATCH] --- yaml --- r: 346403 b: refs/heads/master c:
 2fbc57c53a815ea30b926dd7627897a02daae302 h: refs/heads/master i:   346401:
 29e68b6d90d7aa1bd02c319817f73021780979ae   346399:
 431020ff488b1d9219afdf57f2b2b7e97a510c01 v: v3

---
 [refs]            | 2 +-
 trunk/mm/memory.c | 8 +++-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index b64fdfcf2498..f90a75f932ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 35367ab28d024ef026dbd797b4076c8f008ec08c
+refs/heads/master: 2fbc57c53a815ea30b926dd7627897a02daae302
diff --git a/trunk/mm/memory.c b/trunk/mm/memory.c
index 23f1fdfdfcf1..e0a9b0ce4f10 100644
--- a/trunk/mm/memory.c
+++ b/trunk/mm/memory.c
@@ -58,6 +58,7 @@
 #include <linux/elf.h>
 #include <linux/gfp.h>
 #include <linux/migrate.h>
+#include <linux/string.h>
 
 #include <asm/io.h>
 #include <asm/pgalloc.h>
@@ -4118,15 +4119,12 @@ void print_vma_addr(char *prefix, unsigned long ip)
 		struct file *f = vma->vm_file;
 		char *buf = (char *)__get_free_page(GFP_KERNEL);
 		if (buf) {
-			char *p, *s;
+			char *p;
 
 			p = d_path(&f->f_path, buf, PAGE_SIZE);
 			if (IS_ERR(p))
 				p = "?";
-			s = strrchr(p, '/');
-			if (s)
-				p = s+1;
-			printk("%s%s[%lx+%lx]", prefix, p,
+			printk("%s%s[%lx+%lx]", prefix, kbasename(p),
 					vma->vm_start,
 					vma->vm_end - vma->vm_start);
 			free_page((unsigned long)buf);