linux-arch.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Frantisek Hrbata <fhrbata@redhat.com>
To: linux-kernel@vger.kernel.org
Cc: jstancek@redhat.com, keescook@chromium.org,
	peter.oberparleiter@de.ibm.com, rusty@rustcorp.com.au,
	linux-arch@vger.kernel.org, arnd@arndb.de, mgahagan@redhat.com,
	agospoda@redhat.com, akpm@linux-foundation.org
Subject: [PATCH v2 4/4] kernel: add support for init_array constructors
Date: Wed,  4 Sep 2013 16:42:56 +0200	[thread overview]
Message-ID: <1378305776-3644-5-git-send-email-fhrbata@redhat.com> (raw)
In-Reply-To: <1378305776-3644-1-git-send-email-fhrbata@redhat.com>

This adds the .init_array section as yet another section with constructors. This
is needed because gcc could add __gcov_init calls to .init_array or .ctors
section, depending on gcc version.

v2: - reuse mod->ctors for .init_array section for modules, because gcc uses
      .ctors or .init_array, but not both at the same time

Signed-off-by: Frantisek Hrbata <fhrbata@redhat.com>
---
 include/asm-generic/vmlinux.lds.h | 1 +
 kernel/module.c                   | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h
index 69732d2..c55d8d9 100644
--- a/include/asm-generic/vmlinux.lds.h
+++ b/include/asm-generic/vmlinux.lds.h
@@ -468,6 +468,7 @@
 #define KERNEL_CTORS()	. = ALIGN(8);			   \
 			VMLINUX_SYMBOL(__ctors_start) = .; \
 			*(.ctors)			   \
+			*(.init_array)			   \
 			VMLINUX_SYMBOL(__ctors_end) = .;
 #else
 #define KERNEL_CTORS()
diff --git a/kernel/module.c b/kernel/module.c
index 2069158..bbbd953 100644
--- a/kernel/module.c
+++ b/kernel/module.c
@@ -2760,6 +2760,9 @@ static void find_module_sections(struct module *mod, struct load_info *info)
 #ifdef CONFIG_CONSTRUCTORS
 	mod->ctors = section_objs(info, ".ctors",
 				  sizeof(*mod->ctors), &mod->num_ctors);
+	if (!mod->ctors)
+		mod->ctors = section_objs(info, ".init_array",
+				sizeof(*mod->ctors), &mod->num_ctors);
 #endif
 
 #ifdef CONFIG_TRACEPOINTS
-- 
1.8.3.1

  parent reply	other threads:[~2013-09-04 14:42 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-04 14:42 [PATCH v2 0/4] add support for gcov format introduced in gcc 4.7 Frantisek Hrbata
2013-09-04 14:42 ` [PATCH v2 1/4] gcov: move gcov structs definitions to a gcc version specific file Frantisek Hrbata
2013-09-04 14:42   ` Frantisek Hrbata
2013-09-04 14:42 ` [PATCH v2 2/4] gcov: add support for gcc 4.7 gcov format Frantisek Hrbata
2013-09-04 14:42   ` Frantisek Hrbata
2013-09-18 21:22   ` Andrew Morton
2013-09-18 21:27     ` Joe Perches
2013-09-18 21:27       ` Joe Perches
2013-09-18 21:31       ` Andrew Morton
2013-09-19 10:12         ` Frantisek Hrbata
2013-09-19  9:04   ` Peter Oberparleiter
2013-09-19 10:21     ` Frantisek Hrbata
2013-09-19 10:31       ` Peter Oberparleiter
2013-09-04 14:42 ` [PATCH v2 3/4] gcov: compile specific gcov implementation based on gcc version Frantisek Hrbata
2013-09-04 14:42   ` Frantisek Hrbata
2013-09-04 14:42 ` Frantisek Hrbata [this message]
2013-09-04 14:42   ` [PATCH v2 4/4] kernel: add support for init_array constructors Frantisek Hrbata
2013-09-06  2:13   ` Rusty Russell
2013-09-06 17:51     ` Frantisek Hrbata
2013-09-06 18:07       ` Kyle McMartin
2013-09-09  1:14         ` Rusty Russell
2013-09-09  1:14           ` Rusty Russell
2013-09-09 16:28           ` Frantisek Hrbata
2013-09-10  0:15             ` Kyle McMartin
2013-09-10  5:35             ` Rusty Russell
2013-09-10 13:28               ` Frantisek Hrbata
2013-09-10 13:28                 ` Frantisek Hrbata
2013-09-11  1:52                 ` Rusty Russell
2013-09-26 23:11 ` [PATCH v2 0/4] add support for gcov format introduced in gcc 4.7 Christophe Guillon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378305776-3644-5-git-send-email-fhrbata@redhat.com \
    --to=fhrbata@redhat.com \
    --cc=agospoda@redhat.com \
    --cc=akpm@linux-foundation.org \
    --cc=arnd@arndb.de \
    --cc=jstancek@redhat.com \
    --cc=keescook@chromium.org \
    --cc=linux-arch@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mgahagan@redhat.com \
    --cc=peter.oberparleiter@de.ibm.com \
    --cc=rusty@rustcorp.com.au \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).