diff options
| author | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-07-22 22:58:01 -0700 |
|---|---|---|
| committer | Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> | 2010-07-27 22:45:19 -0700 |
| commit | c7f52cdc2f3e1733d3864e439ac2e92edd99ef31 (patch) | |
| tree | 822ade2b7fd773d15e3514167da5a90d2f7fbddb | |
| parent | b43275d661baa5f1f72dacd9033d6eda09d9fe87 (diff) | |
| download | kernel_samsung_tuna-c7f52cdc2f3e1733d3864e439ac2e92edd99ef31.zip kernel_samsung_tuna-c7f52cdc2f3e1733d3864e439ac2e92edd99ef31.tar.gz kernel_samsung_tuna-c7f52cdc2f3e1733d3864e439ac2e92edd99ef31.tar.bz2 | |
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>
| -rw-r--r-- | arch/x86/include/asm/setup.h | 2 | ||||
| -rw-r--r-- | include/asm-generic/vmlinux.lds.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/arch/x86/include/asm/setup.h b/arch/x86/include/asm/setup.h index 86b1506..ef292c7 100644 --- a/arch/x86/include/asm/setup.h +++ b/arch/x86/include/asm/setup.h @@ -82,7 +82,7 @@ void *extend_brk(size_t size, size_t align); * executable.) */ #define RESERVE_BRK(name,sz) \ - static void __section(.discard) __used \ + static void __section(.discard.text) __used \ __brk_reservation_fn_##name##__(void) { \ asm volatile ( \ ".pushsection .brk_reservation,\"aw\",@nobits;" \ diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h index 48c5299..ae6b88e 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.*) \ } /** |