projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge drm/drm-next into drm-misc-next
[linux-2.6-block.git]
/
drivers
/
gpu
/
drm
/
bochs
/
bochs.h
diff --git
a/drivers/gpu/drm/bochs/bochs.h
b/drivers/gpu/drm/bochs/bochs.h
index 36f6ee725d132385d85136ca419004810f21c607..341cc9d1bab4e22d8dd3755fe32f4d9fd0ae8d97 100644
(file)
--- a/
drivers/gpu/drm/bochs/bochs.h
+++ b/
drivers/gpu/drm/bochs/bochs.h
@@
-100,8
+100,6
@@
static inline struct bochs_bo *gem_to_bochs_bo(struct drm_gem_object *gem)
return container_of(gem, struct bochs_bo, gem);
}
-#define DRM_FILE_PAGE_OFFSET (0x100000000ULL >> PAGE_SHIFT)
-
static inline u64 bochs_bo_mmap_offset(struct bochs_bo *bo)
{
return drm_vma_node_offset_addr(&bo->bo.vma_node);