diff for duplicates of <20160209143554.GA9332@leverpostej> diff --git a/a/1.txt b/N1/1.txt index 8a4b34b..9d29c21 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -30,47 +30,3 @@ Arnd, Catalin, happy with the bloew fixup to the original patch? Mark. ---->8---- -From e53a0fa34689cca13846475fb5a7cb4c7da87384 Mon Sep 17 00:00:00 2001 -From: Mark Rutland <mark.rutland@arm.com> -Date: Tue, 9 Feb 2016 14:27:36 +0000 -Subject: [PATCH] asm-generic: Fix build when __set_fixmap is absent - -Commit ac4c0ac73485 ("asm-generic: make __set_fixmap_offset a static -inline") relied on the architecture code to define a __set_fixmap -function, even if unused. This broke the build for architectures which -do not implement __set_fixmap: - -../include/asm-generic/fixmap.h:Infunction'__set_fixmap_offset': -../include/asm-generic/fixmap.h:77:2:error:implicitdeclarationof -function'__set_fixmap'[-Werror=implicit-function-declaration] - -As we only require the prototype to be present, add this to -asm-generic/fixmap.h, preventing build failures on these architectures. - -Signed-off-by: Mark Rutland <mark.rutland@arm.com> -Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com> -Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org> -Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org> -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: Catalin Marinas <catalin.marinas@arm.com> -Cc: Jeremy Linton <jeremy.linton@arm.com> -Cc: Laura Abbott <labbott@fedoraproject.org> ---- - include/asm-generic/fixmap.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h -index f9c27b6..e5255ff 100644 ---- a/include/asm-generic/fixmap.h -+++ b/include/asm-generic/fixmap.h -@@ -69,6 +69,8 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) - __set_fixmap(idx, 0, FIXMAP_PAGE_CLEAR) - #endif - -+void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot); -+ - /* Return a pointer with offset calculated */ - static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx, - phys_addr_t phys, --- -1.9.1 diff --git a/a/content_digest b/N1/content_digest index 1e73012..f2aa628 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -49,50 +49,6 @@ "\n" "Mark.\n" "\n" - "---->8----\n" - "From e53a0fa34689cca13846475fb5a7cb4c7da87384 Mon Sep 17 00:00:00 2001\n" - "From: Mark Rutland <mark.rutland@arm.com>\n" - "Date: Tue, 9 Feb 2016 14:27:36 +0000\n" - "Subject: [PATCH] asm-generic: Fix build when __set_fixmap is absent\n" - "\n" - "Commit ac4c0ac73485 (\"asm-generic: make __set_fixmap_offset a static\n" - "inline\") relied on the architecture code to define a __set_fixmap\n" - "function, even if unused. This broke the build for architectures which\n" - "do not implement __set_fixmap:\n" - "\n" - "../include/asm-generic/fixmap.h:Infunction'__set_fixmap_offset':\n" - "../include/asm-generic/fixmap.h:77:2:error:implicitdeclarationof\n" - "function'__set_fixmap'[-Werror=implicit-function-declaration]\n" - "\n" - "As we only require the prototype to be present, add this to\n" - "asm-generic/fixmap.h, preventing build failures on these architectures.\n" - "\n" - "Signed-off-by: Mark Rutland <mark.rutland@arm.com>\n" - "Reported-by: Sudip Mukherjee <sudipm.mukherjee@gmail.com>\n" - "Suggested-by: Geert Uytterhoeven <geert@linux-m68k.org>\n" - "Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>\n" - "Cc: Arnd Bergmann <arnd@arndb.de>\n" - "Cc: Catalin Marinas <catalin.marinas@arm.com>\n" - "Cc: Jeremy Linton <jeremy.linton@arm.com>\n" - "Cc: Laura Abbott <labbott@fedoraproject.org>\n" - "---\n" - " include/asm-generic/fixmap.h | 2 ++\n" - " 1 file changed, 2 insertions(+)\n" - "\n" - "diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h\n" - "index f9c27b6..e5255ff 100644\n" - "--- a/include/asm-generic/fixmap.h\n" - "+++ b/include/asm-generic/fixmap.h\n" - "@@ -69,6 +69,8 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)\n" - " \t__set_fixmap(idx, 0, FIXMAP_PAGE_CLEAR)\n" - " #endif\n" - " \n" - "+void __set_fixmap(enum fixed_addresses idx, phys_addr_t phys, pgprot_t prot);\n" - "+\n" - " /* Return a pointer with offset calculated */\n" - " static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx,\n" - " \t\t\t\t\t\tphys_addr_t phys,\n" - "-- \n" - 1.9.1 + ---->8---- -af557511a31c699840d6f0be081c4cc4bee38e1ed2562c509478eea1a382e0a6 +cf5bd9587ef5bec21876286a5befa435c9e8d8549c3a67fdcde622886fa18084
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox