From 39420415e018fdf075ac3ffa5efda19574c59a92 Mon Sep 17 00:00:00 2001
From: Paul Mackerras <paulus@samba.org>
Date: Wed, 22 Oct 2008 18:43:45 +0000
Subject: [PATCH] --- yaml --- r: 118270 b: refs/heads/master c:
 2a4b9c5af82035c591adca951a9af1665ad1a2b0 h: refs/heads/master v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/powerpc/kernel/vmlinux.lds.S | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index bc1d2b3f0d05..b500185a2a09 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8b8b0cc1c736ddca39b60bb098bd0a23daaa495f
+refs/heads/master: 2a4b9c5af82035c591adca951a9af1665ad1a2b0
diff --git a/trunk/arch/powerpc/kernel/vmlinux.lds.S b/trunk/arch/powerpc/kernel/vmlinux.lds.S
index b39c27ed7919..384dca5a9c1d 100644
--- a/trunk/arch/powerpc/kernel/vmlinux.lds.S
+++ b/trunk/arch/powerpc/kernel/vmlinux.lds.S
@@ -187,6 +187,7 @@ SECTIONS
 		*(.machine.desc)
 		__machine_desc_end = . ;
 	}
+#ifdef CONFIG_RELOCATABLE
 	. = ALIGN(8);
 	.dynsym : AT(ADDR(.dynsym) - LOAD_OFFSET) { *(.dynsym) }
 	.dynstr : AT(ADDR(.dynstr) - LOAD_OFFSET) { *(.dynstr) }
@@ -202,6 +203,7 @@ SECTIONS
 		__rela_dyn_start = .;
 		*(.rela*)
 	}
+#endif
 
 	/* Fake ELF header containing RPA note; for addnote */
 	.fakeelf : AT(ADDR(.fakeelf) - LOAD_OFFSET) { *(.fakeelf) }