Commit 6c61f0f9 authored by Ivan Kokshaysky's avatar Ivan Kokshaysky Committed by Linus Torvalds

[PATCH] more alpha build fixes

- isapnp: asm/io.h is needed for inb() etc.;
- sync up with 2.5.44 vmlinux.lds changes.
parent f208c0ee
...@@ -31,18 +31,27 @@ SECTIONS ...@@ -31,18 +31,27 @@ SECTIONS
*(__ksymtab) *(__ksymtab)
__stop___ksymtab = .; __stop___ksymtab = .;
} }
/* All kernel symbols */
__kallsyms ALIGN(8) : {
__start___kallsyms = .;
*(__kallsyms)
__stop___kallsyms = .;
}
.kstrtab : { *(.kstrtab) } .kstrtab : { *(.kstrtab) }
.rodata : { *(.rodata) *(.rodata.*) }
/* Startup code */ /* Startup code */
.text.init ALIGN(8192) : { .init.text ALIGN(8192) : {
__init_begin = .; __init_begin = .;
*(.text.init) *(.init.text)
} }
.data.init : { *(.data.init) } .init.data : { *(.init.data) }
.setup.init ALIGN(16): { .init.setup ALIGN(16): {
__setup_start = .; __setup_start = .;
*(.setup.init) *(.init.setup)
__setup_end = .; __setup_end = .;
} }
...@@ -71,11 +80,11 @@ SECTIONS ...@@ -71,11 +80,11 @@ SECTIONS
} }
/* Global data */ /* Global data */
.data.cacheline_aligned : { .data.page_aligned ALIGN(8192) : {
_data = .; _data = .;
*(.data.cacheline_aligned) *(.data.page_aligned)
} }
.rodata : { *(.rodata) *(.rodata.*) } .data.cacheline_aligned : { *(.data.cacheline_aligned) }
.data : { *(.data) CONSTRUCTORS } .data : { *(.data) CONSTRUCTORS }
.got : { *(.got) } .got : { *(.got) }
.sdata : { .sdata : {
...@@ -120,5 +129,5 @@ SECTIONS ...@@ -120,5 +129,5 @@ SECTIONS
.debug_typenames 0 : { *(.debug_typenames) } .debug_typenames 0 : { *(.debug_typenames) }
.debug_varnames 0 : { *(.debug_varnames) } .debug_varnames 0 : { *(.debug_varnames) }
/DISCARD/ : { *(.text.exit) *(.data.exit) *(.exitcall.exit) } /DISCARD/ : { *(.exit.text) *(.exit.data) *(.exitcall.exit) }
} }
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/isapnp.h> #include <linux/isapnp.h>
#include <linux/pnp.h> #include <linux/pnp.h>
#include <asm/io.h>
LIST_HEAD(isapnp_cards); LIST_HEAD(isapnp_cards);
LIST_HEAD(isapnp_devices); LIST_HEAD(isapnp_devices);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment