* [PATCH] Fix build errors in asm-generic/pgtable.h
@ 2015-03-05 16:40 Toshi Kani
2015-03-05 23:43 ` Stephen Rothwell
0 siblings, 1 reply; 2+ messages in thread
From: Toshi Kani @ 2015-03-05 16:40 UTC (permalink / raw)
To: akpm
Cc: linux-mm, linux-next, linux-kernel, kbuild-all, fengguang.wu,
hannes, Toshi Kani
Fix build errors in pud_set_huge() and pmd_set_huge() in
asm-generic/pgtable.h on some architectures in linux-next
and -mm trees.
C-stype code needs be used under #ifndef __ASSEMBLY__.
Signed-off-by: Toshi Kani <toshi.kani@hp.com>
---
include/asm-generic/pgtable.h | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/include/asm-generic/pgtable.h b/include/asm-generic/pgtable.h
index eaae472..c79eebf 100644
--- a/include/asm-generic/pgtable.h
+++ b/include/asm-generic/pgtable.h
@@ -697,12 +697,6 @@ static inline int pmd_protnone(pmd_t pmd)
#endif /* CONFIG_MMU */
-#endif /* !__ASSEMBLY__ */
-
-#ifndef io_remap_pfn_range
-#define io_remap_pfn_range remap_pfn_range
-#endif
-
#ifdef CONFIG_HAVE_ARCH_HUGE_VMAP
int pud_set_huge(pud_t *pud, phys_addr_t addr, pgprot_t prot);
int pmd_set_huge(pmd_t *pmd, phys_addr_t addr, pgprot_t prot);
@@ -721,4 +715,10 @@ static inline int pud_clear_huge(pud_t *pud) { return 0; }
static inline int pmd_clear_huge(pmd_t *pmd) { return 0; }
#endif /* CONFIG_HAVE_ARCH_HUGE_VMAP */
+#endif /* !__ASSEMBLY__ */
+
+#ifndef io_remap_pfn_range
+#define io_remap_pfn_range remap_pfn_range
+#endif
+
#endif /* _ASM_GENERIC_PGTABLE_H */
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] Fix build errors in asm-generic/pgtable.h
2015-03-05 16:40 [PATCH] Fix build errors in asm-generic/pgtable.h Toshi Kani
@ 2015-03-05 23:43 ` Stephen Rothwell
0 siblings, 0 replies; 2+ messages in thread
From: Stephen Rothwell @ 2015-03-05 23:43 UTC (permalink / raw)
To: Toshi Kani
Cc: akpm, linux-mm, linux-next, linux-kernel, kbuild-all,
fengguang.wu, hannes
[-- Attachment #1: Type: text/plain, Size: 606 bytes --]
Hi Toshi,
On Thu, 5 Mar 2015 09:40:07 -0700 Toshi Kani <toshi.kani@hp.com> wrote:
>
> Fix build errors in pud_set_huge() and pmd_set_huge() in
> asm-generic/pgtable.h on some architectures in linux-next
> and -mm trees.
>
> C-stype code needs be used under #ifndef __ASSEMBLY__.
>
> Signed-off-by: Toshi Kani <toshi.kani@hp.com>
> ---
> include/asm-generic/pgtable.h | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
Added to my copy of the akpm-current tree today (and thus to linux-next).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-03-05 23:43 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-03-05 16:40 [PATCH] Fix build errors in asm-generic/pgtable.h Toshi Kani
2015-03-05 23:43 ` Stephen Rothwell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).