summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-01-05 19:03:11 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2009-01-05 19:03:11 -0800
commit0578c3b4d44c34e499e1fd5916ed6c63635b25cf (patch)
tree7bcf1e4bb08984b2f5671a48c052c26903855ba6 /arch/x86
parent7d8a804c594b61a05c698126165b5dc417d94a0f (diff)
parent52942b6b16c6ebb25f4dd4df0208d840ba0cbc5c (diff)
downloadop-kernel-dev-0578c3b4d44c34e499e1fd5916ed6c63635b25cf.zip
op-kernel-dev-0578c3b4d44c34e499e1fd5916ed6c63635b25cf.tar.gz
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: swiotlb: Don't include linux/swiotlb.h twice in lib/swiotlb.c intel-iommu: fix build error with INTR_REMAP=y and DMAR=n swiotlb: add missing __init annotations
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/kernel/pci-swiotlb_64.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb_64.c
index 242c344..8cba374 100644
--- a/arch/x86/kernel/pci-swiotlb_64.c
+++ b/arch/x86/kernel/pci-swiotlb_64.c
@@ -13,7 +13,7 @@
int swiotlb __read_mostly;
-void *swiotlb_alloc_boot(size_t size, unsigned long nslabs)
+void * __init swiotlb_alloc_boot(size_t size, unsigned long nslabs)
{
return alloc_bootmem_low_pages(size);
}
OpenPOWER on IntegriCloud