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-m68k
/
page.h
diff --git
a/include/asm-m68k/page.h
b/include/asm-m68k/page.h
index
98ef190
..
f4c883b
100644
(file)
--- a/
include/asm-m68k/page.h
+++ b/
include/asm-m68k/page.h
@@
-1,7
+1,8
@@
#ifndef _M68K_PAGE_H
#define _M68K_PAGE_H
#ifndef _M68K_PAGE_H
#define _M68K_PAGE_H
-#include <linux/config.h>
+
+#ifdef __KERNEL__
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
/* PAGE_SHIFT determines the page size */
#ifndef CONFIG_SUN3
@@
-16,8
+17,6
@@
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
#endif
#define PAGE_MASK (~(PAGE_SIZE-1))
-#ifdef __KERNEL__
-
#include <asm/setup.h>
#if PAGE_SHIFT < 13
#include <asm/setup.h>
#if PAGE_SHIFT < 13
@@
-25,9
+24,9
@@
#else
#define THREAD_SIZE PAGE_SIZE
#endif
#else
#define THREAD_SIZE PAGE_SIZE
#endif
-
+
#ifndef __ASSEMBLY__
#ifndef __ASSEMBLY__
-
+
#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
#define free_user_page(page, addr) free_page(addr)
#define get_user_page(vaddr) __get_free_page(GFP_KERNEL)
#define free_user_page(page, addr) free_page(addr)
@@
-52,15
+51,13
@@
static inline void copy_page(void *to, void *from)
static inline void clear_page(void *page)
{
static inline void clear_page(void *page)
{
- unsigned long
data,
tmp;
-
void
*sp = page;
+ unsigned long tmp;
+
unsigned long
*sp = page;
- data = 0;
-
- *((unsigned long *)(page))++ = 0;
- *((unsigned long *)(page))++ = 0;
- *((unsigned long *)(page))++ = 0;
- *((unsigned long *)(page))++ = 0;
+ *sp++ = 0;
+ *sp++ = 0;
+ *sp++ = 0;
+ *sp++ = 0;
__asm__ __volatile__("1:\t"
".chip 68040\n\t"
__asm__ __volatile__("1:\t"
".chip 68040\n\t"
@@
-69,8
+66,8
@@
static inline void clear_page(void *page)
"subqw #8,%2\n\t"
"subqw #8,%2\n\t"
"dbra %1,1b\n\t"
"subqw #8,%2\n\t"
"subqw #8,%2\n\t"
"dbra %1,1b\n\t"
- : "=a" (
page
), "=d" (tmp)
- : "a" (
sp), "0" (page
),
+ : "=a" (
sp
), "=d" (tmp)
+ : "a" (
page), "0" (sp
),
"1" ((PAGE_SIZE - 16) / 16 - 1));
}
"1" ((PAGE_SIZE - 16) / 16 - 1));
}
@@
-80,7
+77,7
@@
static inline void clear_page(void *page)
#endif
#define clear_user_page(addr, vaddr, page) \
#endif
#define clear_user_page(addr, vaddr, page) \
- do { clear_page(addr); \
+ do { clear_page(addr); \
flush_dcache_page(page); \
} while (0)
#define copy_user_page(to, from, vaddr, page) \
flush_dcache_page(page); \
} while (0)
#define copy_user_page(to, from, vaddr, page) \
@@
-109,20
+106,6
@@
typedef struct { unsigned long pgprot; } pgprot_t;
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
/* to align the pointer to the (next) page boundary */
#define PAGE_ALIGN(addr) (((addr)+PAGE_SIZE-1)&PAGE_MASK)
-/* Pure 2^n version of get_order */
-static 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__ */
#include <asm/page_offset.h>
#endif /* !__ASSEMBLY__ */
#include <asm/page_offset.h>
@@
-140,13
+123,13
@@
extern unsigned long m68k_memoffset;
#define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset)
#define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset))
#else
#define __pa(vaddr) ((unsigned long)(vaddr)+m68k_memoffset)
#define __va(paddr) ((void *)((unsigned long)(paddr)-m68k_memoffset))
#else
-#define __pa(vaddr) virt_to_phys((void *)
vaddr
)
-#define __va(paddr) phys_to_virt((unsigned long)
paddr
)
+#define __pa(vaddr) virt_to_phys((void *)
(vaddr)
)
+#define __va(paddr) phys_to_virt((unsigned long)
(paddr)
)
#endif
#else /* !CONFIG_SUN3 */
/* This #define is a horrible hack to suppress lots of warnings. --m */
#endif
#else /* !CONFIG_SUN3 */
/* This #define is a horrible hack to suppress lots of warnings. --m */
-#define __pa(x) ___pa((unsigned long)
x
)
+#define __pa(x) ___pa((unsigned long)
(x)
)
static inline unsigned long ___pa(unsigned long x)
{
if(x == 0)
static inline unsigned long ___pa(unsigned long x)
{
if(x == 0)
@@
-192,6
+175,10
@@
static inline void *__va(unsigned long x)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
#define VM_DATA_DEFAULT_FLAGS (VM_READ | VM_WRITE | VM_EXEC | \
VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC)
+#include <asm-generic/page.h>
+
+#define devmem_is_allowed(x) 1
+
#endif /* __KERNEL__ */
#endif /* _M68K_PAGE_H */
#endif /* __KERNEL__ */
#endif /* _M68K_PAGE_H */