git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'upstream-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee13...
[pandora-kernel.git]
/
arch
/
arm
/
mm
/
copypage-v6.c
diff --git
a/arch/arm/mm/copypage-v6.c
b/arch/arm/mm/copypage-v6.c
index
269ce69
..
3d0d3a9
100644
(file)
--- a/
arch/arm/mm/copypage-v6.c
+++ b/
arch/arm/mm/copypage-v6.c
@@
-17,6
+17,8
@@
#include <asm/tlbflush.h>
#include <asm/cacheflush.h>
#include <asm/tlbflush.h>
#include <asm/cacheflush.h>
+#include "mm.h"
+
#if SHMLBA > 16384
#error FIX ME
#endif
#if SHMLBA > 16384
#error FIX ME
#endif
@@
-24,8
+26,6
@@
#define from_address (0xffff8000)
#define to_address (0xffffc000)
#define from_address (0xffff8000)
#define to_address (0xffffc000)
-#define TOP_PTE(x) pte_offset_kernel(top_pmd, x)
-
static DEFINE_SPINLOCK(v6_lock);
/*
static DEFINE_SPINLOCK(v6_lock);
/*