From: Alexey Dobriyan <adobriyan@gmail.com>
To: geert@linux-m68k.org, zippel@linux-m68k.org
Cc: linux-m68k@lists.linux-m68k.org
Subject: [PATCH] m68k: fix compilation
Date: Thu, 9 Jul 2009 17:08:38 +0400 [thread overview]
Message-ID: <20090709130838.GA32685@x200.localdomain> (raw)
* pgprot_noncached() should be defined _before_ including asm-generic/pgtable.h
* kunmap() wants struct page *, not pte
Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com>
---
arch/m68k/include/asm/motorola_pgalloc.h | 2 +-
arch/m68k/include/asm/pgtable_mm.h | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
commit 85dc40e8bc39f106fdf926739acfd23c2a574d9a
Author: Alexey <adobriyan@gmail.com>
Date: Thu Jul 9 07:41:54 2009 +0400
m68k fix
--- a/arch/m68k/include/asm/motorola_pgalloc.h
+++ b/arch/m68k/include/asm/motorola_pgalloc.h
@@ -41,7 +41,7 @@ static inline pgtable_t pte_alloc_one(struct mm_struct *mm, unsigned long addres
flush_tlb_kernel_page(pte);
nocache_page(pte);
}
- kunmap(pte);
+ kunmap(page);
pgtable_page_ctor(page);
return page;
}
--- a/arch/m68k/include/asm/pgtable_mm.h
+++ b/arch/m68k/include/asm/pgtable_mm.h
@@ -135,8 +135,6 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
#endif
#ifndef __ASSEMBLY__
-#include <asm-generic/pgtable.h>
-
/*
* Macro to mark a page protection value as "uncacheable".
*/
@@ -154,6 +152,7 @@ static inline void update_mmu_cache(struct vm_area_struct *vma,
? (__pgprot((pgprot_val(prot) & _CACHEMASK040) | _PAGE_NOCACHE_S)) \
: (prot)))
+#include <asm-generic/pgtable.h>
#endif /* !__ASSEMBLY__ */
/*
next reply other threads:[~2009-07-09 13:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-09 13:08 Alexey Dobriyan [this message]
2009-08-21 20:13 ` [PATCH] m68k: fix compilation Geert Uytterhoeven
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090709130838.GA32685@x200.localdomain \
--to=adobriyan@gmail.com \
--cc=geert@linux-m68k.org \
--cc=linux-m68k@lists.linux-m68k.org \
--cc=zippel@linux-m68k.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox