| 1 | --- a/arch/ubicom32/kernel/vmlinux.lds.S |
| 2 | +++ b/arch/ubicom32/kernel/vmlinux.lds.S |
| 3 | @@ -25,7 +25,6 @@ |
| 4 | * arch/blackfin |
| 5 | * arch/parisc |
| 6 | */ |
| 7 | -#include <asm-generic/vmlinux.lds.h> |
| 8 | #include <asm/ocm_size.h> |
| 9 | #include <asm/memory_map.h> |
| 10 | #include <asm/thread_info.h> |
| 11 | @@ -201,94 +200,28 @@ SECTIONS { |
| 12 | *(__ex_table) |
| 13 | __stop___ex_table = .; |
| 14 | |
| 15 | - *(.rodata) *(.rodata.*) |
| 16 | - *(__vermagic) /* Kernel version magic */ |
| 17 | - *(__markers_strings) |
| 18 | - *(.rodata1) |
| 19 | - *(.rodata.str1.1) |
| 20 | - *(__tracepoints_strings) |
| 21 | - |
| 22 | - /* PCI quirks */ |
| 23 | - __start_pci_fixups_early = . ; |
| 24 | - *(.pci_fixup_early) |
| 25 | - __end_pci_fixups_early = . ; |
| 26 | - __start_pci_fixups_header = . ; |
| 27 | - *(.pci_fixup_header) |
| 28 | - __end_pci_fixups_header = . ; |
| 29 | - __start_pci_fixups_final = . ; |
| 30 | - *(.pci_fixup_final) |
| 31 | - __end_pci_fixups_final = . ; |
| 32 | - __start_pci_fixups_enable = . ; |
| 33 | - *(.pci_fixup_enable) |
| 34 | - __end_pci_fixups_enable = . ; |
| 35 | - __start_pci_fixups_resume = . ; |
| 36 | - *(.pci_fixup_resume) |
| 37 | - __end_pci_fixups_resume = . ; |
| 38 | - __start_pci_fixups_resume_early = . ; |
| 39 | - *(.pci_fixup_resume_early) |
| 40 | - __end_pci_fixups_resume_early = . ; |
| 41 | - __start_pci_fixups_suspend = . ; |
| 42 | - *(.pci_fixup_suspend) |
| 43 | - __end_pci_fixups_suspend = . ; |
| 44 | - |
| 45 | - __start_builtin_fw = . ; |
| 46 | - *(.builtin_fw) |
| 47 | - __end_builtin_fw = . ; |
| 48 | - |
| 49 | - |
| 50 | - /* Kernel symbol table: Normal symbols */ |
| 51 | - . = ALIGN(4); |
| 52 | - __start___ksymtab = .; |
| 53 | - *(__ksymtab) |
| 54 | - __stop___ksymtab = .; |
| 55 | - |
| 56 | - /* Kernel symbol table: GPL-only symbols */ |
| 57 | - __start___ksymtab_gpl = .; |
| 58 | - *(__ksymtab_gpl) |
| 59 | - __stop___ksymtab_gpl = .; |
| 60 | - |
| 61 | - /* Kernel symbol table: Normal unused symbols */ |
| 62 | - __start___ksymtab_unused = .; |
| 63 | - *(__ksymtab_unused) |
| 64 | - __stop___ksymtab_unused = .; |
| 65 | - |
| 66 | - /* Kernel symbol table: GPL-only unused symbols */ |
| 67 | - __start___ksymtab_unused_gpl = .; |
| 68 | - *(__ksymtab_unused_gpl) |
| 69 | - __stop___ksymtab_unused_gpl = .; |
| 70 | - |
| 71 | - /* Kernel symbol table: GPL-future symbols */ |
| 72 | - __start___ksymtab_gpl_future = .; |
| 73 | - *(__ksymtab_gpl_future) |
| 74 | - __stop___ksymtab_gpl_future = .; |
| 75 | - |
| 76 | - /* Kernel symbol table: Normal symbols */ |
| 77 | - __start___kcrctab = .; |
| 78 | - *(__kcrctab) |
| 79 | - __stop___kcrctab = .; |
| 80 | - |
| 81 | - /* Kernel symbol table: GPL-only symbols */ |
| 82 | - __start___kcrctab_gpl = .; |
| 83 | - *(__kcrctab_gpl) |
| 84 | - __stop___kcrctab_gpl = .; |
| 85 | - |
| 86 | - /* Kernel symbol table: GPL-future symbols */ |
| 87 | - __start___kcrctab_gpl_future = .; |
| 88 | - *(__kcrctab_gpl_future) |
| 89 | - __stop___kcrctab_gpl_future = .; |
| 90 | + } > TEXT |
| 91 | |
| 92 | - /* Kernel symbol table: strings */ |
| 93 | - *(__ksymtab_strings) |
| 94 | + RO_DATA(16) |
| 95 | |
| 96 | - /* Built-in module parameters */ |
| 97 | - . = ALIGN(4) ; |
| 98 | - __start___param = .; |
| 99 | - *(__param) |
| 100 | - __stop___param = .; |
| 101 | + .rodata : {} > TEXT |
| 102 | + .rodata1 : {} > TEXT |
| 103 | + .pci_fixup : {} > TEXT |
| 104 | + .builtin_fw : {} > TEXT |
| 105 | + .rio_route : {} > TEXT |
| 106 | + .tracedata : {} > TEXT |
| 107 | + __ksymtab : {} > TEXT |
| 108 | + __ksymtab_gpl : {} > TEXT |
| 109 | + __ksymtab_gpl_future : {} > TEXT |
| 110 | + __kcrctab_gpl : {} > TEXT |
| 111 | + __kcrctab_unused : {} > TEXT |
| 112 | + __kcrctab_unused_gpl : {} > TEXT |
| 113 | + __kcrctab_gpl_future : {} > TEXT |
| 114 | + __ksymtab_strings : {} > TEXT |
| 115 | + __init_rodata : {} > TEXT |
| 116 | + __param : {} > TEXT |
| 117 | |
| 118 | - . = ALIGN(4) ; |
| 119 | - _etext = . ; |
| 120 | - } > TEXT |
| 121 | + _etext = .; |
| 122 | |
| 123 | .data DATA_ADDR : { |
| 124 | . = ALIGN(4); |
| 125 | @@ -349,12 +282,6 @@ SECTIONS { |
| 126 | PROVIDE (___eh_frame_end = .); |
| 127 | } > INIT |
| 128 | |
| 129 | - /DISCARD/ : { |
| 130 | - EXIT_TEXT |
| 131 | - EXIT_DATA |
| 132 | - *(.exitcall.exit) |
| 133 | - } |
| 134 | - |
| 135 | .bss : { |
| 136 | . = ALIGN(4); |
| 137 | _sbss = . ; |
| 138 | @@ -365,6 +292,12 @@ SECTIONS { |
| 139 | _end = . ; |
| 140 | } > BSS |
| 141 | |
| 142 | + /DISCARD/ : { |
| 143 | + EXIT_TEXT |
| 144 | + EXIT_DATA |
| 145 | + *(.exitcall.exit) |
| 146 | + } |
| 147 | + |
| 148 | NOTES > BSS |
| 149 | |
| 150 | } |
| 151 | |
