summaryrefslogtreecommitdiffstats
path: root/include/linux/swap.h
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2014-12-12 16:55:35 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2014-12-13 12:42:47 -0800
commitbd6dace78b9e4595d29892f806514518449c7489 (patch)
tree5ddeaccaf220668c85fbce6a1dfb679ad0fc80e3 /include/linux/swap.h
parent71fbd556adde2795787a6ca4c16871e57efba847 (diff)
downloadop-kernel-dev-bd6dace78b9e4595d29892f806514518449c7489.zip
op-kernel-dev-bd6dace78b9e4595d29892f806514518449c7489.tar.gz
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/swap.h')
-rw-r--r--include/linux/swap.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 37a585b..34e8b60 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -102,14 +102,6 @@ union swap_header {
} info;
};
- /* 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;
-
/*
* current->reclaim_state points to one of these when a task is running
* memory reclaim
OpenPOWER on IntegriCloud