Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 5696
b: refs/heads/master
c: 9ae5b3c
h: refs/heads/master
v: v3
  • Loading branch information
Olaf Hering authored and Linus Torvalds committed Aug 7, 2005
1 parent a181f8a commit 7177071
Show file tree
Hide file tree
Showing 2 changed files with 3 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: 46bdac99382dd36e2d8c36cfb35d879b5c136965
refs/heads/master: 9ae5b3c703cce89a7d8ccf25fe16955ec6f016c0
3 changes: 2 additions & 1 deletion trunk/include/linux/swap.h
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#include <linux/mmzone.h>
#include <linux/list.h>
#include <linux/sched.h>
#include <linux/pagemap.h>

#include <asm/atomic.h>
#include <asm/page.h>
Expand Down Expand Up @@ -255,6 +254,8 @@ static inline void put_swap_token(struct mm_struct *mm)

#define si_swapinfo(val) \
do { (val)->freeswap = (val)->totalswap = 0; } while (0)
/* only sparc can not include linux/pagemap.h in this file
* so leave page_cache_release and release_pages undeclared... */
#define free_page_and_swap_cache(page) \
page_cache_release(page)
#define free_pages_and_swap_cache(pages, nr) \
Expand Down

0 comments on commit 7177071

Please sign in to comment.