3 files changed, 56 insertions, 1 deletions

diff --git a/include/asm-generic/pci.h b/include/asm-generic/pci.h
index ee1d8b5d8168..c36a77d3bf44 100644
--- a/include/asm-generic/pci.h
+++ b/include/asm-generic/pci.h
@@ -30,6 +30,19 @@ pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,
         res->end = region->end;
 }
 
+static inline struct resource *
+pcibios_select_root(struct pci_dev *pdev, struct resource *res)
+{
+        struct resource *root = NULL;
+
+        if (res->flags & IORESOURCE_IO)
+                root = &ioport_resource;
+        if (res->flags & IORESOURCE_MEM)
+                root = &iomem_resource;
+
+        return root;
+}
+
 #define pcibios_scan_all_fns(a, b)      0
 
 #ifndef HAVE_ARCH_PCI_GET_LEGACY_IDE_IRQ
diff --git a/include/asm-generic/tlb.h b/include/asm-generic/tlb.h
index faff403e1061..7d0298347ee7 100644
--- a/include/asm-generic/tlb.h
+++ b/include/asm-generic/tlb.h
@@ -23,7 +23,11 @@
  * and page free order so much..
  */
 #ifdef CONFIG_SMP
-  #define FREE_PTE_NR   506
+  #ifdef ARCH_FREE_PTR_NR
+    #define FREE_PTR_NR   ARCH_FREE_PTR_NR
+  #else
+    #define FREE_PTE_NR 506
+  #endif
   #define tlb_fast_mode(tlb) ((tlb)->nr == ~0U)
 #else
   #define FREE_PTE_NR   1
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 6f857be2b644..a9c55490fb82 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -103,3 +103,41 @@
                 VMLINUX_SYMBOL(__kprobes_text_start) = .;               \
                 *(.kprobes.text)                                        \
                 VMLINUX_SYMBOL(__kprobes_text_end) = .;
+
+                /* DWARF debug sections.
+                Symbols in the DWARF debugging sections are relative to
+                the beginning of the section so we begin them at 0.  */
+#define DWARF_DEBUG                                                     \
+                /* DWARF 1 */                                           \
+                .debug          0 : { *(.debug) }                       \
+                .line           0 : { *(.line) }                        \
+                /* GNU DWARF 1 extensions */                            \
+                .debug_srcinfo  0 : { *(.debug_srcinfo) }               \
+                .debug_sfnames  0 : { *(.debug_sfnames) }               \
+                /* DWARF 1.1 and DWARF 2 */                             \
+                .debug_aranges  0 : { *(.debug_aranges) }               \
+                .debug_pubnames 0 : { *(.debug_pubnames) }              \
+                /* DWARF 2 */                                           \
+                .debug_info     0 : { *(.debug_info                     \
+                                .gnu.linkonce.wi.*) }                   \
+                .debug_abbrev   0 : { *(.debug_abbrev) }                \
+                .debug_line     0 : { *(.debug_line) }                  \
+                .debug_frame    0 : { *(.debug_frame) }                 \
+                .debug_str      0 : { *(.debug_str) }                   \
+                .debug_loc      0 : { *(.debug_loc) }                   \
+                .debug_macinfo  0 : { *(.debug_macinfo) }               \
+                /* SGI/MIPS DWARF 2 extensions */                       \
+                .debug_weaknames 0 : { *(.debug_weaknames) }            \
+                .debug_funcnames 0 : { *(.debug_funcnames) }            \
+                .debug_typenames 0 : { *(.debug_typenames) }            \
+                .debug_varnames  0 : { *(.debug_varnames) }             \
+
+                /* Stabs debugging sections.  */
+#define STABS_DEBUG                                                     \
+                .stab 0 : { *(.stab) }                                  \
+                .stabstr 0 : { *(.stabstr) }                            \
+                .stab.excl 0 : { *(.stab.excl) }                        \
+                .stab.exclstr 0 : { *(.stab.exclstr) }                  \
+                .stab.index 0 : { *(.stab.index) }                      \
+                .stab.indexstr 0 : { *(.stab.indexstr) }                \
+                .comment 0 : { *(.comment) }