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
fedora core 6 1.2949 + vserver 2.2.0
[linux-2.6.git]
/
include
/
asm-v850
/
page.h
diff --git
a/include/asm-v850/page.h
b/include/asm-v850/page.h
index
06085b0
..
018f267
100644
(file)
--- a/
include/asm-v850/page.h
+++ b/
include/asm-v850/page.h
@@
-1,8
+1,8
@@
/*
* include/asm-v850/page.h -- VM ops
*
/*
* include/asm-v850/page.h -- VM ops
*
- * Copyright (C) 2001,02,03 NEC Electronics Corporation
- * Copyright (C) 2001,02,03 Miles Bader <miles@gnu.org>
+ * Copyright (C) 2001,02,03
,05
NEC Electronics Corporation
+ * Copyright (C) 2001,02,03
,05
Miles Bader <miles@gnu.org>
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
*
* This file is subject to the terms and conditions of the GNU General
* Public License. See the file COPYING in the main directory of this
@@
-14,6
+14,8
@@
#ifndef __V850_PAGE_H__
#define __V850_PAGE_H__
#ifndef __V850_PAGE_H__
#define __V850_PAGE_H__
+#ifdef __KERNEL__
+
#include <asm/machdep.h>
#include <asm/machdep.h>
@@
-32,7
+34,6
@@
#endif
#endif
-#ifdef __KERNEL__
#ifndef __ASSEMBLY__
#define STRICT_MM_TYPECHECKS
#ifndef __ASSEMBLY__
#define STRICT_MM_TYPECHECKS
@@
-98,25
+99,6
@@
typedef unsigned long pgprot_t;
#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
#define PAGE_ALIGN(addr) (((addr) + PAGE_SIZE - 1) & PAGE_MASK)
-#ifndef __ASSEMBLY__
-
-/* Pure 2^n version of get_order */
-extern __inline__ int get_order (unsigned long size)
-{
- int order;
-
- size = (size-1) >> (PAGE_SHIFT-1);
- order = -1;
- do {
- size >>= 1;
- order++;
- } while (size);
- return order;
-}
-
-#endif /* !__ASSEMBLY__ */
-
-
/* No current v850 processor has virtual memory. */
#define __virt_to_phys(addr) (addr)
#define __phys_to_virt(addr) (addr)
/* No current v850 processor has virtual memory. */
#define __virt_to_phys(addr) (addr)
#define __phys_to_virt(addr) (addr)
@@
-130,8
+112,8
@@
extern __inline__ int get_order (unsigned long size)
#define page_to_virt(page) \
((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
#define page_to_virt(page) \
((((page) - mem_map) << PAGE_SHIFT) + PAGE_OFFSET)
-#define
pfn_to_page(pfn) virt_to_page (pfn_to_virt (pfn)
)
-#define p
age_to_pfn(page) virt_to_pfn (page_to_virt (page)
)
+#define
ARCH_PFN_OFFSET (PAGE_OFFSET >> PAGE_SHIFT
)
+#define p
fn_valid(pfn) ((pfn) < max_mapnr
)
#define virt_addr_valid(kaddr) \
(((void *)(kaddr) >= (void *)PAGE_OFFSET) && MAP_NR (kaddr) < max_mapnr)
#define virt_addr_valid(kaddr) \
(((void *)(kaddr) >= (void *)PAGE_OFFSET) && MAP_NR (kaddr) < max_mapnr)
@@
-141,6
+123,11
@@
extern __inline__ int get_order (unsigned long size)
#define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))
#define __va(x) ((void *)__phys_to_virt ((unsigned long)(x)))
+#include <asm-generic/memory_model.h>
+#include <asm-generic/page.h>
+
+#define devmem_is_allowed(x) 1
+
#endif /* KERNEL */
#endif /* __V850_PAGE_H__ */
#endif /* KERNEL */
#endif /* __V850_PAGE_H__ */