diff options
author | Tejun Heo <tj@kernel.org> | 2014-12-12 16:55:35 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 12:42:47 -0800 |
commit | bd6dace78b9e4595d29892f806514518449c7489 (patch) | |
tree | 5ddeaccaf220668c85fbce6a1dfb679ad0fc80e3 /include/linux/mm_types.h | |
parent | 71fbd556adde2795787a6ca4c16871e57efba847 (diff) | |
download | linux-stable-bd6dace78b9e4595d29892f806514518449c7489.tar.gz linux-stable-bd6dace78b9e4595d29892f806514518449c7489.tar.bz2 linux-stable-bd6dace78b9e4595d29892f806514518449c7489.zip |
mm: move swp_entry_t definition to include/linux/mm_types.h
swp_entry_t being defined in include/linux/swap.h instead of
include/linux/mm_types.h causes cyclic include dependency later when
include/linux/page_cgroup.h is included from writeback path. Move the
definition to include/linux/mm_types.h.
While at it, reformat the comment above it.
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Mel Gorman <mel@csn.ul.ie>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'include/linux/mm_types.h')
-rw-r--r-- | include/linux/mm_types.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/include/linux/mm_types.h b/include/linux/mm_types.h index bf9f57529dcf..fc2daffa9db1 100644 --- a/include/linux/mm_types.h +++ b/include/linux/mm_types.h @@ -534,4 +534,12 @@ enum tlb_flush_reason { NR_TLB_FLUSH_REASONS, }; + /* + * A swap entry has to fit into a "unsigned long", as the entry is hidden + * in the "index" field of the swapper address space. + */ +typedef struct { + unsigned long val; +} swp_entry_t; + #endif /* _LINUX_MM_TYPES_H */ |