diff for duplicates of <57C9587B.9080006@huawei.com> diff --git a/a/1.txt b/N1/1.txt index 891101e..2183ec9 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -65,90 +65,3 @@ Is it make sense to you? Regards Bamvor - -From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 -From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com> -Date: Sat, 27 Aug 2016 12:26:31 +0800 -Subject: [PATCH] arm64:ilp32: force sync_file_range2 - -Define __ARCH_WANT_SYNC_FILE_RANGE2 in order to select correct -sync_file_range parameters sequence in glibc and kernel. - -Tested-by: Jianguo Chen <chenjianguo3@huawei.com> -Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com> ---- - arch/arm64/include/uapi/asm/unistd.h | 5 +++++ - arch/arm64/kernel/sys_ilp32.c | 2 +- - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h -index 043d17a..78bea1d 100644 ---- a/arch/arm64/include/uapi/asm/unistd.h -+++ b/arch/arm64/include/uapi/asm/unistd.h -@@ -16,4 +16,9 @@ - - #define __ARCH_WANT_RENAMEAT - -+/* We need to make sure it works for both userspace and kernel(sys_ilp32.c) */ -+#if defined(__ILP32__) || defined(__SYSCALL_COMPAT) -+#define __ARCH_WANT_SYNC_FILE_RANGE2 -+#endif -+ - #include <asm-generic/unistd.h> -diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c -index 10fc0ca..13c9c9d 100644 ---- a/arch/arm64/kernel/sys_ilp32.c -+++ b/arch/arm64/kernel/sys_ilp32.c -@@ -42,7 +42,7 @@ - #define compat_sys_pwrite64 compat_sys_pwrite64_wrapper - #define compat_sys_readahead compat_sys_readahead_wrapper - #define compat_sys_shmat sys_shmat --#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper -+#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper - #define compat_sys_truncate64 compat_sys_truncate64_wrapper - #define sys_mmap2 compat_sys_mmap2_wrapper - #define sys_ptrace compat_sys_ptrace --- -1.8.4.5 - -> +#define sys_mmap2 compat_sys_mmap2_wrapper -> +#define sys_ptrace compat_sys_ptrace -> + -> +/* -> + * Use non-compat syscall handlers where rlimit, stat and statfs -> + * structure pointers are passed, as their layout is identical to LP64. -> + */ -> +#define compat_sys_fstatfs64 sys_fstatfs -> +#define compat_sys_statfs64 sys_statfs -> +#define sys_fstat64 sys_newfstat -> +#define sys_fstatat64 sys_newfstatat -> +#define compat_sys_getrlimit sys_getrlimit -> +#define compat_sys_setrlimit sys_setrlimit -> + -> +asmlinkage long compat_sys_fadvise64_64_wrapper(void); -> +asmlinkage long compat_sys_fallocate_wrapper(void); -> +asmlinkage long compat_sys_ftruncate64_wrapper(void); -> +asmlinkage long compat_sys_mmap2_wrapper(void); -> +asmlinkage long compat_sys_pread64_wrapper(void); -> +asmlinkage long compat_sys_pwrite64_wrapper(void); -> +asmlinkage long compat_sys_readahead_wrapper(void); -> +asmlinkage long compat_sys_sync_file_range2_wrapper(void); -> +asmlinkage long compat_sys_truncate64_wrapper(void); -> + -> +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void); -> +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper -> + -> +#include <asm/syscall.h> -> + -> +#undef __SYSCALL -> +#define __SYSCALL(nr, sym) [nr] = sym, -> + -> +/* -> + * The sys_call_ilp32_table array must be 4K aligned to be accessible from -> + * kernel/entry.S. -> + */ -> +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = { -> + [0 ... __NR_syscalls - 1] = sys_ni_syscall, -> +#include <asm/unistd.h> -> +}; -> diff --git a/a/content_digest b/N1/content_digest index 1c3bbd4..a1fb8b8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -36,7 +36,7 @@ Hanjun Guo <guohanjun@huawei.com> chenjianguo 00365834 <chenjianguo3@huawei.com> jijun 00321192 <jijun2@huawei.com> - " zhangjian 0029\0" + " zhangjian 00293696 <bamvor.zhangjian@huawei.com>\0" "\00:1\0" "b\0" "Hi, Yury\n" @@ -105,93 +105,6 @@ "\n" "Regards\n" "\n" - "Bamvor\n" - "\n" - "From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001\n" - "From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>\n" - "Date: Sat, 27 Aug 2016 12:26:31 +0800\n" - "Subject: [PATCH] arm64:ilp32: force sync_file_range2\n" - "\n" - "Define __ARCH_WANT_SYNC_FILE_RANGE2 in order to select correct\n" - "sync_file_range parameters sequence in glibc and kernel.\n" - "\n" - "Tested-by: Jianguo Chen <chenjianguo3@huawei.com>\n" - "Signed-off-by: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>\n" - "---\n" - " arch/arm64/include/uapi/asm/unistd.h | 5 +++++\n" - " arch/arm64/kernel/sys_ilp32.c | 2 +-\n" - " 2 files changed, 6 insertions(+), 1 deletion(-)\n" - "\n" - "diff --git a/arch/arm64/include/uapi/asm/unistd.h b/arch/arm64/include/uapi/asm/unistd.h\n" - "index 043d17a..78bea1d 100644\n" - "--- a/arch/arm64/include/uapi/asm/unistd.h\n" - "+++ b/arch/arm64/include/uapi/asm/unistd.h\n" - "@@ -16,4 +16,9 @@\n" - "\n" - " #define __ARCH_WANT_RENAMEAT\n" - "\n" - "+/* We need to make sure it works for both userspace and kernel(sys_ilp32.c) */\n" - "+#if defined(__ILP32__) || defined(__SYSCALL_COMPAT)\n" - "+#define __ARCH_WANT_SYNC_FILE_RANGE2\n" - "+#endif\n" - "+\n" - " #include <asm-generic/unistd.h>\n" - "diff --git a/arch/arm64/kernel/sys_ilp32.c b/arch/arm64/kernel/sys_ilp32.c\n" - "index 10fc0ca..13c9c9d 100644\n" - "--- a/arch/arm64/kernel/sys_ilp32.c\n" - "+++ b/arch/arm64/kernel/sys_ilp32.c\n" - "@@ -42,7 +42,7 @@\n" - " #define compat_sys_pwrite64 compat_sys_pwrite64_wrapper\n" - " #define compat_sys_readahead compat_sys_readahead_wrapper\n" - " #define compat_sys_shmat sys_shmat\n" - "-#define compat_sys_sync_file_range compat_sys_sync_file_range2_wrapper\n" - "+#define compat_sys_sync_file_range2 compat_sys_sync_file_range2_wrapper\n" - " #define compat_sys_truncate64 compat_sys_truncate64_wrapper\n" - " #define sys_mmap2 compat_sys_mmap2_wrapper\n" - " #define sys_ptrace compat_sys_ptrace\n" - "-- \n" - "1.8.4.5\n" - "\n" - "> +#define sys_mmap2\t\t\tcompat_sys_mmap2_wrapper\n" - "> +#define sys_ptrace\t\t\tcompat_sys_ptrace\n" - "> +\n" - "> +/*\n" - "> + * Use non-compat syscall handlers where rlimit, stat and statfs\n" - "> + * structure pointers are passed, as their layout is identical to LP64.\n" - "> + */\n" - "> +#define compat_sys_fstatfs64\t\tsys_fstatfs\n" - "> +#define compat_sys_statfs64\t\tsys_statfs\n" - "> +#define sys_fstat64\t\t\tsys_newfstat\n" - "> +#define sys_fstatat64\t\t\tsys_newfstatat\n" - "> +#define compat_sys_getrlimit\t\tsys_getrlimit\n" - "> +#define compat_sys_setrlimit\t\tsys_setrlimit\n" - "> +\n" - "> +asmlinkage long compat_sys_fadvise64_64_wrapper(void);\n" - "> +asmlinkage long compat_sys_fallocate_wrapper(void);\n" - "> +asmlinkage long compat_sys_ftruncate64_wrapper(void);\n" - "> +asmlinkage long compat_sys_mmap2_wrapper(void);\n" - "> +asmlinkage long compat_sys_pread64_wrapper(void);\n" - "> +asmlinkage long compat_sys_pwrite64_wrapper(void);\n" - "> +asmlinkage long compat_sys_readahead_wrapper(void);\n" - "> +asmlinkage long compat_sys_sync_file_range2_wrapper(void);\n" - "> +asmlinkage long compat_sys_truncate64_wrapper(void);\n" - "> +\n" - "> +asmlinkage long ilp32_sys_rt_sigreturn_wrapper(void);\n" - "> +#define compat_sys_rt_sigreturn ilp32_sys_rt_sigreturn_wrapper\n" - "> +\n" - "> +#include <asm/syscall.h>\n" - "> +\n" - "> +#undef __SYSCALL\n" - "> +#define __SYSCALL(nr, sym)\t[nr] = sym,\n" - "> +\n" - "> +/*\n" - "> + * The sys_call_ilp32_table array must be 4K aligned to be accessible from\n" - "> + * kernel/entry.S.\n" - "> + */\n" - "> +void *sys_call_ilp32_table[__NR_syscalls] __aligned(4096) = {\n" - "> +\t[0 ... __NR_syscalls - 1] = sys_ni_syscall,\n" - "> +#include <asm/unistd.h>\n" - "> +};\n" - > + Bamvor -491973a1a93e277760582a53b1db6878b22f7a1e072630b32db52c819cb54dde +99cbc5331e57b93fdfb2d13c89945b6a18a2435673275e98efeb8c6b16a2736c
diff --git a/a/1.txt b/N2/1.txt index 891101e..8f556b3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -66,7 +66,7 @@ Regards Bamvor -From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 +>From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com> Date: Sat, 27 Aug 2016 12:26:31 +0800 Subject: [PATCH] arm64:ilp32: force sync_file_range2 diff --git a/a/content_digest b/N2/content_digest index 1c3bbd4..eb9ff05 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,42 +1,9 @@ "ref\01471434403-25291-1-git-send-email-ynorov@caviumnetworks.com\0" "ref\01471434403-25291-13-git-send-email-ynorov@caviumnetworks.com\0" - "From\0Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>\0" - "Subject\0Re: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it\0" + "From\0bamvor.zhangjian@huawei.com (Bamvor Jian Zhang)\0" + "Subject\0[PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it\0" "Date\0Fri, 2 Sep 2016 18:46:19 +0800\0" - "To\0Yury Norov <ynorov@caviumnetworks.com>" - arnd@arndb.de - catalin.marinas@arm.com - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arch@vger.kernel.org - " libc-alpha@sourceware.org\0" - "Cc\0schwidefsky@de.ibm.com" - heiko.carstens@de.ibm.com - pinskia@gmail.com - broonie@kernel.org - joseph@codesourcery.com - christoph.muellner@theobroma-systems.com - szabolcs.nagy@arm.com - klimov.linux@gmail.com - Nathan_Lynch@mentor.com - agraf@suse.de - Prasun.Kapoor@caviumnetworks.com - kilobyte@angband.pl - geert@linux-m68k.org - philipp.tomsich@theobroma-systems.com - manuel.montezelo@gmail.com - linyongting@huawei.com - maxim.kuvyrkov@linaro.org - davem@davemloft.net - zhouchengming1@huawei.com - cmetcalf@ezchip.com - Andrew Pinski <apinski@cavium.com> - Andrew Pinski <Andrew.Pinski@caviumnetworks.com> - Hanjun Guo <guohanjun@huawei.com> - chenjianguo 00365834 <chenjianguo3@huawei.com> - jijun 00321192 <jijun2@huawei.com> - " zhangjian 0029\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi, Yury\n" @@ -107,7 +74,7 @@ "\n" "Bamvor\n" "\n" - "From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001\n" + ">From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001\n" "From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>\n" "Date: Sat, 27 Aug 2016 12:26:31 +0800\n" "Subject: [PATCH] arm64:ilp32: force sync_file_range2\n" @@ -194,4 +161,4 @@ "> +};\n" > -491973a1a93e277760582a53b1db6878b22f7a1e072630b32db52c819cb54dde +85611e89d679bd287d96b689d70b8662a6d2710c5598dac17690e6241e646ab7
diff --git a/a/1.txt b/N3/1.txt index 891101e..8f556b3 100644 --- a/a/1.txt +++ b/N3/1.txt @@ -66,7 +66,7 @@ Regards Bamvor -From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 +>From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001 From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com> Date: Sat, 27 Aug 2016 12:26:31 +0800 Subject: [PATCH] arm64:ilp32: force sync_file_range2 diff --git a/a/content_digest b/N3/content_digest index 1c3bbd4..a55f343 100644 --- a/a/content_digest +++ b/N3/content_digest @@ -4,39 +4,39 @@ "Subject\0Re: [PATCH 12/18] arm64: ilp32: add sys_ilp32.c and a separate table (in entry.S) to use it\0" "Date\0Fri, 2 Sep 2016 18:46:19 +0800\0" "To\0Yury Norov <ynorov@caviumnetworks.com>" - arnd@arndb.de - catalin.marinas@arm.com - linux-arm-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - linux-doc@vger.kernel.org - linux-arch@vger.kernel.org - " libc-alpha@sourceware.org\0" - "Cc\0schwidefsky@de.ibm.com" - heiko.carstens@de.ibm.com - pinskia@gmail.com - broonie@kernel.org - joseph@codesourcery.com - christoph.muellner@theobroma-systems.com - szabolcs.nagy@arm.com - klimov.linux@gmail.com - Nathan_Lynch@mentor.com - agraf@suse.de - Prasun.Kapoor@caviumnetworks.com - kilobyte@angband.pl - geert@linux-m68k.org - philipp.tomsich@theobroma-systems.com - manuel.montezelo@gmail.com - linyongting@huawei.com - maxim.kuvyrkov@linaro.org - davem@davemloft.net - zhouchengming1@huawei.com - cmetcalf@ezchip.com + <arnd@arndb.de> + <catalin.marinas@arm.com> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + <linux-doc@vger.kernel.org> + <linux-arch@vger.kernel.org> + " <libc-alpha@sourceware.org>\0" + "Cc\0<schwidefsky@de.ibm.com>" + <heiko.carstens@de.ibm.com> + <pinskia@gmail.com> + <broonie@kernel.org> + <joseph@codesourcery.com> + <christoph.muellner@theobroma-systems.com> + <szabolcs.nagy@arm.com> + <klimov.linux@gmail.com> + <Nathan_Lynch@mentor.com> + <agraf@suse.de> + <Prasun.Kapoor@caviumnetworks.com> + <kilobyte@angband.pl> + <geert@linux-m68k.org> + <philipp.tomsich@theobroma-systems.com> + <manuel.montezelo@gmail.com> + <linyongting@huawei.com> + <maxim.kuvyrkov@linaro.org> + <davem@davemloft.net> + <zhouchengming1@huawei.com> + <cmetcalf@ezchip.com> Andrew Pinski <apinski@cavium.com> Andrew Pinski <Andrew.Pinski@caviumnetworks.com> Hanjun Guo <guohanjun@huawei.com> chenjianguo 00365834 <chenjianguo3@huawei.com> jijun 00321192 <jijun2@huawei.com> - " zhangjian 0029\0" + " zhangjian 00293696 <bamvor.zhangjian@huawei.com>\0" "\00:1\0" "b\0" "Hi, Yury\n" @@ -107,7 +107,7 @@ "\n" "Bamvor\n" "\n" - "From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001\n" + ">From e730e4db23bca4dd0ff6bcca0bc4c04e5c13b5c7 Mon Sep 17 00:00:00 2001\n" "From: Bamvor Jian Zhang <bamvor.zhangjian@huawei.com>\n" "Date: Sat, 27 Aug 2016 12:26:31 +0800\n" "Subject: [PATCH] arm64:ilp32: force sync_file_range2\n" @@ -194,4 +194,4 @@ "> +};\n" > -491973a1a93e277760582a53b1db6878b22f7a1e072630b32db52c819cb54dde +71ea6095d502b456bb7a94d1fb02af6d3a408893a82aeed8d95ce3cc03b15279
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.