git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
include
/
asm-sh
/
pgtable.h
diff --git
a/include/asm-sh/pgtable.h
b/include/asm-sh/pgtable.h
index
fb46b83
..
7cbe429
100644
(file)
--- a/
include/asm-sh/pgtable.h
+++ b/
include/asm-sh/pgtable.h
@@
-274,8
+274,7
@@
typedef pte_t *pte_addr_t;
#define kern_addr_valid(addr) (1)
#define kern_addr_valid(addr) (1)
-#define io_remap_page_range(vma, vaddr, paddr, size, prot) \
- remap_pfn_range(vma, vaddr, (paddr) >> PAGE_SHIFT, size, prot)
+#define io_remap_page_range remap_page_range
/*
* No page table caches to initialise
/*
* No page table caches to initialise
@@
-286,9
+285,9
@@
typedef pte_t *pte_addr_t;
extern unsigned int kobjsize(const void *objp);
#endif /* !CONFIG_MMU */
extern unsigned int kobjsize(const void *objp);
#endif /* !CONFIG_MMU */
-#if
defined(CONFIG_CPU_SH4) || defined(CONFIG_SH7705_CACHE_32KB)
+#if
def CONFIG_CPU_SH4
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
#define __HAVE_ARCH_PTEP_GET_AND_CLEAR
-extern pte_t ptep_get_and_clear(pte_t *ptep);
+extern
inline
pte_t ptep_get_and_clear(pte_t *ptep);
#endif
#include <asm-generic/pgtable.h>
#endif
#include <asm-generic/pgtable.h>