diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-27 01:05:20 +0000 |
| commit | 546db14ee74118296f425f3b91634fb767d67290 (patch) | |
| tree | 22b613a3da8d4bf663eec5e155af01b87fdf9094 /include/asm-mips/page.h | |
| parent | 1e25e41c4f5474e14452094492dbc169b800e4c8 (diff) | |
Merge with Linux 2.3.23. The new bootmem stuff has broken various
platforms. At this time I've only verified that IP22 support compiles
and IP27 actually works.
Diffstat (limited to 'include/asm-mips/page.h')
| -rw-r--r-- | include/asm-mips/page.h | 36 |
1 files changed, 6 insertions, 30 deletions
diff --git a/include/asm-mips/page.h b/include/asm-mips/page.h index c24112ea1..0fb32cb97 100644 --- a/include/asm-mips/page.h +++ b/include/asm-mips/page.h @@ -1,4 +1,4 @@ -/* $Id: page.h,v 1.6 1999/01/04 16:09:24 ralf Exp $ +/* $Id: page.h,v 1.7 1999/06/22 23:07:47 ralf Exp $ * * Definitions for page handling * @@ -8,8 +8,8 @@ * * Copyright (C) 1994 - 1999 by Ralf Baechle */ -#ifndef __ASM_MIPS_PAGE_H -#define __ASM_MIPS_PAGE_H +#ifndef __ASM_PAGE_H +#define __ASM_PAGE_H /* PAGE_SHIFT determines the page size */ #define PAGE_SHIFT 12 @@ -18,17 +18,14 @@ #ifdef __KERNEL__ -#define STRICT_MM_TYPECHECKS - #ifndef _LANGUAGE_ASSEMBLY #define BUG() do { printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); *(int *)0=0; } while (0) #define PAGE_BUG(page) do { BUG(); } while (0) -extern void (*clear_page)(unsigned long page); -extern void (*copy_page)(unsigned long to, unsigned long from); +extern void (*clear_page)(void * page); +extern void (*copy_page)(void * to, void * from); -#ifdef STRICT_MM_TYPECHECKS /* * These are used to make use of C type-checking.. */ @@ -47,27 +44,6 @@ typedef struct { unsigned long pgprot; } pgprot_t; #define __pgd(x) ((pgd_t) { (x) } ) #define __pgprot(x) ((pgprot_t) { (x) } ) -#else /* !defined (STRICT_MM_TYPECHECKS) */ -/* - * .. while these make it easier on the compiler - */ -typedef unsigned long pte_t; -typedef unsigned long pmd_t; -typedef unsigned long pgd_t; -typedef unsigned long pgprot_t; - -#define pte_val(x) (x) -#define pmd_val(x) (x) -#define pgd_val(x) (x) -#define pgprot_val(x) (x) - -#define __pte(x) (x) -#define __pmd(x) (x) -#define __pgd(x) (x) -#define __pgprot(x) (x) - -#endif /* !defined (STRICT_MM_TYPECHECKS) */ - #endif /* _LANGUAGE_ASSEMBLY */ /* to align the pointer to the (next) page boundary */ @@ -84,4 +60,4 @@ typedef unsigned long pgprot_t; #endif /* defined (__KERNEL__) */ -#endif /* __ASM_MIPS_PAGE_H */ +#endif /* __ASM_PAGE_H */ |