diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-01-06 09:04:32 +0100 |
| commit | d12418fdeafdc08dd5bbec89d3e07e47ee75da55 (patch) | |
| tree | ac94d5bf58360b89fc7439fb52182c17d0674b0a /arch/x86/kernel/pci-swiotlb_64.c | |
| parent | x86: cleanup remaining cpumask_t ops in smpboot code (diff) | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/agk/linux-2.6-dm (diff) | |
| download | linux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.tar.xz linux-d12418fdeafdc08dd5bbec89d3e07e47ee75da55.zip | |
Merge branch 'linus' into cpus4096
Diffstat (limited to 'arch/x86/kernel/pci-swiotlb_64.c')
| -rw-r--r-- | arch/x86/kernel/pci-swiotlb_64.c | 2 |
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 242c3440687f..8cba3749a511 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); } |