linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Paul Gortmaker <paul.gortmaker@windriver.com>
To: <linux-kernel@vger.kernel.org>
Cc: Paul Gortmaker <paul.gortmaker@windriver.com>,
	Chris Metcalf <cmetcalf@tilera.com>
Subject: [PATCH 14/32] tile: delete __cpuinit usage from all tile files
Date: Mon, 24 Jun 2013 15:30:19 -0400	[thread overview]
Message-ID: <1372102237-8757-15-git-send-email-paul.gortmaker@windriver.com> (raw)
In-Reply-To: <1372102237-8757-1-git-send-email-paul.gortmaker@windriver.com>

The __cpuinit type of throwaway sections might have made sense
some time ago when RAM was more constrained, but now the savings
do not offset the cost and complications.  For example, the fix in
commit 5e427ec2d0 ("x86: Fix bit corruption at CPU resume time")
is a good example of the nasty type of bugs that can be created
with improper use of the various __init prefixes.

After a discussion on LKML[1] it was decided that cpuinit should go
the way of devinit and be phased out.  Once all the users are gone,
we can then finally remove the macros themselves from linux/init.h.

Note that some harmless section mismatch warnings may result, since
notify_cpu_starting() and cpu_up() are arch independent (kernel/cpu.c)
are flagged as __cpuinit  -- so if we remove the __cpuinit from
arch specific callers, we will also get section mismatch warnings.
As an intermediate step, we intend to turn the linux/init.h cpuinit
content into no-ops as early as possible, since that will get rid
of these warnings.  In any case, they are temporary and harmless.

This removes all the arch/tile uses of the __cpuinit macros from
all C files.  Currently tile does not have any __CPUINIT used in
assembly files.

[1] https://lkml.org/lkml/2013/5/20/589

Cc: Chris Metcalf <cmetcalf@tilera.com>
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
---

[This commit is part of the __cpuinit removal work.  If you don't see
 any problems with it, then you don't have to do anything ; it will be
 submitted with all the rest of the __cpuinit removal work.  On the
 other hand, if you want to carry this patch in with your other pending
 changes so as to handle conflicts with other pending work yourself, then
 that is fine too, as the commits can largely be treated independently.
 For more information, please see: https://lkml.org/lkml/2013/6/20/513 ]

 arch/tile/kernel/irq.c       |  2 +-
 arch/tile/kernel/messaging.c |  2 +-
 arch/tile/kernel/setup.c     | 12 ++++++------
 arch/tile/kernel/smpboot.c   |  8 ++++----
 arch/tile/kernel/time.c      |  2 +-
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/arch/tile/kernel/irq.c b/arch/tile/kernel/irq.c
index 02e6280..3ccf2cd 100644
--- a/arch/tile/kernel/irq.c
+++ b/arch/tile/kernel/irq.c
@@ -220,7 +220,7 @@ void __init init_IRQ(void)
 	ipi_init();
 }
 
