diff options
author | Mark Brown | 2017-09-19 15:12:47 +0200 |
---|---|---|
committer | Mark Brown | 2017-09-19 15:12:47 +0200 |
commit | e9331ee9b164d58b4dd0abc882ba7e23d2f404b3 (patch) | |
tree | 903d078e53a59ed65708193f2486ad0b9a8109d8 /tools/arch/parisc/include | |
parent | ASoC: rockchip: Add dapm route for HDMI (diff) | |
parent | Linux 4.14-rc1 (diff) | |
download | kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.tar.gz kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.tar.xz kernel-qcow2-linux-e9331ee9b164d58b4dd0abc882ba7e23d2f404b3.zip |
Merge tag 'v4.14-rc1' into asoc-rockchip
Linux 4.14-rc1
Diffstat (limited to 'tools/arch/parisc/include')
-rw-r--r-- | tools/arch/parisc/include/uapi/asm/mman.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/tools/arch/parisc/include/uapi/asm/mman.h b/tools/arch/parisc/include/uapi/asm/mman.h index 03d8d5b7ae7f..286c0bd74573 100644 --- a/tools/arch/parisc/include/uapi/asm/mman.h +++ b/tools/arch/parisc/include/uapi/asm/mman.h @@ -36,9 +36,7 @@ #define PROT_READ 0x1 #define PROT_SEM 0x8 #define PROT_WRITE 0x2 -/* MADV_HWPOISON is undefined on parisc, fix it for perf */ #define MADV_HWPOISON 100 -/* MADV_SOFT_OFFLINE is undefined on parisc, fix it for perf */ #define MADV_SOFT_OFFLINE 101 /* MAP_32BIT is undefined on parisc, fix it for perf */ #define MAP_32BIT 0 |