diff for duplicates of <20180326004017.GA2211@ZenIV.linux.org.uk> diff --git a/a/content_digest b/N1/content_digest index 0c19fc3..fa4064d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -29,7 +29,8 @@ David S . Miller <davem@davemloft.net> sparclinux@vger.kernel.org Ingo Molnar <mingo@redhat.com> - " Jiri Slaby <jslaby@suse.com>\0" + Jiri Slaby <jslaby@suse.com> + " the arch/x86 maintainers <x86@kernel.org>\0" "\00:1\0" "b\0" "On Thu, Mar 22, 2018 at 12:15:32AM +0000, Al Viro wrote:\n" @@ -433,4 +434,4 @@ "\tstatic inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))\n" #endif -79447ee1c836b8ea64d2f193aa13cc7305b91a2dfc73fe4e77d43463597b0e81 +37246c6e1d7aa591c38b0b94e4674198f4fdf01015142ff3b510d57c434e33be
diff --git a/a/1.txt b/N2/1.txt index c3b506b..171536d 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -128,11 +128,11 @@ welcome... // s390: double-slot can't occupy slots 4 and 5. -#define __SC_NEXT_ARG(p, next, big) next + (big && next == 4) +#define __SC_NEXT_ARG(p, next, big) next + (big && next = 4) // blackfin: double-slot can't occupy slots 2 and 3. -#define __SC_NEXT_ARG(p, next, big) next + (big && next == 2) +#define __SC_NEXT_ARG(p, next, big) next + (big && next = 2) // sh: this is really nasty. // Double-slot ones can't occupy slots 3 and 4; if slot 3 had been skipped due @@ -143,11 +143,11 @@ welcome... #define __SC_FIRST_ARG 0, __SC_S_ = 0 #define __SC_NEXT_ARG(p, next, big) \ - (big && next == 3) ? 4 : \ - (!big && next == __SC_S##p) ? 3 : \ + (big && next = 3) ? 4 : \ + (!big && next = __SC_S##p) ? 3 : \ (next < __SC_S##p) ? __SC_S##p : next, \ __SC_S_##p = \ - (big && next == 3) ? 6 : \ + (big && next = 3) ? 6 : \ (next != __SC_S##p) ? 0 : \ __SC_S##p + (big ? 2 : 0) #endif @@ -218,19 +218,19 @@ extern u32 __SC_32_ARG7(void) __compiletime_error("too many argument slots"); extern u64 __SC_64_ARG7(void) __compiletime_error("too many argument slots"); #define __SC_32ARG7 __SC_64_ARG7() #define __SC_64ARG7 __SC_32_ARG7() -#define __SC_W(s,n) (n == 0 ? __SC_##s##ARG1 : \ - n == 1 ? __SC_##s##ARG2 : \ - n == 2 ? __SC_##s##ARG3 : \ - n == 3 ? __SC_##s##ARG4 : \ - n == 4 ? __SC_##s##ARG5 : \ - n == 5 ? __SC_##s##ARG6 : \ +#define __SC_W(s,n) (n = 0 ? __SC_##s##ARG1 : \ + n = 1 ? __SC_##s##ARG2 : \ + n = 2 ? __SC_##s##ARG3 : \ + n = 3 ? __SC_##s##ARG4 : \ + n = 4 ? __SC_##s##ARG5 : \ + n = 5 ? __SC_##s##ARG6 : \ __SC_##s##ARG7) #define __SC_D(s,n) \ - (n == 0 ? combine_long_long(__SC_##s##ARG1,__SC_##s##ARG2) : \ - n == 1 ? combine_long_long(__SC_##s##ARG2,__SC_##s##ARG3) : \ - n == 2 ? combine_long_long(__SC_##s##ARG3,__SC_##s##ARG4) : \ - n == 3 ? combine_long_long(__SC_##s##ARG4,__SC_##s##ARG5) : \ - n == 4 ? combine_long_long(__SC_##s##ARG5,__SC_##s##ARG6) : \ + (n = 0 ? combine_long_long(__SC_##s##ARG1,__SC_##s##ARG2) : \ + n = 1 ? combine_long_long(__SC_##s##ARG2,__SC_##s##ARG3) : \ + n = 2 ? combine_long_long(__SC_##s##ARG3,__SC_##s##ARG4) : \ + n = 3 ? combine_long_long(__SC_##s##ARG4,__SC_##s##ARG5) : \ + n = 4 ? combine_long_long(__SC_##s##ARG5,__SC_##s##ARG6) : \ combine_long_long(__SC_##s##ARG6,__SC_##s##ARG7)) #define __SC_ARG32(p, t, a) \ (__force t)__builtin_choose_expr(__SC_BIG_##p, \ @@ -320,8 +320,8 @@ extern struct trace_event_functions exit_syscall_print_funcs; static inline int is_syscall_trace_event(struct trace_event_call *tp_event) { - return tp_event->class == &event_class_syscall_enter || - tp_event->class == &event_class_syscall_exit; + return tp_event->class = &event_class_syscall_enter || + tp_event->class = &event_class_syscall_exit; } #else diff --git a/a/content_digest b/N2/content_digest index 0c19fc3..567ebd1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -9,7 +9,7 @@ "ref\020180322001532.GA18399@ZenIV.linux.org.uk\0" "From\0Al Viro <viro@zeniv.linux.org.uk>\0" "Subject\0[RFC] new SYSCALL_DEFINE/COMPAT_SYSCALL_DEFINE wrappers\0" - "Date\0Mon, 26 Mar 2018 01:40:17 +0100\0" + "Date\0Mon, 26 Mar 2018 00:40:17 +0000\0" "To\0Ingo Molnar <mingo@kernel.org>\0" "Cc\0Linus Torvalds <torvalds@linux-foundation.org>" Dominik Brodowski <linux@dominikbrodowski.net> @@ -162,11 +162,11 @@ "\n" "// s390: double-slot can't occupy slots 4 and 5.\n" "\n" - "#define __SC_NEXT_ARG(p, next, big) next + (big && next == 4)\n" + "#define __SC_NEXT_ARG(p, next, big) next + (big && next = 4)\n" "\n" "// blackfin: double-slot can't occupy slots 2 and 3.\n" "\n" - "#define __SC_NEXT_ARG(p, next, big) next + (big && next == 2)\n" + "#define __SC_NEXT_ARG(p, next, big) next + (big && next = 2)\n" "\n" "// sh: this is really nasty.\n" "// Double-slot ones can't occupy slots 3 and 4; if slot 3 had been skipped due\n" @@ -177,11 +177,11 @@ "\n" "#define __SC_FIRST_ARG 0, __SC_S_ = 0\n" "#define __SC_NEXT_ARG(p, next, big) \\\n" - "\t\t(big && next == 3) ? 4 : \\\n" - "\t\t(!big && next == __SC_S##p) ? 3 : \\\n" + "\t\t(big && next = 3) ? 4 : \\\n" + "\t\t(!big && next = __SC_S##p) ? 3 : \\\n" "\t\t(next < __SC_S##p) ? __SC_S##p : next, \\\n" "\t__SC_S_##p = \\\n" - "\t\t(big && next == 3) ? 6 : \\\n" + "\t\t(big && next = 3) ? 6 : \\\n" " \t\t(next != __SC_S##p) ? 0 : \\\n" "\t\t__SC_S##p + (big ? 2 : 0)\n" "#endif\n" @@ -252,19 +252,19 @@ "extern u64 __SC_64_ARG7(void) __compiletime_error(\"too many argument slots\");\n" "#define __SC_32ARG7 __SC_64_ARG7()\n" "#define __SC_64ARG7 __SC_32_ARG7()\n" - "#define __SC_W(s,n) (n == 0 ? __SC_##s##ARG1 : \\\n" - "\t\t n == 1 ? __SC_##s##ARG2 : \\\n" - "\t\t n == 2 ? __SC_##s##ARG3 : \\\n" - "\t\t n == 3 ? __SC_##s##ARG4 : \\\n" - "\t\t n == 4 ? __SC_##s##ARG5 : \\\n" - "\t\t n == 5 ? __SC_##s##ARG6 : \\\n" + "#define __SC_W(s,n) (n = 0 ? __SC_##s##ARG1 : \\\n" + "\t\t n = 1 ? __SC_##s##ARG2 : \\\n" + "\t\t n = 2 ? __SC_##s##ARG3 : \\\n" + "\t\t n = 3 ? __SC_##s##ARG4 : \\\n" + "\t\t n = 4 ? __SC_##s##ARG5 : \\\n" + "\t\t n = 5 ? __SC_##s##ARG6 : \\\n" "\t\t __SC_##s##ARG7)\n" "#define __SC_D(s,n) \\\n" - "\t(n == 0 ? combine_long_long(__SC_##s##ARG1,__SC_##s##ARG2) : \\\n" - "\t n == 1 ? combine_long_long(__SC_##s##ARG2,__SC_##s##ARG3) : \\\n" - "\t n == 2 ? combine_long_long(__SC_##s##ARG3,__SC_##s##ARG4) : \\\n" - "\t n == 3 ? combine_long_long(__SC_##s##ARG4,__SC_##s##ARG5) : \\\n" - "\t n == 4 ? combine_long_long(__SC_##s##ARG5,__SC_##s##ARG6) : \\\n" + "\t(n = 0 ? combine_long_long(__SC_##s##ARG1,__SC_##s##ARG2) : \\\n" + "\t n = 1 ? combine_long_long(__SC_##s##ARG2,__SC_##s##ARG3) : \\\n" + "\t n = 2 ? combine_long_long(__SC_##s##ARG3,__SC_##s##ARG4) : \\\n" + "\t n = 3 ? combine_long_long(__SC_##s##ARG4,__SC_##s##ARG5) : \\\n" + "\t n = 4 ? combine_long_long(__SC_##s##ARG5,__SC_##s##ARG6) : \\\n" "\t combine_long_long(__SC_##s##ARG6,__SC_##s##ARG7))\n" "#define __SC_ARG32(p, t, a)\t\\\n" "\t(__force t)__builtin_choose_expr(__SC_BIG_##p, \\\n" @@ -354,8 +354,8 @@ "\n" "static inline int is_syscall_trace_event(struct trace_event_call *tp_event)\n" "{\n" - "\treturn tp_event->class == &event_class_syscall_enter ||\n" - "\t tp_event->class == &event_class_syscall_exit;\n" + "\treturn tp_event->class = &event_class_syscall_enter ||\n" + "\t tp_event->class = &event_class_syscall_exit;\n" "}\n" "\n" "#else\n" @@ -433,4 +433,4 @@ "\tstatic inline long C_SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__))\n" #endif -79447ee1c836b8ea64d2f193aa13cc7305b91a2dfc73fe4e77d43463597b0e81 +aff8c74c97f46130a9fa9d426fcc4c856c60a69030e08b9220a2f53693aecf50
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.