git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mm: rename page trylock
[safe/jmp/linux-2.6]
/
mm
/
migrate.c
diff --git
a/mm/migrate.c
b/mm/migrate.c
index
153572f
..
2a80136
100644
(file)
--- a/
mm/migrate.c
+++ b/
mm/migrate.c
@@
-605,7
+605,7
@@
static int move_to_new_page(struct page *newpage, struct page *page)
* establishing additional references. We are the only one
* holding a reference to the new page at this point.
*/
* establishing additional references. We are the only one
* holding a reference to the new page at this point.
*/
- if (
TestSetPageLocked
(newpage))
+ if (
!trylock_page
(newpage))
BUG();
/* Prepare mapping for the new page.*/
BUG();
/* Prepare mapping for the new page.*/
@@
-667,7
+667,7
@@
static int unmap_and_move(new_page_t get_new_page, unsigned long private,
BUG_ON(charge);
rc = -EAGAIN;
BUG_ON(charge);
rc = -EAGAIN;
- if (
TestSetPageLocked
(page)) {
+ if (
!trylock_page
(page)) {
if (!force)
goto move_newpage;
lock_page(page);
if (!force)
goto move_newpage;
lock_page(page);