summaryrefslogtreecommitdiff
path: root/arch/sparc/kernel/mdesc.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2011-03-30 17:37:56 -0700
committerDavid S. Miller <davem@davemloft.net>2011-03-30 17:37:56 -0700
commit3628aa0657e7bb3548a25fa3ea47510327d35efc (patch)
tree9735e85a7c184ba242597c97f9f3208bc4ff4690 /arch/sparc/kernel/mdesc.c
parentc897dcf6311ea9c8d24e96cc7f7fe9de58a0a6a2 (diff)
sparc64: Fix section mis-match errors.
Fix all of the problems spotted by CONFIG_DEBUG_SECTION_MISMATCH under arch/sparc during a 64-bit defconfig build. They fall into two categorites: 1) of_device_id is marked as __initdata, and we can never do this since these objects sit in the device core data structures way past boot. So even if a driver will never be reloaded, we have to keep the device ID table around. Mark such cases const instead. 2) The bootmem alloc/free handling code in mdesc.c was not fully marked __init as it should be, thus generating a reference to free_bootmem_late() (which is __init) from non-__init code. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc/kernel/mdesc.c')
-rw-r--r--arch/sparc/kernel/mdesc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/mdesc.c b/arch/sparc/kernel/mdesc.c
index 6addb914fcc8..56db06432ce9 100644
--- a/arch/sparc/kernel/mdesc.c
+++ b/arch/sparc/kernel/mdesc.c
@@ -107,7 +107,7 @@ static struct mdesc_handle * __init mdesc_memblock_alloc(unsigned int mdesc_size
return hp;
}
-static void mdesc_memblock_free(struct mdesc_handle *hp)
+static void __init mdesc_memblock_free(struct mdesc_handle *hp)
{
unsigned int alloc_size;
unsigned long start;