diff options
| author | Alex Shi <alex.shi@linaro.org> | 2016-12-05 12:01:22 +0800 |
|---|---|---|
| committer | Alex Shi <alex.shi@linaro.org> | 2016-12-05 12:01:22 +0800 |
| commit | 3ba1692e7239293d7bc5a596ca9b0707f5bc07d5 (patch) | |
| tree | e0a4ceba15a5ba39da4b3decc2e78a6754afc5ad /include/linux | |
| parent | 072c0f9ee4023f380774186c8cb95c0118d2f8dc (diff) | |
| parent | 87c6c6ef5b17bfed9226f1307435910626817ebb (diff) | |
Merge tag 'v4.4.36' into linux-linaro-lsk-v4.4
This is the 4.4.36 stable release
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/intel-iommu.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/intel-iommu.h b/include/linux/intel-iommu.h index 2d9b650047a5..d49e26c6cdc7 100644 --- a/include/linux/intel-iommu.h +++ b/include/linux/intel-iommu.h @@ -429,6 +429,7 @@ struct intel_iommu { struct page_req_dsc *prq; unsigned char prq_name[16]; /* Name for PRQ interrupt */ struct idr pasid_idr; + u32 pasid_max; #endif struct q_inval *qi; /* Queued invalidation info */ u32 *iommu_state; /* Store iommu states between suspend and resume.*/ |