git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'x86-cleanups-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
[pandora-kernel.git]
/
drivers
/
gpu
/
drm
/
ttm
/
ttm_tt.c
diff --git
a/drivers/gpu/drm/ttm/ttm_tt.c
b/drivers/gpu/drm/ttm/ttm_tt.c
index
90e23e0
..
58c271e
100644
(file)
--- a/
drivers/gpu/drm/ttm/ttm_tt.c
+++ b/
drivers/gpu/drm/ttm/ttm_tt.c
@@
-31,6
+31,7
@@
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
#include <linux/sched.h>
#include <linux/highmem.h>
#include <linux/pagemap.h>
+#include <linux/shmem_fs.h>
#include <linux/file.h>
#include <linux/swap.h>
#include <linux/slab.h>
#include <linux/file.h>
#include <linux/swap.h>
#include <linux/slab.h>
@@
-484,7
+485,7
@@
static int ttm_tt_swapin(struct ttm_tt *ttm)
swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;
for (i = 0; i < ttm->num_pages; ++i) {
swap_space = swap_storage->f_path.dentry->d_inode->i_mapping;
for (i = 0; i < ttm->num_pages; ++i) {
- from_page =
read_mapping_page(swap_space, i, NULL
);
+ from_page =
shmem_read_mapping_page(swap_space, i
);
if (IS_ERR(from_page)) {
ret = PTR_ERR(from_page);
goto out_err;
if (IS_ERR(from_page)) {
ret = PTR_ERR(from_page);
goto out_err;
@@
-557,7
+558,7
@@
int ttm_tt_swapout(struct ttm_tt *ttm, struct file *persistent_swap_storage)
from_page = ttm->pages[i];
if (unlikely(from_page == NULL))
continue;
from_page = ttm->pages[i];
if (unlikely(from_page == NULL))
continue;
- to_page =
read_mapping_page(swap_space, i, NULL
);
+ to_page =
shmem_read_mapping_page(swap_space, i
);
if (unlikely(IS_ERR(to_page))) {
ret = PTR_ERR(to_page);
goto out_err;
if (unlikely(IS_ERR(to_page))) {
ret = PTR_ERR(to_page);
goto out_err;