aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-generic/vmlinux.lds.h
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2014-09-14 09:34:38 -0400
committerThomas Gleixner <tglx@linutronix.de>2014-09-14 09:35:36 -0400
commitdb985cbd67c45f875ef43cb5febfaa8cbd203c27 (patch)
tree63542d05b1c0f730ec1ad5f915dc4eb3c015e616 /include/asm-generic/vmlinux.lds.h
parentc6f1224573c3b609bd8073b39f496637a16cc06f (diff)
parent468a903c0e5147e3f93187f0b808a3ef957fd00e (diff)
Merge tag 'irqchip-core-3.18' of git://git.infradead.org/users/jcooper/linux into irq/core
irqchip core changes for v3.18 - renesas: suspend to RAM, runtime PM, cleanups and DT binding docs - keystone: add new driver - hip04: add Hisilicon HiP04 driver (without touching irq-gic.c) - gic: Use defines instead of magic number, preserve v2 bybass bits - handle_domain_irq: common low level interrupt entry handler
Diffstat (limited to 'include/asm-generic/vmlinux.lds.h')
-rw-r--r--include/asm-generic/vmlinux.lds.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 471ba48c7ae4..5ba0360663a7 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -268,6 +268,9 @@
268 VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \ 268 VMLINUX_SYMBOL(__start_pci_fixups_suspend) = .; \
269 *(.pci_fixup_suspend) \ 269 *(.pci_fixup_suspend) \
270 VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \ 270 VMLINUX_SYMBOL(__end_pci_fixups_suspend) = .; \
271 VMLINUX_SYMBOL(__start_pci_fixups_suspend_late) = .; \
272 *(.pci_fixup_suspend_late) \
273 VMLINUX_SYMBOL(__end_pci_fixups_suspend_late) = .; \
271 } \ 274 } \
272 \ 275 \
273 /* Built-in firmware blobs */ \ 276 /* Built-in firmware blobs */ \
@@ -693,7 +696,7 @@
693 . = ALIGN(PAGE_SIZE); \ 696 . = ALIGN(PAGE_SIZE); \
694 *(.data..percpu..page_aligned) \ 697 *(.data..percpu..page_aligned) \
695 . = ALIGN(cacheline); \ 698 . = ALIGN(cacheline); \
696 *(.data..percpu..readmostly) \ 699 *(.data..percpu..read_mostly) \
697 . = ALIGN(cacheline); \ 700 . = ALIGN(cacheline); \
698 *(.data..percpu) \ 701 *(.data..percpu) \
699 *(.data..percpu..shared_aligned) \ 702 *(.data..percpu..shared_aligned) \