Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 252735
b: refs/heads/master
c: 826267c
h: refs/heads/master
i:
  252733: dcde8d4
  252731: f25320b
  252727: 5520874
  252719: 1f1ec06
  252703: e73eab9
  252671: 313509f
v: v3
  • Loading branch information
Hugh Dickins authored and Linus Torvalds committed May 28, 2011
1 parent d3837e7 commit c729702
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 36947a76826111e661a26cb0f668a5be6cc3ddb4
refs/heads/master: 826267cf1e6c6899eda1325a19f1b1d15c558b20
2 changes: 1 addition & 1 deletion trunk/mm/shmem.c
Original file line number Diff line number Diff line change
Expand Up @@ -1114,8 +1114,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc)
delete_from_page_cache(page);
shmem_swp_set(info, entry, swap.val);
shmem_swp_unmap(entry);
spin_unlock(&info->lock);
swap_shmem_alloc(swap);
spin_unlock(&info->lock);
BUG_ON(page_mapped(page));
swap_writepage(page, wbc);
return 0;
Expand Down

0 comments on commit c729702

Please sign in to comment.