diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2008-07-15 21:07:59 -0400 |
| commit | 84c3d4aaec3338201b449034beac41635866bddf (patch) | |
| tree | 3412951682fb2dd4feb8a5532f8efbaf8b345933 /include/asm-generic/vmlinux.lds.h | |
| parent | 43d2548bb2ef7e6d753f91468a746784041e522d (diff) | |
| parent | fafa3a3f16723997f039a0193997464d66dafd8f (diff) | |
Merge commit 'origin/master'
Manual merge of:
arch/powerpc/Kconfig
arch/powerpc/kernel/stacktrace.c
arch/powerpc/mm/slice.c
arch/ppc/kernel/smp.c
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index bf2851f93937..b20409404c7d 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h | |||
| @@ -88,6 +88,13 @@ | |||
| 88 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ | 88 | VMLINUX_SYMBOL(__end_pci_fixups_resume) = .; \ |
| 89 | } \ | 89 | } \ |
| 90 | \ | 90 | \ |
| 91 | /* Built-in firmware blobs */ \ | ||
| 92 | .builtin_fw : AT(ADDR(.builtin_fw) - LOAD_OFFSET) { \ | ||
| 93 | VMLINUX_SYMBOL(__start_builtin_fw) = .; \ | ||
| 94 | *(.builtin_fw) \ | ||
| 95 | VMLINUX_SYMBOL(__end_builtin_fw) = .; \ | ||
| 96 | } \ | ||
| 97 | \ | ||
| 91 | /* RapidIO route ops */ \ | 98 | /* RapidIO route ops */ \ |
| 92 | .rio_route : AT(ADDR(.rio_route) - LOAD_OFFSET) { \ | 99 | .rio_route : AT(ADDR(.rio_route) - LOAD_OFFSET) { \ |
| 93 | VMLINUX_SYMBOL(__start_rio_route_ops) = .; \ | 100 | VMLINUX_SYMBOL(__start_rio_route_ops) = .; \ |