summaryrefslogtreecommitdiffstats
path: root/include/asm-generic
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-23 07:58:01 +0200
committerJeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>2010-07-28 07:45:19 +0200
commitc7f52cdc2f3e1733d3864e439ac2e92edd99ef31 (patch)
tree822ade2b7fd773d15e3514167da5a90d2f7fbddb /include/asm-generic
parentxen/pvhvm: fix build problem when !CONFIG_XEN (diff)
downloadlinux-c7f52cdc2f3e1733d3864e439ac2e92edd99ef31.tar.xz
linux-c7f52cdc2f3e1733d3864e439ac2e92edd99ef31.zip
support multiple .discard.* sections to avoid section type conflicts
gcc 4.4.4 will complain if you use a .discard section for both text and data ("causes a section type conflict"). Add support for ".discard.*" sections, and use .discard.text for a dummy function in the x86 RESERVE_BRK() macro. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'include/asm-generic')
-rw-r--r--include/asm-generic/vmlinux.lds.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 48c5299cbf26..ae6b88eb1de1 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -643,6 +643,7 @@
EXIT_DATA \
EXIT_CALL \
*(.discard) \
+ *(.discard.*) \
}
/**