diff options
| author | Steven Rostedt (Red Hat) <rostedt@goodmis.org> | 2014-10-28 16:38:11 -0400 |
|---|---|---|
| committer | Steven Rostedt <rostedt@goodmis.org> | 2014-10-28 16:38:11 -0400 |
| commit | c1a3bd301a943469f9b575edb26e195a9c987390 (patch) | |
| tree | 83ce790eb3ffc8e73a45c9966317fbe09cfa7947 /include/linux/swapfile.h | |
| parent | 77014e82b50da13ab801c9cfeb5cb8c29881cc9c (diff) | |
| parent | b0807bc10a6ac95ab8bf3bbf57703a0f2edd9aa9 (diff) | |
| download | linux-rt-c1a3bd301a943469f9b575edb26e195a9c987390.tar.gz | |
Merge tag 'v3.12.30' into v3.12-rt
This is the 3.12.30 stable release
Conflicts:
fs/exec.c
include/linux/radix-tree.h
mm/filemap.c
mm/page_alloc.c
Diffstat (limited to 'include/linux/swapfile.h')
| -rw-r--r-- | include/linux/swapfile.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swapfile.h b/include/linux/swapfile.h index e282624e8c10..388293a91e8c 100644 --- a/include/linux/swapfile.h +++ b/include/linux/swapfile.h @@ -6,7 +6,7 @@ * want to expose them to the dozens of source files that include swap.h */ extern spinlock_t swap_lock; -extern struct swap_list_t swap_list; +extern struct plist_head swap_active_head; extern struct swap_info_struct *swap_info[]; extern int try_to_unuse(unsigned int, bool, unsigned long); |