diff options
| author | Linux Build Service Account <lnxbuild@localhost> | 2016-12-09 19:59:00 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-12-09 19:58:59 -0800 |
| commit | fc284a8972d84a617b2d92c45a6d2e154405616a (patch) | |
| tree | ff5ad9e5c8b0f07644e556b5faa5c4df7e31278b /drivers/iommu | |
| parent | 368fecd7df5b203a5ce684a0c77726a5690c1147 (diff) | |
| parent | 767cab94938f4b25fdb370f1c025ab8f32007cdd (diff) | |
Merge "iommu: iommu-debug: Allow full dma_addr_t sized address for atos"
Diffstat (limited to 'drivers/iommu')
| -rw-r--r-- | drivers/iommu/iommu-debug.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/iommu/iommu-debug.c b/drivers/iommu/iommu-debug.c index 7b0c1ae5a48d..a2b89c9d347a 100644 --- a/drivers/iommu/iommu-debug.c +++ b/drivers/iommu/iommu-debug.c @@ -454,13 +454,13 @@ static inline void iommu_debug_destroy_tracking(void) { } #ifdef CONFIG_64BIT #define kstrtoux kstrtou64 -#define kstrtox_from_user kstrtoll_from_user +#define kstrtox_from_user kstrtoull_from_user #define kstrtosize_t kstrtoul #else #define kstrtoux kstrtou32 -#define kstrtox_from_user kstrtoint_from_user +#define kstrtox_from_user kstrtouint_from_user #define kstrtosize_t kstrtouint #endif |