diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-05-05 19:37:51 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-05-05 19:37:51 +0200 |
| commit | 3e46d21285577a8c9e4c37f9b1002e567c440b28 (patch) | |
| tree | 9a49847d06c707aa0b441bc88babe76ede3c0de1 /tools/virtio/linux/kernel.h | |
| parent | 3617660e4e1618a888a2e3a4067224534302cb33 (diff) | |
| parent | 73a31b7c6a85e2f033524058bad5bce900e4f2ed (diff) | |
Merge tag 'perf-core-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/jolsa/perf into perf/core
Pull perf/core improvements and fixes from Jiri Olsa:
* Cleanups for perf.h header (Jiri Olsa)
* Consolidate types.h and export.h within tools (Borislav Petkov)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/virtio/linux/kernel.h')
| -rw-r--r-- | tools/virtio/linux/kernel.h | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/tools/virtio/linux/kernel.h b/tools/virtio/linux/kernel.h index fba705963968..1e8ce6979c1e 100644 --- a/tools/virtio/linux/kernel.h +++ b/tools/virtio/linux/kernel.h @@ -38,13 +38,6 @@ struct page { #define __printf(a,b) __attribute__((format(printf,a,b))) -typedef enum { - GFP_KERNEL, - GFP_ATOMIC, - __GFP_HIGHMEM, - __GFP_HIGH -} gfp_t; - #define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0])) extern void *__kmalloc_fake, *__kfree_ignore_start, *__kfree_ignore_end; |