aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/dmi.h
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2009-03-22 17:48:44 -0400
committerIngo Molnar <mingo@elte.hu>2009-03-23 12:20:50 -0400
commitc8608d6b58981a58ca4aee8308576666c5f7ab0c (patch)
tree70a150f760c334061cd30f266eea97b9da09c16e /arch/x86/include/asm/dmi.h
parent7f00a2495bf5b98b097c47be5d6e2d4114ec39bf (diff)
x86/dmi: fix dmi_alloc() section mismatches
Impact: section mismatch fix Ingo reports these warnings: > WARNING: vmlinux.o(.text+0x6a288e): Section mismatch in reference from > the function dmi_alloc() to the function .init.text:extend_brk() > The function dmi_alloc() references > the function __init extend_brk(). > This is often because dmi_alloc lacks a __init annotation or the > annotation of extend_brk is wrong. dmi_alloc() is a static inline, and so should be immune to this kind of error. But force it to be inlined and make it __init anyway, just to be extra sure. All of dmi_alloc()'s callers are already __init. Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com> Cc: Yinghai Lu <yinghai@kernel.org> LKML-Reference: <49C6B23C.2040308@goop.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/include/asm/dmi.h')
-rw-r--r--arch/x86/include/asm/dmi.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/x86/include/asm/dmi.h b/arch/x86/include/asm/dmi.h
index aa32f7e6c197..fd8f9e2ca35f 100644
--- a/arch/x86/include/asm/dmi.h
+++ b/arch/x86/include/asm/dmi.h
@@ -1,10 +1,13 @@
1#ifndef _ASM_X86_DMI_H 1#ifndef _ASM_X86_DMI_H
2#define _ASM_X86_DMI_H 2#define _ASM_X86_DMI_H
3 3
4#include <linux/compiler.h>
5#include <linux/init.h>
6
4#include <asm/io.h> 7#include <asm/io.h>
5#include <asm/setup.h> 8#include <asm/setup.h>
6 9
7static inline void *dmi_alloc(unsigned len) 10static __always_inline __init void *dmi_alloc(unsigned len)
8{ 11{
9 return extend_brk(len, sizeof(int)); 12 return extend_brk(len, sizeof(int));
10} 13}