diff for duplicates of <1471642875-5957-8-git-send-email-mcgrof@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 0fa90d6..a17ee4b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -166,8 +166,7 @@ index e425c5cd36d6..1fec5b81df31 100644 + :doc: Linker table provenance and userspace testing Benefits of using Linker tables - =============================== -diff --git a/MAINTAINERS b/MAINTAINERS + ===============diff --git a/MAINTAINERS b/MAINTAINERS index e3569ed12c86..bd57f5e6e480 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -660,7 +659,7 @@ index 000000000000..2ab57e2c4117 + * At least as per nasm (x86/x86_64 only), in the absence of qualifiers the + * defaults are as follows: + * -+ * section .text progbits alloc exec nowrite align=16 ++ * section .text progbits alloc exec nowrite align\x16 + * section .rodata progbits alloc noexec nowrite align=4 + * section .lrodata progbits alloc noexec nowrite align=4 + * section .data progbits alloc noexec write align=4 @@ -949,7 +948,7 @@ index 000000000000..f21c6ee88ded + * + * bool is_empty = LINUX_SECTION_EMPTY(frobnicator_fns); + */ -+#define LINUX_SECTION_EMPTY(name) (LINUX_SECTION_SIZE(name) == 0) ++#define LINUX_SECTION_EMPTY(name) (LINUX_SECTION_SIZE(name) = 0) + +/** + * LINUX_SECTION_START - get address of start of section @@ -1736,8 +1735,7 @@ index 000000000000..9d4e6fb0d176 +include $(srctree)/tools/build/Makefile.include + +ifeq ($(V),1) -+ Q= -+ NQ=@true ++ Q+ NQ=@true +else + Q=@ + NQ=@echo @@ -1891,7 +1889,7 @@ index 000000000000..729241f9e4c4 +++ b/tools/linker-tables/README @@ -0,0 +1,114 @@ +Linux linker table userspace sandbox -+==================================== ++================== + +This is a userspace sandbox to allow easy experimentation and +test extensions with linker tables. It tries to mimic the Linux @@ -1906,8 +1904,7 @@ index 000000000000..729241f9e4c4 +application. + +History -+======= -+ ++===+ +This was hacked on first in an external repository, that tree has +the full set of history of how this work came about. Refer to that +tree for more details if you are interested in the logic used for @@ -1919,8 +1916,7 @@ index 000000000000..729241f9e4c4 +is kept in sync with the kernel. + +Compile -+======= -+ ++===+ +Run: + make + @@ -1933,8 +1929,7 @@ index 000000000000..729241f9e4c4 + make OUTPUT=/tmp/path/ clean + +Supported architectures -+======================= -+ ++===========+ +x86_64 + +Currently only x86_64 is supported for the demo. It should be @@ -1949,8 +1944,7 @@ index 000000000000..729241f9e4c4 +file over. + +x86 Simulated boots -+=================== -+ ++=========+ +This programs simulates boot on both bare metal and with the +Xen PV entry on x86. + @@ -1963,7 +1957,7 @@ index 000000000000..729241f9e4c4 +./demo -x + +Testing new features -+==================== ++========== + +A copy of each kernel header file is maintained in tools/include/, +as well as a respective generated asm file for each sandbox supported @@ -1982,8 +1976,7 @@ index 000000000000..729241f9e4c4 +each respective tools/linker-tables/arch/$(ARCH)/include/asm/. + +Features evaluation -+=================== -+ ++=========+ +This lists features currently being evaluated in the sandbox, not yet +present upstream. These make use of the existing set of header files +without modification. @@ -2563,15 +2556,15 @@ index 000000000000..1d5a74bec754 +{ + if (SECTION_ADDR_IN_RANGE(kprobes, addr)) + if (should_match) -+ pr_info("== OK: %s within range!\n", test); ++ pr_info("= OK: %s within range!\n", test); + else -+ pr_info("== FAIL: %s should not be in range...\n", ++ pr_info("= FAIL: %s should not be in range...\n", + test); + else + if (should_match) -+ pr_info("== FAIL: %s should be in range...\n", test); ++ pr_info("= FAIL: %s should be in range...\n", test); + else -+ pr_info("== OK: %s not in range as expected!\n", test); ++ pr_info("= OK: %s not in range as expected!\n", test); +} + +void early_init_kprobes(void) diff --git a/a/content_digest b/N1/content_digest index 7faa2c5..c86b47b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\01471642875-5957-1-git-send-email-mcgrof@kernel.org\0" "From\0mcgrof@kernel.org\0" "Subject\0[PATCH v1 7/7] tools: add userspace linker table sandbox\0" - "Date\0Fri, 19 Aug 2016 14:41:15 -0700\0" + "Date\0Fri, 19 Aug 2016 21:41:15 +0000\0" "To\0acme@redhat.com" hpa@zytor.com tglx@linutronix.de @@ -222,8 +222,7 @@ "+ :doc: Linker table provenance and userspace testing\n" " \n" " Benefits of using Linker tables\n" - " ===============================\n" - "diff --git a/MAINTAINERS b/MAINTAINERS\n" + " ===============diff --git a/MAINTAINERS b/MAINTAINERS\n" "index e3569ed12c86..bd57f5e6e480 100644\n" "--- a/MAINTAINERS\n" "+++ b/MAINTAINERS\n" @@ -716,7 +715,7 @@ "+ * At least as per nasm (x86/x86_64 only), in the absence of qualifiers the\n" "+ * defaults are as follows:\n" "+ *\n" - "+ * section .text progbits alloc exec nowrite align=16\n" + "+ * section .text progbits alloc exec nowrite align\026\n" "+ * section .rodata progbits alloc noexec nowrite align=4\n" "+ * section .lrodata progbits alloc noexec nowrite align=4\n" "+ * section .data progbits alloc noexec write align=4\n" @@ -1005,7 +1004,7 @@ "+ *\n" "+ * bool is_empty = LINUX_SECTION_EMPTY(frobnicator_fns);\n" "+ */\n" - "+#define LINUX_SECTION_EMPTY(name)\t(LINUX_SECTION_SIZE(name) == 0)\n" + "+#define LINUX_SECTION_EMPTY(name)\t(LINUX_SECTION_SIZE(name) = 0)\n" "+\n" "+/**\n" "+ * LINUX_SECTION_START - get address of start of section\n" @@ -1792,8 +1791,7 @@ "+include $(srctree)/tools/build/Makefile.include\n" "+\n" "+ifeq ($(V),1)\n" - "+\tQ=\n" - "+\tNQ=@true\n" + "+\tQ+\tNQ=@true\n" "+else\n" "+\tQ=@\n" "+\tNQ=@echo\n" @@ -1947,7 +1945,7 @@ "+++ b/tools/linker-tables/README\n" "@@ -0,0 +1,114 @@\n" "+Linux linker table userspace sandbox\n" - "+====================================\n" + "+==================\n" "+\n" "+This is a userspace sandbox to allow easy experimentation and\n" "+test extensions with linker tables. It tries to mimic the Linux\n" @@ -1962,8 +1960,7 @@ "+application.\n" "+\n" "+History\n" - "+=======\n" - "+\n" + "+===+\n" "+This was hacked on first in an external repository, that tree has\n" "+the full set of history of how this work came about. Refer to that\n" "+tree for more details if you are interested in the logic used for\n" @@ -1975,8 +1972,7 @@ "+is kept in sync with the kernel.\n" "+\n" "+Compile\n" - "+=======\n" - "+\n" + "+===+\n" "+Run:\n" "+\tmake\n" "+\n" @@ -1989,8 +1985,7 @@ "+\tmake OUTPUT=/tmp/path/ clean\n" "+\n" "+Supported architectures\n" - "+=======================\n" - "+\n" + "+===========+\n" "+x86_64\n" "+\n" "+Currently only x86_64 is supported for the demo. It should be\n" @@ -2005,8 +2000,7 @@ "+file over.\n" "+\n" "+x86 Simulated boots\n" - "+===================\n" - "+\n" + "+=========+\n" "+This programs simulates boot on both bare metal and with the\n" "+Xen PV entry on x86.\n" "+\n" @@ -2019,7 +2013,7 @@ "+./demo -x\n" "+\n" "+Testing new features\n" - "+====================\n" + "+==========\n" "+\n" "+A copy of each kernel header file is maintained in tools/include/,\n" "+as well as a respective generated asm file for each sandbox supported\n" @@ -2038,8 +2032,7 @@ "+each respective tools/linker-tables/arch/$(ARCH)/include/asm/.\n" "+\n" "+Features evaluation\n" - "+===================\n" - "+\n" + "+=========+\n" "+This lists features currently being evaluated in the sandbox, not yet\n" "+present upstream. These make use of the existing set of header files\n" "+without modification.\n" @@ -2619,15 +2612,15 @@ "+{\n" "+\tif (SECTION_ADDR_IN_RANGE(kprobes, addr))\n" "+\t\tif (should_match)\n" - "+\t\t\tpr_info(\"== OK: %s within range!\\n\", test);\n" + "+\t\t\tpr_info(\"= OK: %s within range!\\n\", test);\n" "+\t\telse\n" - "+\t\t\tpr_info(\"== FAIL: %s should not be in range...\\n\",\n" + "+\t\t\tpr_info(\"= FAIL: %s should not be in range...\\n\",\n" "+\t\t\t\ttest);\n" "+\telse\n" "+\t\tif (should_match)\n" - "+\t\t\tpr_info(\"== FAIL: %s should be in range...\\n\", test);\n" + "+\t\t\tpr_info(\"= FAIL: %s should be in range...\\n\", test);\n" "+\t\telse\n" - "+\t\t\tpr_info(\"== OK: %s not in range as expected!\\n\", test);\n" + "+\t\t\tpr_info(\"= OK: %s not in range as expected!\\n\", test);\n" "+}\n" "+\n" "+void early_init_kprobes(void)\n" @@ -3818,4 +3811,4 @@ "-- \n" 2.9.2 -e586baa207f9c9089b585a715a6f1290c055e2193b5ed2ced957c2e005381612 +5b2c6635b66069bea358717c502da39cfc38e48b5cbff99b1ca068c5069b0bc9
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.