This is a note to let you know that I've just added the patch titled
iommu/arm-smmu: fix iommu_present() test in init
to the 3.11-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
iommu-arm-smmu-fix-iommu_present-test-in-init.patch
and it can be found in the queue-3.11 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 6614ee77f49d37f9bb77eb3e81431ca8fcc4042e Mon Sep 17 00:00:00 2001
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Date: Wed, 21 Aug 2013 09:34:20 +0100
Subject: iommu/arm-smmu: fix iommu_present() test in init
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
commit 6614ee77f49d37f9bb77eb3e81431ca8fcc4042e upstream.
The extra semi-colon on the end breaks the test.
Tested-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Signed-off-by: Will Deacon <will.deacon@xxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/iommu/arm-smmu.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/iommu/arm-smmu.c
+++ b/drivers/iommu/arm-smmu.c
@@ -1948,10 +1948,10 @@ static int __init arm_smmu_init(void)
return ret;
/* Oh, for a proper bus abstraction */
- if (!iommu_present(&platform_bus_type));
+ if (!iommu_present(&platform_bus_type))
bus_set_iommu(&platform_bus_type, &arm_smmu_ops);
- if (!iommu_present(&amba_bustype));
+ if (!iommu_present(&amba_bustype))
bus_set_iommu(&amba_bustype, &arm_smmu_ops);
return 0;
Patches currently in stable-queue which might be from dan.carpenter@xxxxxxxxxx are
queue-3.11/cciss-fix-info-leak-in-cciss_ioctl32_passthru.patch
queue-3.11/iommu-arm-smmu-fix-a-signedness-bug.patch
queue-3.11/cpqarray-fix-info-leak-in-ida_locked_ioctl.patch
queue-3.11/asoc-max98095-a-couple-array-underflows.patch
queue-3.11/iommu-arm-smmu-fix-iommu_present-test-in-init.patch
queue-3.11/asoc-ab8500-codec-info-leak-in-anc_status_control_put.patch
queue-3.11/net-sctp-fix-smatch-warning-in-sctp_send_asconf_del_ip.patch
queue-3.11/asoc-88pm860x-array-overflow-in-snd_soc_put_volsw_2r_st.patch
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html