blob: 177838406a156d37acca30414d08ec9e6dda5dd6 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
|
Subject: iommu/amd: Use WARN_ON_NORT in __attach_device()
From: Thomas Gleixner <tglx@linutronix.de>
Date: Sat, 27 Feb 2016 10:22:23 +0100
RT does not disable interrupts here, but the protection is still
correct. Fixup the WARN_ON so it won't yell on RT.
Note: This WARN_ON is bogus anyway. The real thing this needs to check is that
amd_iommu_devtable_lock is held.
Reported-by: DIXLOR <dixlor@gmail.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
drivers/iommu/amd_iommu.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
--- a/drivers/iommu/amd_iommu.c
+++ b/drivers/iommu/amd_iommu.c
@@ -1929,10 +1929,10 @@ static int __attach_device(struct iommu_
int ret;
/*
- * Must be called with IRQs disabled. Warn here to detect early
- * when its not.
+ * Must be called with IRQs disabled on a non RT kernel. Warn here to
+ * detect early when its not.
*/
- WARN_ON(!irqs_disabled());
+ WARN_ON_NONRT(!irqs_disabled());
/* lock domain */
spin_lock(&domain->lock);
@@ -2100,10 +2100,10 @@ static void __detach_device(struct iommu
struct protection_domain *domain;
/*
- * Must be called with IRQs disabled. Warn here to detect early
- * when its not.
+ * Must be called with IRQs disabled on a non RT kernel. Warn here to
+ * detect early when its not.
*/
- WARN_ON(!irqs_disabled());
+ WARN_ON_NONRT(!irqs_disabled());
if (WARN_ON(!dev_data->domain))
return;
|
