diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-24 02:41:07 -0500 |
| commit | 2ae79026818e7d49fead82b79b1a543e3b9c8a23 (patch) | |
| tree | c7ee7bd8b37b0880918d361839fd95988fac2dac /lib/interval_tree.c | |
| parent | 1a99367023f6ac664365a37fa508b059e31d0e88 (diff) | |
| parent | c517d838eb7d07bbe9507871fab3931deccff539 (diff) | |
Merge tag 'v4.0-rc1' into locking/core, to refresh the tree before merging new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/interval_tree.c')
| -rw-r--r-- | lib/interval_tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/interval_tree.c b/lib/interval_tree.c index f367f9ad544c..c85f6600a5f8 100644 --- a/lib/interval_tree.c +++ b/lib/interval_tree.c | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | #include <linux/init.h> | ||
| 2 | #include <linux/interval_tree.h> | 1 | #include <linux/interval_tree.h> |
| 3 | #include <linux/interval_tree_generic.h> | 2 | #include <linux/interval_tree_generic.h> |
| 4 | #include <linux/module.h> | 3 | #include <linux/compiler.h> |
| 4 | #include <linux/export.h> | ||
| 5 | 5 | ||
| 6 | #define START(node) ((node)->start) | 6 | #define START(node) ((node)->start) |
| 7 | #define LAST(node) ((node)->last) | 7 | #define LAST(node) ((node)->last) |