From 67ae8b091a0a6d13d72585fd7af4aca7ea859be4 Mon Sep 17 00:00:00 2001
From: Sam Ravnborg <sam@ravnborg.org>
Date: Thu, 26 Jul 2007 10:41:13 -0700
Subject: [PATCH] --- yaml --- r: 62993 b: refs/heads/master c:
 045e72acf16054c4ed2760e9a8edb19a08053af1 h: refs/heads/master i:   62991:
 90324fa66f53e626dc826b46c4d463400bc97fe5 v: v3

---
 [refs]                           | 2 +-
 trunk/include/asm-powerpc/page.h | 1 -
 trunk/include/linux/mm.h         | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index aa6d9b599a55..25752c1fe780 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ebc3cc920e7a076539aa8badbaf0919540a3438
+refs/heads/master: 045e72acf16054c4ed2760e9a8edb19a08053af1
diff --git a/trunk/include/asm-powerpc/page.h b/trunk/include/asm-powerpc/page.h
index 10c51f457d48..236a9210e5fc 100644
--- a/trunk/include/asm-powerpc/page.h
+++ b/trunk/include/asm-powerpc/page.h
@@ -190,7 +190,6 @@ extern void copy_user_page(void *to, void *from, unsigned long vaddr,
 extern int page_is_ram(unsigned long pfn);
 
 struct vm_area_struct;
-extern const char *arch_vma_name(struct vm_area_struct *vma);
 
 #include <asm-generic/memory_model.h>
 #endif /* __ASSEMBLY__ */
diff --git a/trunk/include/linux/mm.h b/trunk/include/linux/mm.h
index c456c3a1c28e..3e9e8fec5a41 100644
--- a/trunk/include/linux/mm.h
+++ b/trunk/include/linux/mm.h
@@ -1246,7 +1246,7 @@ void drop_slab(void);
 extern int randomize_va_space;
 #endif
 
-__attribute__((weak)) const char *arch_vma_name(struct vm_area_struct *vma);
+const char * arch_vma_name(struct vm_area_struct *vma);
 
 #endif /* __KERNEL__ */
 #endif /* _LINUX_MM_H */