diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:30:39 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-03-22 12:30:39 -0400 |
| commit | 4c64616bb51b399886ded8f4f69bad4da2da1817 (patch) | |
| tree | 341991585a9998e8c9bf20600f0d5cbf5a1746d2 /drivers/iommu | |
| parent | c5c7fb8fbd7cd228132b6e2a17a10f246ffc06ee (diff) | |
| parent | 943bc7e110f269f88dc92bbf249adbd384d35f1c (diff) | |
Merge branch 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86/debug changes from Ingo Molnar.
* 'x86-debug-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86: Fix section warnings
x86-64: Fix CFI data for common_interrupt()
x86: Properly _init-annotate NMI selftest code
x86/debug: Fix/improve the show_msr=<cpus> debug print out
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/amd_iommu.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/iommu/amd_iommu.c b/drivers/iommu/amd_iommu.c index f75e0608be5b..ae2ec929e52f 100644 --- a/drivers/iommu/amd_iommu.c +++ b/drivers/iommu/amd_iommu.c | |||
| @@ -2804,7 +2804,7 @@ static int amd_iommu_dma_supported(struct device *dev, u64 mask) | |||
| 2804 | * we don't need to preallocate the protection domains anymore. | 2804 | * we don't need to preallocate the protection domains anymore. |
| 2805 | * For now we have to. | 2805 | * For now we have to. |
| 2806 | */ | 2806 | */ |
| 2807 | static void prealloc_protection_domains(void) | 2807 | static void __init prealloc_protection_domains(void) |
| 2808 | { | 2808 | { |
| 2809 | struct iommu_dev_data *dev_data; | 2809 | struct iommu_dev_data *dev_data; |
| 2810 | struct dma_ops_domain *dma_dom; | 2810 | struct dma_ops_domain *dma_dom; |