projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'drm-intel-fixes-2015-07-15' into drm-intel-next-queued
[firefly-linux-kernel-4.4.55.git]
/
drivers
/
char
/
agp
/
intel-gtt.c
diff --git
a/drivers/char/agp/intel-gtt.c
b/drivers/char/agp/intel-gtt.c
index c6dea3f6917bdcfc144fc70540cbbd26ea1918ee..1341a94cc7793aa0425eb83c4e446393be7f60c6 100644
(file)
--- a/
drivers/char/agp/intel-gtt.c
+++ b/
drivers/char/agp/intel-gtt.c
@@
-1408,8
+1408,8
@@
int intel_gmch_probe(struct pci_dev *bridge_pdev, struct pci_dev *gpu_pdev,
}
EXPORT_SYMBOL(intel_gmch_probe);
}
EXPORT_SYMBOL(intel_gmch_probe);
-void intel_gtt_get(
size_t
*gtt_total, size_t *stolen_size,
- phys_addr_t *mappable_base, u
nsigned long
*mappable_end)
+void intel_gtt_get(
u64
*gtt_total, size_t *stolen_size,
+ phys_addr_t *mappable_base, u
64
*mappable_end)
{
*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
*stolen_size = intel_private.stolen_size;
{
*gtt_total = intel_private.gtt_total_entries << PAGE_SHIFT;
*stolen_size = intel_private.stolen_size;