diff for duplicates of <20161017100130.GA16013@angband.pl> diff --git a/a/1.txt b/N1/1.txt index eb1a711..3bc4573 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -39,58 +39,3 @@ Note that powerpc already has an include/asm/asm-prototypes.h which might or might not be what you want. It doesn't have memset and co, for example. Anyway, here's my stab at x86: - - -From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001 -From: Adam Borowski <kilobyte@angband.pl> -Date: Mon, 17 Oct 2016 11:42:35 +0200 -Subject: [PATCH] kbuild: provide include/asm/asm-prototypes.h for x86 - -Nicholas Piggin wrote: -> Architectures will need to have an include/asm/asm-prototypes.h that -> defines or #include<>s C-style prototypes for exported asm functions. -> We can do an asm-generic version for the common ones like memset so -> there's not a lot of pointless duplication there. - -Signed-off-by: Adam Borowski <kilobyte@angband.pl> ---- - arch/x86/include/asm/asm-prototypes.h | 13 +++++++++++++ - include/asm-generic/asm-prototypes.h | 7 +++++++ - 2 files changed, 20 insertions(+) - create mode 100644 arch/x86/include/asm/asm-prototypes.h - create mode 100644 include/asm-generic/asm-prototypes.h - -diff --git a/arch/x86/include/asm/asm-prototypes.h b/arch/x86/include/asm/asm-prototypes.h -new file mode 100644 -index 0000000..072c97c ---- /dev/null -+++ b/arch/x86/include/asm/asm-prototypes.h -@@ -0,0 +1,13 @@ -+#include <asm/ftrace.h> -+#include <asm/uaccess.h> -+#include <asm/uaccess.h> -+#include <asm/string.h> -+#include <asm/page.h> -+#include <asm/checksum.h> -+ -+#include <asm-generic/asm-prototypes.h> -+ -+#include <asm/page.h> -+#include <asm/pgtable.h> -+#include <asm/special_insns.h> -+#include <asm/preempt.h> -diff --git a/include/asm-generic/asm-prototypes.h b/include/asm-generic/asm-prototypes.h -new file mode 100644 -index 0000000..df13637 ---- /dev/null -+++ b/include/asm-generic/asm-prototypes.h -@@ -0,0 +1,7 @@ -+#include <linux/bitops.h> -+extern void *__memset(void *, int, __kernel_size_t); -+extern void *__memcpy(void *, const void *, __kernel_size_t); -+extern void *__memmove(void *, const void *, __kernel_size_t); -+extern void *memset(void *, int, __kernel_size_t); -+extern void *memcpy(void *, const void *, __kernel_size_t); -+extern void *memmove(void *, const void *, __kernel_size_t); --- -2.9.3 diff --git a/a/content_digest b/N1/content_digest index eb531b2..008456c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -55,61 +55,6 @@ "Note that powerpc already has an include/asm/asm-prototypes.h which might or\n" "might not be what you want. It doesn't have memset and co, for example.\n" "\n" - "Anyway, here's my stab at x86:\n" - "\n" - "\n" - "From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001\n" - "From: Adam Borowski <kilobyte@angband.pl>\n" - "Date: Mon, 17 Oct 2016 11:42:35 +0200\n" - "Subject: [PATCH] kbuild: provide include/asm/asm-prototypes.h for x86\n" - "\n" - "Nicholas Piggin wrote:\n" - "> Architectures will need to have an include/asm/asm-prototypes.h that\n" - "> defines or #include<>s C-style prototypes for exported asm functions.\n" - "> We can do an asm-generic version for the common ones like memset so\n" - "> there's not a lot of pointless duplication there.\n" - "\n" - "Signed-off-by: Adam Borowski <kilobyte@angband.pl>\n" - "---\n" - " arch/x86/include/asm/asm-prototypes.h | 13 +++++++++++++\n" - " include/asm-generic/asm-prototypes.h | 7 +++++++\n" - " 2 files changed, 20 insertions(+)\n" - " create mode 100644 arch/x86/include/asm/asm-prototypes.h\n" - " create mode 100644 include/asm-generic/asm-prototypes.h\n" - "\n" - "diff --git a/arch/x86/include/asm/asm-prototypes.h b/arch/x86/include/asm/asm-prototypes.h\n" - "new file mode 100644\n" - "index 0000000..072c97c\n" - "--- /dev/null\n" - "+++ b/arch/x86/include/asm/asm-prototypes.h\n" - "@@ -0,0 +1,13 @@\n" - "+#include <asm/ftrace.h>\n" - "+#include <asm/uaccess.h>\n" - "+#include <asm/uaccess.h>\n" - "+#include <asm/string.h>\n" - "+#include <asm/page.h>\n" - "+#include <asm/checksum.h>\n" - "+\n" - "+#include <asm-generic/asm-prototypes.h>\n" - "+\n" - "+#include <asm/page.h>\n" - "+#include <asm/pgtable.h>\n" - "+#include <asm/special_insns.h>\n" - "+#include <asm/preempt.h>\n" - "diff --git a/include/asm-generic/asm-prototypes.h b/include/asm-generic/asm-prototypes.h\n" - "new file mode 100644\n" - "index 0000000..df13637\n" - "--- /dev/null\n" - "+++ b/include/asm-generic/asm-prototypes.h\n" - "@@ -0,0 +1,7 @@\n" - "+#include <linux/bitops.h>\n" - "+extern void *__memset(void *, int, __kernel_size_t);\n" - "+extern void *__memcpy(void *, const void *, __kernel_size_t);\n" - "+extern void *__memmove(void *, const void *, __kernel_size_t);\n" - "+extern void *memset(void *, int, __kernel_size_t);\n" - "+extern void *memcpy(void *, const void *, __kernel_size_t);\n" - "+extern void *memmove(void *, const void *, __kernel_size_t);\n" - "-- \n" - 2.9.3 + Anyway, here's my stab at x86: -ab7c129e352395bca22e85322fdccb74fbd4ae53345b958ecf6b64fd2907298b +73a0953dd7de6726b9046f59b7a22e3ec9c109bb8ad0e15f74f27fdc6c65fa18
diff --git a/a/1.txt b/N2/1.txt index eb1a711..8a6eaf3 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -41,7 +41,7 @@ might not be what you want. It doesn't have memset and co, for example. Anyway, here's my stab at x86: -From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001 +>From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001 From: Adam Borowski <kilobyte@angband.pl> Date: Mon, 17 Oct 2016 11:42:35 +0200 Subject: [PATCH] kbuild: provide include/asm/asm-prototypes.h for x86 diff --git a/a/content_digest b/N2/content_digest index eb531b2..e85639b 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -58,7 +58,7 @@ "Anyway, here's my stab at x86:\n" "\n" "\n" - "From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001\n" + ">From db746df65b920591606398b4b244f5b6dc9eea04 Mon Sep 17 00:00:00 2001\n" "From: Adam Borowski <kilobyte@angband.pl>\n" "Date: Mon, 17 Oct 2016 11:42:35 +0200\n" "Subject: [PATCH] kbuild: provide include/asm/asm-prototypes.h for x86\n" @@ -112,4 +112,4 @@ "-- \n" 2.9.3 -ab7c129e352395bca22e85322fdccb74fbd4ae53345b958ecf6b64fd2907298b +c59392fe68d1c3529fa0df652cc641acff8e00b675ca13afa8dc84282099176a
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.