aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-cris/page.h
diff options
context:
space:
mode:
authorMikael Starvik <mikael.starvik@axis.com>2005-07-27 14:44:43 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2005-07-27 19:26:01 -0400
commit5d01e6ce785884a5db5792cd2e5bb36fa82fe23c (patch)
treeaec09f0c058a6750904b947733a6cc7033359447 /include/asm-cris/page.h
parentdcf1310b72149d016970c666539d4d73bb77c086 (diff)
[PATCH] CRIS update: updates for 2.6.12
Patches to make CRIS work with 2.6.12. Signed-off-by: Mikael Starvik <starvik@axis.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/asm-cris/page.h')
-rw-r--r--include/asm-cris/page.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/include/asm-cris/page.h b/include/asm-cris/page.h
index c767da1ef8f5..bbf17bd39385 100644
--- a/include/asm-cris/page.h
+++ b/include/asm-cris/page.h
@@ -29,18 +29,15 @@
29 */ 29 */
30#ifndef __ASSEMBLY__ 30#ifndef __ASSEMBLY__
31typedef struct { unsigned long pte; } pte_t; 31typedef struct { unsigned long pte; } pte_t;
32typedef struct { unsigned long pmd; } pmd_t;
33typedef struct { unsigned long pgd; } pgd_t; 32typedef struct { unsigned long pgd; } pgd_t;
34typedef struct { unsigned long pgprot; } pgprot_t; 33typedef struct { unsigned long pgprot; } pgprot_t;
35#endif 34#endif
36 35
37#define pte_val(x) ((x).pte) 36#define pte_val(x) ((x).pte)
38#define pmd_val(x) ((x).pmd)
39#define pgd_val(x) ((x).pgd) 37#define pgd_val(x) ((x).pgd)
40#define pgprot_val(x) ((x).pgprot) 38#define pgprot_val(x) ((x).pgprot)
41 39
42#define __pte(x) ((pte_t) { (x) } ) 40#define __pte(x) ((pte_t) { (x) } )
43#define __pmd(x) ((pmd_t) { (x) } )
44#define __pgd(x) ((pgd_t) { (x) } ) 41#define __pgd(x) ((pgd_t) { (x) } )
45#define __pgprot(x) ((pgprot_t) { (x) } ) 42#define __pgprot(x) ((pgprot_t) { (x) } )
46 43
@@ -73,10 +70,6 @@ typedef struct { unsigned long pgprot; } pgprot_t;
73 70
74#ifndef __ASSEMBLY__ 71#ifndef __ASSEMBLY__
75 72
76#define BUG() do { \
77 printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
78} while (0)
79
80/* Pure 2^n version of get_order */ 73/* Pure 2^n version of get_order */
81static inline int get_order(unsigned long size) 74static inline int get_order(unsigned long size)
82{ 75{