Commit 01674da6 authored Sep 30, 2009 by Rakib Mullick Committed by Len Brown Oct 03, 2009

SFI: fix section mismatch warnings in sfi_core.c



The function sfi_map_memory/sfi_unmap_memory uses
early_ioremap/early_iounmap respectively, which refers to a __init
function.  And function sfi_check_table also refers to a __init function
sfi_verify_table.  Since the references are valid, so use __ref to get rid
of the warnings.

 We were warned by the following warnings:

  LD      vmlinux.o
  MODPOST vmlinux.o
WARNING: vmlinux.o(.text+0xb6ba3a): Section mismatch in reference from
the function sfi_map_memory() to the function
.init.text:early_ioremap()
The function sfi_map_memory() references
the function __init early_ioremap().
This is often because sfi_map_memory lacks a __init
annotation or the annotation of early_ioremap is wrong.

WARNING: vmlinux.o(.text+0xb6bab6): Section mismatch in reference from
the function sfi_unmap_memory() to the function
.init.text:early_iounmap()
The function sfi_unmap_memory() references
the function __init early_iounmap().
This is often because sfi_unmap_memory lacks a __init
annotation or the annotation of early_iounmap is wrong.

WARNING: vmlinux.o(.text+0xb6be30): Section mismatch in reference from
the function sfi_check_table() to the function
.init.text:sfi_verify_table()
The function sfi_check_table() references
the function __init sfi_verify_table().
This is often because sfi_check_table lacks a __init
annotation or the annotation of sfi_verify_table is wrong.

Signed-off-by: Rakib Mullick <rakib.mullick@gmail.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 0efe5e32

drivers/sfi/sfi_core.c

+12 −3

Original line number	Diff line number	Diff line
		@@ -90,7 +90,11 @@ static struct sfi_table_simple *syst_va __read_mostly;
		*/
		static u32 sfi_use_ioremap __read_mostly;

		static void __iomem *sfi_map_memory(u64 phys, u32 size)
		/*
		* sfi_un/map_memory calls early_ioremap/iounmap which is a __init function
		* and introduces section mismatch. So use __ref to make it calm.
		*/
		static void __iomem * __ref sfi_map_memory(u64 phys, u32 size)
		{
		if (!phys \|\| !size)
		return NULL;
		@@ -101,7 +105,7 @@ static void __iomem *sfi_map_memory(u64 phys, u32 size)
		return early_ioremap(phys, size);
		}

		static void sfi_unmap_memory(void __iomem *virt, u32 size)
		static void __ref sfi_unmap_memory(void __iomem *virt, u32 size)
		{
		if (!virt \|\| !size)
		return;
		@@ -213,12 +217,17 @@ static int sfi_table_check_key(struct sfi_table_header *th,
		* the mapped virt address will be returned, and the virt space
		* will be released by call sfi_put_table() later
		*
		* This two cases are from two different functions with two different
		* sections and causes section mismatch warning. So use __ref to tell
		* modpost not to make any noise.
		*
		* Return value:
		* NULL: when can't find a table matching the key
		* ERR_PTR(error): error value
		* virt table address: when a matched table is found
		*/
		struct sfi_table_header sfi_check_table(u64 pa, struct sfi_table_key key)
		struct sfi_table_header *
		__ref sfi_check_table(u64 pa, struct sfi_table_key *key)
		{
		struct sfi_table_header *th;
		void *ret = NULL;