diff for duplicates of <20190107025236.GA1207@altlinux.org> diff --git a/a/1.txt b/N1/1.txt index f5f1891..8b13789 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,126 +1 @@ -From the very beginning and up to now asm-generic/syscall.h is used for -documentation purposes only, it could not be included by arch-specific -asm/syscall.h files due to static/non-static conflict of function -prototypes. -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: Oleg Nesterov <oleg@redhat.com> -Cc: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Elvira Khabirova <lineprinter@altlinux.org> -Cc: Eugene Syromyatnikov <esyr@redhat.com> -Cc: linux-arch@vger.kernel.org -Signed-off-by: Dmitry V. Levin <ldv@altlinux.org> ---- - -Notes: - v7: unchanged - v6: initial revision - - include/asm-generic/syscall.h | 39 +++++++++++++++++++++-------------- - 1 file changed, 24 insertions(+), 15 deletions(-) - -diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h -index 0c938a4354f6..9863a5f8fbe8 100644 ---- a/include/asm-generic/syscall.h -+++ b/include/asm-generic/syscall.h -@@ -16,8 +16,8 @@ - * cannot return to user mode while we are looking at it. - */ - --#ifndef _ASM_SYSCALL_H --#define _ASM_SYSCALL_H 1 -+#ifndef _ASM_GENERIC_SYSCALL_H -+#define _ASM_GENERIC_SYSCALL_H 1 - - struct task_struct; - struct pt_regs; -@@ -38,7 +38,8 @@ struct pt_regs; - * - * It's only valid to call this when @task is known to be blocked. - */ --int syscall_get_nr(struct task_struct *task, struct pt_regs *regs); -+static int -+syscall_get_nr(struct task_struct *task, struct pt_regs *regs); - - /** - * syscall_rollback - roll back registers after an aborted system call -@@ -56,7 +57,8 @@ int syscall_get_nr(struct task_struct *task, struct pt_regs *regs); - * system call instruction. This may not be the same as what the - * register state looked like at system call entry tracing. - */ --void syscall_rollback(struct task_struct *task, struct pt_regs *regs); -+static void -+syscall_rollback(struct task_struct *task, struct pt_regs *regs); - - /** - * syscall_get_error - check result of traced system call -@@ -68,7 +70,8 @@ void syscall_rollback(struct task_struct *task, struct pt_regs *regs); - * It's only valid to call this when @task is stopped for tracing on exit - * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. - */ --long syscall_get_error(struct task_struct *task, struct pt_regs *regs); -+static long -+syscall_get_error(struct task_struct *task, struct pt_regs *regs); - - /** - * syscall_get_return_value - get the return value of a traced system call -@@ -81,7 +84,8 @@ long syscall_get_error(struct task_struct *task, struct pt_regs *regs); - * It's only valid to call this when @task is stopped for tracing on exit - * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. - */ --long syscall_get_return_value(struct task_struct *task, struct pt_regs *regs); -+static long -+syscall_get_return_value(struct task_struct *task, struct pt_regs *regs); - - /** - * syscall_set_return_value - change the return value of a traced system call -@@ -98,8 +102,9 @@ long syscall_get_return_value(struct task_struct *task, struct pt_regs *regs); - * It's only valid to call this when @task is stopped for tracing on exit - * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT. - */ --void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs, -- int error, long val); -+static void -+syscall_set_return_value(struct task_struct *task, struct pt_regs *regs, -+ int error, long val); - - /** - * syscall_get_arguments - extract system call parameter values -@@ -118,8 +123,9 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs, - * It's invalid to call this with @i + @n > 6; we only support system calls - * taking up to 6 arguments. - */ --void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, -- unsigned int i, unsigned int n, unsigned long *args); -+static void -+syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, -+ unsigned int i, unsigned int n, unsigned long *args); - - /** - * syscall_set_arguments - change system call parameter value -@@ -138,9 +144,10 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs, - * It's invalid to call this with @i + @n > 6; we only support system calls - * taking up to 6 arguments. - */ --void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, -- unsigned int i, unsigned int n, -- const unsigned long *args); -+static void -+syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, -+ unsigned int i, unsigned int n, -+ const unsigned long *args); - - /** - * syscall_get_arch - return the AUDIT_ARCH for the current system call -@@ -153,5 +160,7 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs, - * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must - * provide an implementation of this. - */ --int syscall_get_arch(void); --#endif /* _ASM_SYSCALL_H */ -+static int -+syscall_get_arch(void); -+ -+#endif /* _ASM_GENERIC_SYSCALL_H */ --- -ldv diff --git a/a/content_digest b/N1/content_digest index e33ef3c..4545211 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -12,131 +12,5 @@ " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" - "From the very beginning and up to now asm-generic/syscall.h is used for\n" - "documentation purposes only, it could not be included by arch-specific\n" - "asm/syscall.h files due to static/non-static conflict of function\n" - "prototypes.\n" - "\n" - "Cc: Arnd Bergmann <arnd@arndb.de>\n" - "Cc: Oleg Nesterov <oleg@redhat.com>\n" - "Cc: Geert Uytterhoeven <geert@linux-m68k.org>\n" - "Cc: Elvira Khabirova <lineprinter@altlinux.org>\n" - "Cc: Eugene Syromyatnikov <esyr@redhat.com>\n" - "Cc: linux-arch@vger.kernel.org\n" - "Signed-off-by: Dmitry V. Levin <ldv@altlinux.org>\n" - "---\n" - "\n" - "Notes:\n" - " v7: unchanged\n" - " v6: initial revision\n" - "\n" - " include/asm-generic/syscall.h | 39 +++++++++++++++++++++--------------\n" - " 1 file changed, 24 insertions(+), 15 deletions(-)\n" - "\n" - "diff --git a/include/asm-generic/syscall.h b/include/asm-generic/syscall.h\n" - "index 0c938a4354f6..9863a5f8fbe8 100644\n" - "--- a/include/asm-generic/syscall.h\n" - "+++ b/include/asm-generic/syscall.h\n" - "@@ -16,8 +16,8 @@\n" - " * cannot return to user mode while we are looking at it.\n" - " */\n" - " \n" - "-#ifndef _ASM_SYSCALL_H\n" - "-#define _ASM_SYSCALL_H\t1\n" - "+#ifndef _ASM_GENERIC_SYSCALL_H\n" - "+#define _ASM_GENERIC_SYSCALL_H\t1\n" - " \n" - " struct task_struct;\n" - " struct pt_regs;\n" - "@@ -38,7 +38,8 @@ struct pt_regs;\n" - " *\n" - " * It's only valid to call this when @task is known to be blocked.\n" - " */\n" - "-int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);\n" - "+static int\n" - "+syscall_get_nr(struct task_struct *task, struct pt_regs *regs);\n" - " \n" - " /**\n" - " * syscall_rollback - roll back registers after an aborted system call\n" - "@@ -56,7 +57,8 @@ int syscall_get_nr(struct task_struct *task, struct pt_regs *regs);\n" - " * system call instruction. This may not be the same as what the\n" - " * register state looked like at system call entry tracing.\n" - " */\n" - "-void syscall_rollback(struct task_struct *task, struct pt_regs *regs);\n" - "+static void\n" - "+syscall_rollback(struct task_struct *task, struct pt_regs *regs);\n" - " \n" - " /**\n" - " * syscall_get_error - check result of traced system call\n" - "@@ -68,7 +70,8 @@ void syscall_rollback(struct task_struct *task, struct pt_regs *regs);\n" - " * It's only valid to call this when @task is stopped for tracing on exit\n" - " * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.\n" - " */\n" - "-long syscall_get_error(struct task_struct *task, struct pt_regs *regs);\n" - "+static long\n" - "+syscall_get_error(struct task_struct *task, struct pt_regs *regs);\n" - " \n" - " /**\n" - " * syscall_get_return_value - get the return value of a traced system call\n" - "@@ -81,7 +84,8 @@ long syscall_get_error(struct task_struct *task, struct pt_regs *regs);\n" - " * It's only valid to call this when @task is stopped for tracing on exit\n" - " * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.\n" - " */\n" - "-long syscall_get_return_value(struct task_struct *task, struct pt_regs *regs);\n" - "+static long\n" - "+syscall_get_return_value(struct task_struct *task, struct pt_regs *regs);\n" - " \n" - " /**\n" - " * syscall_set_return_value - change the return value of a traced system call\n" - "@@ -98,8 +102,9 @@ long syscall_get_return_value(struct task_struct *task, struct pt_regs *regs);\n" - " * It's only valid to call this when @task is stopped for tracing on exit\n" - " * from a system call, due to %TIF_SYSCALL_TRACE or %TIF_SYSCALL_AUDIT.\n" - " */\n" - "-void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,\n" - "-\t\t\t int error, long val);\n" - "+static void\n" - "+syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,\n" - "+\t\t\t int error, long val);\n" - " \n" - " /**\n" - " * syscall_get_arguments - extract system call parameter values\n" - "@@ -118,8 +123,9 @@ void syscall_set_return_value(struct task_struct *task, struct pt_regs *regs,\n" - " * It's invalid to call this with @i + @n > 6; we only support system calls\n" - " * taking up to 6 arguments.\n" - " */\n" - "-void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,\n" - "-\t\t\t unsigned int i, unsigned int n, unsigned long *args);\n" - "+static void\n" - "+syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,\n" - "+\t\t unsigned int i, unsigned int n, unsigned long *args);\n" - " \n" - " /**\n" - " * syscall_set_arguments - change system call parameter value\n" - "@@ -138,9 +144,10 @@ void syscall_get_arguments(struct task_struct *task, struct pt_regs *regs,\n" - " * It's invalid to call this with @i + @n > 6; we only support system calls\n" - " * taking up to 6 arguments.\n" - " */\n" - "-void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,\n" - "-\t\t\t unsigned int i, unsigned int n,\n" - "-\t\t\t const unsigned long *args);\n" - "+static void\n" - "+syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,\n" - "+\t\t unsigned int i, unsigned int n,\n" - "+\t\t const unsigned long *args);\n" - " \n" - " /**\n" - " * syscall_get_arch - return the AUDIT_ARCH for the current system call\n" - "@@ -153,5 +160,7 @@ void syscall_set_arguments(struct task_struct *task, struct pt_regs *regs,\n" - " * Architectures which permit CONFIG_HAVE_ARCH_SECCOMP_FILTER must\n" - " * provide an implementation of this.\n" - " */\n" - "-int syscall_get_arch(void);\n" - "-#endif\t/* _ASM_SYSCALL_H */\n" - "+static int\n" - "+syscall_get_arch(void);\n" - "+\n" - "+#endif\t/* _ASM_GENERIC_SYSCALL_H */\n" - "-- \n" - ldv -a3f3253fa591e1fa5e2f1e3e2c4b2aacfe2fe726f4097ea4c1320faf488c51e5 +8b1dc98e364dbd2712cbb584877ee0f023ea8f8449bb304d7724498157528687
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.