diff options
author | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-01-29 21:07:00 +0400 |
commit | 4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125 (patch) | |
tree | 888b52771f540552a9dc85521d8dddf66eba9aeb /tools/lib/lockdep/uinclude/linux/rbtree_augmented.h | |
parent | 9b3965f7401b0cc3ed2c228085a4c13b1c9243b1 (diff) | |
parent | f4bcd8ccddb02833340652e9f46f5127828eb79d (diff) | |
download | linux-4064e0ea3c0e9427e6c22392c4b69b4bfa1b7125.tar.xz |
Merge commit 'f4bcd8ccddb02833340652e9f46f5127828eb79d' into x86/build
Bring in upstream merge of x86/kaslr for future patches.
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'tools/lib/lockdep/uinclude/linux/rbtree_augmented.h')
-rw-r--r-- | tools/lib/lockdep/uinclude/linux/rbtree_augmented.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h b/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h new file mode 100644 index 000000000000..c3759477379c --- /dev/null +++ b/tools/lib/lockdep/uinclude/linux/rbtree_augmented.h @@ -0,0 +1,2 @@ +#define __always_inline +#include "../../../include/linux/rbtree_augmented.h" |