summaryrefslogtreecommitdiffstats
path: root/arch/x86/mm
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 09:44:50 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2012-03-22 09:44:50 -0700
commit28f23d1f3b6a6078312b6e9585e583cc7326fe22 (patch)
treedb366c75c2e2d12a2a2c3b7299c35ef7c72928a4 /arch/x86/mm
parent23904815461ba223a8baf7490051597fa054299b (diff)
parentc7b738351ba92f48b943ac59aff6b5b0f17f37c9 (diff)
downloadop-kernel-dev-28f23d1f3b6a6078312b6e9585e583cc7326fe22.zip
op-kernel-dev-28f23d1f3b6a6078312b6e9585e583cc7326fe22.tar.gz
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 "urgent" leftovers from Ingo Molnar: "Pending x86/urgent bits that were not high prio enough to warrant -rc-less v3.3-final inclusion." * 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: x86, efi: Fix pointer math issue in handle_ramdisks() x86/ioapic: Add register level checks to detect bogus io-apic entries x86, mce: Fix rcu splat in drain_mce_log_buffer() x86, memblock: Move mem_hole_size() to .init
Diffstat (limited to 'arch/x86/mm')
-rw-r--r--arch/x86/mm/numa_emulation.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/mm/numa_emulation.c b/arch/x86/mm/numa_emulation.c
index 740b0a3..53489ff 100644
--- a/arch/x86/mm/numa_emulation.c
+++ b/arch/x86/mm/numa_emulation.c
@@ -28,7 +28,7 @@ static int __init emu_find_memblk_by_nid(int nid, const struct numa_meminfo *mi)
return -ENOENT;
}
-static u64 mem_hole_size(u64 start, u64 end)
+static u64 __init mem_hole_size(u64 start, u64 end)
{
unsigned long start_pfn = PFN_UP(start);
unsigned long end_pfn = PFN_DOWN(end);
OpenPOWER on IntegriCloud