diff for duplicates of <20160209172125.GA4348@leverpostej> diff --git a/a/1.txt b/N1/1.txt index 39b8095..6cd8dc1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -46,52 +46,3 @@ happy with the below patch? Mark. ---->8---- -From 6d283603d18071690dc138e4a0591a445a1d1e30 Mon Sep 17 00:00:00 2001 -From: Mark Rutland <mark.rutland@arm.com> -Date: Tue, 9 Feb 2016 17:08:26 +0000 -Subject: [PATCH] asm-generic: make __set_fixmap_offset a macro again - -Turning __set_fixmap_offset into a static inline breaks the build for -several architectures. Fixing this properly requires updates to a number -of architectures to make them agree on the prototype of __set_fixmap. - -For the timebeing, restore __set_fixmap_offset to its prior state as a -macro function, reverting commit ac4c0ac73485867c ("asm-generic: make -__set_fixmap_offset a static inline"). To avoid the original issue with -namespace clashes, 'addr' is prefixed with a liberal sprinking of -underscores. - -Signed-off-by: Mark Rutland <mark.rutland@arm.com> -Cc: Arnd Bergmann <arnd@arndb.de> -Cc: Catalin Marinas <catalin.marinas@arm.com> ---- - include/asm-generic/fixmap.h | 14 +++++++------- - 1 file changed, 7 insertions(+), 7 deletions(-) - -diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h -index f9c27b6..827e4d3 100644 ---- a/include/asm-generic/fixmap.h -+++ b/include/asm-generic/fixmap.h -@@ -70,13 +70,13 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr) - #endif - - /* Return a pointer with offset calculated */ --static inline unsigned long __set_fixmap_offset(enum fixed_addresses idx, -- phys_addr_t phys, -- pgprot_t flags) --{ -- __set_fixmap(idx, phys, flags); -- return fix_to_virt(idx) + (phys & (PAGE_SIZE - 1)); --} -+#define __set_fixmap_offset(idx, phys, flags) \ -+({ \ -+ unsigned long ________addr; \ -+ __set_fixmap(idx, phys, flags); \ -+ ________addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1)); \ -+ ________addr; \ -+}) - - #define set_fixmap_offset(idx, phys) \ - __set_fixmap_offset(idx, phys, FIXMAP_PAGE_NORMAL) --- -1.9.1 diff --git a/a/content_digest b/N1/content_digest index 16fa366..fdcfab4 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -69,55 +69,6 @@ "\n" "Mark.\n" "\n" - "---->8----\n" - "From 6d283603d18071690dc138e4a0591a445a1d1e30 Mon Sep 17 00:00:00 2001\n" - "From: Mark Rutland <mark.rutland@arm.com>\n" - "Date: Tue, 9 Feb 2016 17:08:26 +0000\n" - "Subject: [PATCH] asm-generic: make __set_fixmap_offset a macro again\n" - "\n" - "Turning __set_fixmap_offset into a static inline breaks the build for\n" - "several architectures. Fixing this properly requires updates to a number\n" - "of architectures to make them agree on the prototype of __set_fixmap.\n" - "\n" - "For the timebeing, restore __set_fixmap_offset to its prior state as a\n" - "macro function, reverting commit ac4c0ac73485867c (\"asm-generic: make\n" - "__set_fixmap_offset a static inline\"). To avoid the original issue with\n" - "namespace clashes, 'addr' is prefixed with a liberal sprinking of\n" - "underscores.\n" - "\n" - "Signed-off-by: Mark Rutland <mark.rutland@arm.com>\n" - "Cc: Arnd Bergmann <arnd@arndb.de>\n" - "Cc: Catalin Marinas <catalin.marinas@arm.com>\n" - "---\n" - " include/asm-generic/fixmap.h | 14 +++++++-------\n" - " 1 file changed, 7 insertions(+), 7 deletions(-)\n" - "\n" - "diff --git a/include/asm-generic/fixmap.h b/include/asm-generic/fixmap.h\n" - "index f9c27b6..827e4d3 100644\n" - "--- a/include/asm-generic/fixmap.h\n" - "+++ b/include/asm-generic/fixmap.h\n" - "@@ -70,13 +70,13 @@ static inline unsigned long virt_to_fix(const unsigned long vaddr)\n" - " #endif\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" - "-\t\t\t\t\t\tpgprot_t flags)\n" - "-{\n" - "-\t__set_fixmap(idx, phys, flags);\n" - "-\treturn fix_to_virt(idx) + (phys & (PAGE_SIZE - 1));\n" - "-}\n" - "+#define __set_fixmap_offset(idx, phys, flags)\t\t\t\t\\\n" - "+({\t\t\t\t\t\t\t\t\t\\\n" - "+\tunsigned long ________addr;\t\t\t\t\t\\\n" - "+\t__set_fixmap(idx, phys, flags);\t\t\t\t\t\\\n" - "+\t________addr = fix_to_virt(idx) + ((phys) & (PAGE_SIZE - 1));\t\\\n" - "+\t________addr;\t\t\t\t\t\t\t\\\n" - "+})\n" - " \n" - " #define set_fixmap_offset(idx, phys) \\\n" - " \t__set_fixmap_offset(idx, phys, FIXMAP_PAGE_NORMAL)\n" - "-- \n" - 1.9.1 + ---->8---- -b7737ce02f9f541d29dc41f172308fd6a6f5a177cd75c50a1912357f90db1615 +4d8067a797cac4b6aa4a332cd479d5d324fc1198d78c504b8767473698928122
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox