All of lore.kernel.org
 help / color / mirror / Atom feed
From: Shane McDonald <mcdonald.shane@gmail.com>
To: linux-mips@linux-mips.org, ralf@linux-mips.org
Subject: [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs
Date: Sat, 05 Jul 2008 17:19:42 -0600	[thread overview]
Message-ID: <E1KFH2c-0005iq-80@localhost> (raw)

From: Shane McDonald <mcdonald.shane@gmail.com>

Section mismatches are reported when compiling the default
Atlas configuration and the default Decstation configuration.
This patch resolves those mismatches by defining affected
functions with the __cpuinit attribute, rather than __init.

Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
---
 arch/mips/mm/c-r3k.c   |    6 +++---
 arch/mips/mm/sc-rm7k.c |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff -uprN -X orig/Documentation/dontdiff orig/arch/mips/mm/c-r3k.c patched/arch/mips/mm/c-r3k.c
--- orig/arch/mips/mm/c-r3k.c	2008-07-04 17:22:25.000000000 -0600
+++ patched/arch/mips/mm/c-r3k.c	2008-07-05 11:56:01.000000000 -0600
@@ -26,7 +26,7 @@
 static unsigned long icache_size, dcache_size;		/* Size in bytes */
 static unsigned long icache_lsize, dcache_lsize;	/* Size in bytes */
 
-unsigned long __init r3k_cache_size(unsigned long ca_flags)
+unsigned long __cpuinit r3k_cache_size(unsigned long ca_flags)
 {
 	unsigned long flags, status, dummy, size;
 	volatile unsigned long *p;
@@ -61,7 +61,7 @@ unsigned long __init r3k_cache_size(unsi
 	return size * sizeof(*p);
 }
 
-unsigned long __init r3k_cache_lsize(unsigned long ca_flags)
+unsigned long __cpuinit r3k_cache_lsize(unsigned long ca_flags)
 {
 	unsigned long flags, status, lsize, i;
 	volatile unsigned long *p;
@@ -90,7 +90,7 @@ unsigned long __init r3k_cache_lsize(uns
 	return lsize * sizeof(*p);
 }
 
-static void __init r3k_probe_cache(void)
+static void __cpuinit r3k_probe_cache(void)
 {
 	dcache_size = r3k_cache_size(ST0_ISC);
 	if (dcache_size)
diff -uprN -X orig/Documentation/dontdiff orig/arch/mips/mm/sc-rm7k.c patched/arch/mips/mm/sc-rm7k.c
--- orig/arch/mips/mm/sc-rm7k.c	2008-07-04 17:22:25.000000000 -0600
+++ patched/arch/mips/mm/sc-rm7k.c	2008-07-05 09:51:34.000000000 -0600
@@ -86,7 +86,7 @@ static void rm7k_sc_inv(unsigned long ad
 /*
  * This function is executed in uncached address space.
  */
-static __init void __rm7k_sc_enable(void)
+static __cpuinit void __rm7k_sc_enable(void)
 {
 	int i;
 
@@ -107,7 +107,7 @@ static __init void __rm7k_sc_enable(void
 	}
 }
 
-static __init void rm7k_sc_enable(void)
+static __cpuinit void rm7k_sc_enable(void)
 {
 	if (read_c0_config() & RM7K_CONF_SE)
 		return;

             reply	other threads:[~2008-07-05 23:19 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-07-05 23:19 Shane McDonald [this message]
2008-07-07  5:27 ` [MIPS] Fix section mismatches when compiling atlas and decstation defconfigs Ralf Baechle
2008-07-08 18:49 ` Ralf Baechle
2008-07-09  7:29   ` Dmitri Vorobiev
2008-07-09  9:53     ` Ralf Baechle

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=E1KFH2c-0005iq-80@localhost \
    --to=mcdonald.shane@gmail.com \
    --cc=linux-mips@linux-mips.org \
    --cc=ralf@linux-mips.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.