-void __cpuinit setup_irq_regs(void)
+void setup_irq_regs(void)
 {
 	/* Enable interrupt delivery. */
 	unmask_irqs(~0UL);
diff --git a/arch/tile/kernel/messaging.c b/arch/tile/kernel/messaging.c
index 0858ee6..00331af 100644
--- a/arch/tile/kernel/messaging.c
+++ b/arch/tile/kernel/messaging.c
@@ -25,7 +25,7 @@
 /* All messages are stored here */
 static DEFINE_PER_CPU(HV_MsgState, msg_state);
 
-void __cpuinit init_messaging(void)
+void init_messaging(void)
 {
 	/* Allocate storage for messages in kernel space */
 	HV_MsgState *state = &__get_cpu_var(msg_state);
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 68b5426..eceb834 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -58,8 +58,8 @@ struct pglist_data node_data[MAX_NUMNODES] __read_mostly;
 EXPORT_SYMBOL(node_data);
 
 /* Information on the NUMA nodes that we compute early */
-unsigned long __cpuinitdata node_start_pfn[MAX_NUMNODES];
-unsigned long __cpuinitdata node_end_pfn[MAX_NUMNODES];
+unsigned long node_start_pfn[MAX_NUMNODES];
+unsigned long node_end_pfn[MAX_NUMNODES];
 unsigned long __initdata node_memmap_pfn[MAX_NUMNODES];
 unsigned long __initdata node_percpu_pfn[MAX_NUMNODES];
 unsigned long __initdata node_free_pfn[MAX_NUMNODES];
@@ -84,7 +84,7 @@ unsigned long __initdata boot_pc = (unsigned long)start_kernel;
 
 #ifdef CONFIG_HIGHMEM
 /* Page frame index of end of lowmem on each controller. */
-unsigned long __cpuinitdata node_lowmem_end_pfn[MAX_NUMNODES];
+unsigned long node_lowmem_end_pfn[MAX_NUMNODES];
 
 /* Number of pages that can be mapped into lowmem. */
 static unsigned long __initdata mappable_physpages;
@@ -290,7 +290,7 @@ static void *__init setup_pa_va_mapping(void)
  * This is up to 4 mappings for lowmem, one mapping per memory
  * controller, plus one for our text segment.
  */
-static void __cpuinit store_permanent_mappings(void)
+static void store_permanent_mappings(void)
 {
 	int i;
 
@@ -935,7 +935,7 @@ subsys_initcall(topology_init);
  * So the values we set up here in the hypervisor may be overridden on
  * the boot cpu as arguments are parsed.
  */
-static __cpuinit void init_super_pages(void)
+static void init_super_pages(void)
 {
 #ifdef CONFIG_HUGETLB_SUPER_PAGES
 	int i;
@@ -950,7 +950,7 @@ static __cpuinit void init_super_pages(void)
  *
  * Called from setup_arch() on the boot cpu, or online_secondary().
  */
-void __cpuinit setup_cpu(int boot)
+void setup_cpu(int boot)
 {
 	/* The boot cpu sets up its permanent mappings much earlier. */
 	if (!boot)
diff --git a/arch/tile/kernel/smpboot.c b/arch/tile/kernel/smpboot.c
index 44bab29..a535655 100644
--- a/arch/tile/kernel/smpboot.c
+++ b/arch/tile/kernel/smpboot.c
@@ -133,14 +133,14 @@ static __init int reset_init_affinity(void)
 }
 late_initcall(reset_init_affinity);
 
-static struct cpumask cpu_started __cpuinitdata;
+static struct cpumask cpu_started;
 
 /*
  * Activate a secondary processor.  Very minimal; don't add anything
  * to this path without knowing what you're doing, since SMP booting
  * is pretty fragile.
  */
-static void __cpuinit start_secondary(void)
+static void start_secondary(void)
 {
 	int cpuid = smp_processor_id();
 
@@ -183,7 +183,7 @@ static void __cpuinit start_secondary(void)
 /*
  * Bring a secondary processor online.
  */
-void __cpuinit online_secondary(void)
+void online_secondary(void)
 {
 	/*
 	 * low-memory mappings have been cleared, flush them from
@@ -210,7 +210,7 @@ void __cpuinit online_secondary(void)
 	cpu_startup_entry(CPUHP_ONLINE);
 }
 
-int __cpuinit __cpu_up(unsigned int cpu, struct task_struct *tidle)
+int __cpu_up(unsigned int cpu, struct task_struct *tidle)
 {
 	/* Wait 5s total for all CPUs for them to come online */
 	static int timeout;
diff --git a/arch/tile/kernel/time.c b/arch/tile/kernel/time.c
index 5ac397e..7c353d8 100644
--- a/arch/tile/kernel/time.c
+++ b/arch/tile/kernel/time.c
@@ -159,7 +159,7 @@ static DEFINE_PER_CPU(struct clock_event_device, tile_timer) = {
 	.set_mode = tile_timer_set_mode,
 };
 
-void __cpuinit setup_tile_timer(void)
+void setup_tile_timer(void)
 {
 	struct clock_event_device *evt = &__get_cpu_var(tile_timer);
 
-- 
1.8.1.2


  parent reply	other threads:[~2013-06-24 19:39 UTC|newest]

Thread overview: 60+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <1372102237-8757-1-git-send-email-paul.gortmaker@windriver.com>
2013-06-24 19:30 ` [PATCH 01/32] init.h: remove __cpuinit sections from the kernel Paul Gortmaker
2013-06-24 19:51   ` Joe Perches
2013-06-24 22:10     ` Joe Perches
2013-06-24 19:30 ` [PATCH 02/32] modpost: remove all traces of cpuinit/cpuexit sections Paul Gortmaker
2013-06-24 19:30 ` [PATCH 03/32] alpha: delete __cpuinit usage from all users Paul Gortmaker
2013-06-24 19:30 ` [PATCH 04/32] powerpc: " Paul Gortmaker
2013-06-24 19:30 ` [PATCH 05/32] parisc: " Paul Gortmaker
2013-06-24 19:30 ` [PATCH 06/32] ia64: delete __cpuinit usage from all ia64 users Paul Gortmaker
2013-06-24 19:30 ` [PATCH 07/32] arm: delete __cpuinit/__CPUINIT usage from all ARM users Paul Gortmaker
2013-07-02  8:52   ` Joseph Lo
2013-07-02  8:58     ` Russell King - ARM Linux
2013-07-02 17:53       ` Paul Gortmaker
2013-06-24 19:30 ` [PATCH 08/32] sparc: delete __cpuinit/__CPUINIT usage from all users Paul Gortmaker
2013-06-24 19:30 ` [PATCH 09/32] arm64: delete __cpuinit " Paul Gortmaker
2013-06-25  8:45   ` Catalin Marinas
2013-06-24 19:30 ` [PATCH 10/32] arc: delete __cpuinit usage from all arc files Paul Gortmaker
2013-06-25  4:37   ` Vineet Gupta
2013-06-24 19:30 ` [PATCH 11/32] blackfin: delete __cpuinit usage from all blackfin files Paul Gortmaker
2013-06-24 22:40   ` Mike Frysinger
2013-06-24 19:30 ` [PATCH 12/32] s390: delete __cpuinit usage from all s390 files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 13/32] sh: delete __cpuinit usage from all sh files Paul Gortmaker
2013-06-24 19:30 ` Paul Gortmaker [this message]
2013-06-24 19:30 ` [PATCH 15/32] metag: delete __cpuinit usage from all metag files Paul Gortmaker
2013-06-25 15:10   ` James Hogan
2013-06-24 19:30 ` [PATCH 16/32] cris: delete __cpuinit usage from all cris files Paul Gortmaker
2013-06-25 10:42   ` Jesper Nilsson
2013-06-24 19:30 ` [PATCH 17/32] frv: delete __cpuinit usage from all frv files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 18/32] hexagon: delete __cpuinit usage from all hexagon files Paul Gortmaker
2013-07-08 17:01   ` Richard Kuo
2013-06-24 19:30 ` [PATCH 19/32] m32r: delete __cpuinit usage from all m32r files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 20/32] openrisc: delete __cpuinit usage from all openrisc files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 21/32] xtensa: delete __cpuinit usage from all xtensa files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 22/32] score: delete __cpuinit usage from all score files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 23/32] x86: delete __cpuinit usage from all x86 files Paul Gortmaker
2013-06-24 19:37   ` Ingo Molnar
2013-06-24 19:57   ` Thomas Gleixner
2013-06-24 23:12   ` H. Peter Anvin
2013-06-25  2:16     ` Paul Gortmaker
2013-06-24 19:30 ` [PATCH 24/32] clocksource+irqchip: delete __cpuinit usage from all related files Paul Gortmaker
2013-06-24 19:56   ` Thomas Gleixner
2013-06-24 19:30 ` [PATCH 25/32] cpufreq: delete __cpuinit usage from all cpufreq files Paul Gortmaker
2013-06-24 22:42   ` Dirk Brandewie
2013-06-25  3:31   ` Viresh Kumar
2013-06-25  4:15     ` Joe Perches
2013-06-25  6:44       ` Viresh Kumar
2013-06-25  6:59         ` Joe Perches
2013-06-25  7:01           ` Viresh Kumar
2013-06-25 14:30     ` Paul Gortmaker
2013-06-24 19:30 ` [PATCH 26/32] hwmon: delete __cpuinit usage from all hwmon files Paul Gortmaker
2013-06-24 20:11   ` [lm-sensors] " Guenter Roeck
2013-06-24 19:30 ` [PATCH 27/32] acpi: delete __cpuinit usage from all acpi files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 28/32] net: delete __cpuinit usage from all net files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 29/32] rcu: delete __cpuinit usage from all rcu files Paul Gortmaker
2013-06-25  1:10   ` Josh Triplett
2013-06-25 19:32     ` Paul E. McKenney
2013-06-24 19:30 ` [PATCH 30/32] kernel: delete __cpuinit usage from all core kernel files Paul Gortmaker
2013-06-24 19:30 ` [PATCH 31/32] drivers: delete __cpuinit usage from all remaining drivers files Paul Gortmaker
2013-06-24 20:33   ` Greg Kroah-Hartman
2013-06-24 19:30 ` [PATCH 32/32] block: delete __cpuinit usage from all block files Paul Gortmaker
2013-06-24 20:00 ` [PATCH-next 00/32] Delete support for __cpuinit Paul Gortmaker

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=1372102237-8757-15-git-send-email-paul.gortmaker@windriver.com \
    --to=paul.gortmaker@windriver.com \
    --cc=cmetcalf@tilera.com \
    --cc=linux-kernel@vger.kernel.org \
    /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).