Remove an obsolete Alpha adjustment, and modify another, to go with the current Alpha architecture support.
Signed-off-by: Jay Estabrook jay.estabrook@gmail.com --- drivers/gpu/drm/drm_bufs.c | 3 --- drivers/gpu/drm/drm_vm.c | 2 +- 2 files changed, 1 insertion(+), 4 deletions(-)
diff -Naurp a/drivers/gpu/drm/drm_bufs.c b/drivers/gpu/drm/drm_bufs.c --- a/drivers/gpu/drm/drm_bufs.c 2011-04-26 23:48:50.000000000 -0400 +++ b/drivers/gpu/drm/drm_bufs.c 2011-05-02 11:51:48.000000000 -0400 @@ -183,9 +183,6 @@ static int drm_addmap_core(struct drm_de return -EINVAL; } #endif -#ifdef __alpha__ - map->offset += dev->hose->mem_space->start; -#endif /* Some drivers preinitialize some maps, without the X Server * needing to be aware of it. Therefore, we just return success * when the server tries to create a duplicate map. diff -Naurp a/drivers/gpu/drm/drm_vm.c b/drivers/gpu/drm/drm_vm.c --- a/drivers/gpu/drm/drm_vm.c 2011-04-26 23:48:50.000000000 -0400 +++ b/drivers/gpu/drm/drm_vm.c 2011-05-02 11:51:48.000000000 -0400 @@ -526,7 +526,7 @@ static int drm_mmap_dma(struct file *fil static resource_size_t drm_core_get_reg_ofs(struct drm_device *dev) { #ifdef __alpha__ - return dev->hose->dense_mem_base - dev->hose->mem_space->start; + return dev->hose->dense_mem_base; #else return 0; #endif
---