4 files changed, 28 insertions, 9 deletions

diff --git a/arch/ppc/kernel/vmlinux.lds.S b/arch/ppc/kernel/vmlinux.lds.S
index 0c0e714b84de..9353584fb710 100644
--- a/arch/ppc/kernel/vmlinux.lds.S
+++ b/arch/ppc/kernel/vmlinux.lds.S
@@ -145,6 +145,7 @@ SECTIONS
   __init_end = .;
 
   . = ALIGN(4096);
+  _sextratext = .;
   __pmac_begin = .;
   .pmac.text : { *(.pmac.text) }
   .pmac.data : { *(.pmac.data) }
@@ -171,6 +172,7 @@ SECTIONS
   .openfirmware.data : { *(.openfirmware.data) }
   . = ALIGN(4096);
   __openfirmware_end = .;
+  _eextratext = .;
 
   __bss_start = .;
   .bss       :
diff --git a/include/asm-generic/sections.h b/include/asm-generic/sections.h
index 976ac29598b7..195ccdc069e6 100644
--- a/include/asm-generic/sections.h
+++ b/include/asm-generic/sections.h
@@ -8,6 +8,8 @@ extern char _data[], _sdata[], _edata[];
 extern char __bss_start[], __bss_stop[];
 extern char __init_begin[], __init_end[];
 extern char _sinittext[], _einittext[];
+extern char _sextratext[] __attribute__((weak));
+extern char _eextratext[] __attribute__((weak));
 extern char _end[];
 
 #endif /* _ASM_GENERIC_SECTIONS_H_ */
diff --git a/kernel/kallsyms.c b/kernel/kallsyms.c
index 1627f8d6e0cd..13bcec151b57 100644
--- a/kernel/kallsyms.c
+++ b/kernel/kallsyms.c
@@ -46,6 +46,14 @@ static inline int is_kernel_inittext(unsigned long addr)
         return 0;
 }
 
+static inline int is_kernel_extratext(unsigned long addr)
+{
+        if (addr >= (unsigned long)_sextratext
+            && addr <= (unsigned long)_eextratext)
+                return 1;
+        return 0;
+}
+
 static inline int is_kernel_text(unsigned long addr)
 {
         if (addr >= (unsigned long)_stext && addr <= (unsigned long)_etext)
@@ -169,8 +177,9 @@ const char *kallsyms_lookup(unsigned long addr,
         namebuf[0] = 0;
 
         if ((all_var && is_kernel(addr)) ||
-            (!all_var && (is_kernel_text(addr) || is_kernel_inittext(addr)))) {
-                unsigned long symbol_end=0;
+            (!all_var && (is_kernel_text(addr) || is_kernel_inittext(addr) ||
+                                is_kernel_extratext(addr)))) {
+                unsigned long symbol_end = 0;
 
                 /* do a binary search on the sorted kallsyms_addresses array */
                 low = 0;
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index fe11df83d1fc..d3d2e5341051 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -67,7 +67,7 @@ struct sym_entry {
 
 static struct sym_entry *table;
 static int size, cnt;
-static unsigned long long _stext, _etext, _sinittext, _einittext;
+static unsigned long long _stext, _etext, _sinittext, _einittext, _sextratext, _eextratext;
 static int all_symbols = 0;
 static char symbol_prefix_char = '\0';
 
@@ -139,6 +139,10 @@ read_symbol(FILE *in, struct sym_entry *s)
                 _sinittext = s->addr;
         else if (strcmp(sym, "_einittext") == 0)
                 _einittext = s->addr;
+        else if (strcmp(sym, "_sextratext") == 0)
+                _sextratext = s->addr;
+        else if (strcmp(sym, "_eextratext") == 0)
+                _eextratext = s->addr;
         else if (toupper(s->type) == 'A')
         {
                 /* Keep these useful absolute symbols */
@@ -194,16 +198,18 @@ symbol_valid(struct sym_entry *s)
          * and inittext sections are discarded */
         if (!all_symbols) {
                 if ((s->addr < _stext || s->addr > _etext)
-                    && (s->addr < _sinittext || s->addr > _einittext))
+                    && (s->addr < _sinittext || s->addr > _einittext)
+                    && (s->addr < _sextratext || s->addr > _eextratext))
                         return 0;
                 /* Corner case.  Discard any symbols with the same value as
-                 * _etext or _einittext, they can move between pass 1 and 2
-                 * when the kallsyms data is added.  If these symbols move then
-                 * they may get dropped in pass 2, which breaks the kallsyms
-                 * rules.
+                 * _etext _einittext or _eextratext; they can move between pass
+                 * 1 and 2 when the kallsyms data are added.  If these symbols
+                 * move then they may get dropped in pass 2, which breaks the
+                 * kallsyms rules.
                  */
                 if ((s->addr == _etext && strcmp(s->sym + offset, "_etext")) ||
-                    (s->addr == _einittext && strcmp(s->sym + offset, "_einittext")))
+                    (s->addr == _einittext && strcmp(s->sym + offset, "_einittext")) ||
+                    (s->addr == _eextratext && strcmp(s->sym + offset, "_eextratext")))
                         return 0;
         }