diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-01 22:20:11 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-10-01 22:20:11 -0400 |
| commit | bde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957 (patch) | |
| tree | d4597bfde4f5d4a3a5729e5534c44993c6216352 /include/uapi/linux/userfaultfd.h | |
| parent | Merge tag 'pm+acpi-4.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm (diff) | |
| parent | dmapool: fix overflow condition in pool_find_page() (diff) | |
| download | linux-dev-bde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957.tar.xz linux-dev-bde17b90dd9712cb61a7ab0c1ccd0f7f6aa57957.zip | |
Merge branch 'akpm' (patches from Andrew)
Merge misc fixes from Andrew Morton:
"12 fixes"
* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
dmapool: fix overflow condition in pool_find_page()
thermal: avoid division by zero in power allocator
memcg: remove pcp_counter_lock
kprobes: use _do_fork() in samples to make them work again
drivers/input/joystick/Kconfig: zhenhua.c needs BITREVERSE
memcg: make mem_cgroup_read_stat() unsigned
memcg: fix dirty page migration
dax: fix NULL pointer in __dax_pmd_fault()
mm: hugetlbfs: skip shared VMAs when unmapping private pages to satisfy a fault
mm/slab: fix unexpected index mapping result of kmalloc_size(INDEX_NODE+1)
userfaultfd: remove kernel header include from uapi header
arch/x86/include/asm/efi.h: fix build failure
Diffstat (limited to 'include/uapi/linux/userfaultfd.h')
| -rw-r--r-- | include/uapi/linux/userfaultfd.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/uapi/linux/userfaultfd.h b/include/uapi/linux/userfaultfd.h index df0e09bb7dd5..9057d7af3ae1 100644 --- a/include/uapi/linux/userfaultfd.h +++ b/include/uapi/linux/userfaultfd.h @@ -11,8 +11,6 @@ #include <linux/types.h> -#include <linux/compiler.h> - #define UFFD_API ((__u64)0xAA) /* * After implementing the respective features it will become: |