diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:07:08 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2017-02-17 11:07:08 +1100 |
| commit | def0451540b29e2cac571d23f21339c1a3914625 (patch) | |
| tree | 66ea656ddeb6357ba18d99abda0ee3496312ba5e /drivers/char | |
| parent | ad7b78d2e5105e46c577ab24aa7d565bfdaaa611 (diff) | |
| parent | 13f62f54d174d3417c3caaafedf5e22a0a03e442 (diff) | |
Merge remote-tracking branch 'drm/drm-next'
Diffstat (limited to 'drivers/char')
| -rw-r--r-- | drivers/char/agp/intel-gtt.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/char/agp/intel-gtt.c b/drivers/char/agp/intel-gtt.c index 0f7d28a98b9a..9702c78f458d 100644 --- a/drivers/char/agp/intel-gtt.c +++ b/drivers/char/agp/intel-gtt.c @@ -1420,8 +1420,10 @@ int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev, } EXPORT_SYMBOL(intel_gmch_probe); -void intel_gtt_get(u64 *gtt_total, size_t *stolen_size, - phys_addr_t *mappable_base, u64 *mappable_end) +void intel_gtt_get(u64 *gtt_total, + u32 *stolen_size, + phys_addr_t *mappable_base, + u64 *mappable_end) { *gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT; *stolen_size = intel_private.stolen_size; |