The patch titled
Subject: blackfin: define dummy pgprot_writecombine for !MMU
has been removed from the -mm tree. Its filename was
blackfin-define-dummy-pgprot_writecombine-for-mmu.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Sudip Mukherjee <sudipm.mukherjee@xxxxxxxxx>
Subject: blackfin: define dummy pgprot_writecombine for !MMU
blackfin allmodconfig build fails with the error:
../sound/core/pcm_native.c: In function 'snd_pcm_lib_default_mmap':
../sound/core/pcm_native.c:3386:24: error: implicit declaration of function 'pgprot_writecombine' [-Werror=implicit-function-declaration]
area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);
^
../sound/core/pcm_native.c:3386:22: error: incompatible types when assigning to type 'pgprot_t {aka struct <anonymous>}' from type 'int'
area->vm_page_prot = pgprot_writecombine(area->vm_page_prot);
^
When !MMU, asm-generic will not define default pgprot_writecombine, so
blackfin needs to define it by itself.
The patch idea is from:
65b9ab888cd7 ("arch/c6x/include/asm/pgtable.h: define dummy pgprot_writecombine for !MMU")
Signed-off-by: Sudip Mukherjee <sudip@xxxxxxxxxxxxxxx>
Cc: Steven Miao <realmz6@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
arch/blackfin/include/asm/pgtable.h | 2 ++
1 file changed, 2 insertions(+)
diff -puN arch/blackfin/include/asm/pgtable.h~blackfin-define-dummy-pgprot_writecombine-for-mmu arch/blackfin/include/asm/pgtable.h
--- a/arch/blackfin/include/asm/pgtable.h~blackfin-define-dummy-pgprot_writecombine-for-mmu
+++ a/arch/blackfin/include/asm/pgtable.h
@@ -97,6 +97,8 @@ extern unsigned long get_fb_unmapped_are
unsigned long);
#define HAVE_ARCH_FB_UNMAPPED_AREA
+#define pgprot_writecombine pgprot_noncached
+
#include <asm-generic/pgtable.h>
#endif /* _BLACKFIN_PGTABLE_H */
_
Patches currently in -mm which might be from sudipm.mukherjee@xxxxxxxxx are
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
