diff options
author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-07-28 04:30:20 -0400 |
commit | 661299d9d0437a0ff72240f3d60016ac3a361a6e (patch) | |
tree | 765512576314fc3612b503f182b9ae4e60fcf849 /include/asm-cris/pgalloc.h | |
parent | 05caac585f8abd6c0113856bc8858e3ef214d8a6 (diff) | |
parent | 41c018b7ecb60b1c2c4d5dee0cd37d32a94c45af (diff) |
Merge with Linus' 2.6 tree
Diffstat (limited to 'include/asm-cris/pgalloc.h')
-rw-r--r-- | include/asm-cris/pgalloc.h | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/asm-cris/pgalloc.h b/include/asm-cris/pgalloc.h index b202e62ed6e0..a131776edf41 100644 --- a/include/asm-cris/pgalloc.h +++ b/include/asm-cris/pgalloc.h | |||
@@ -47,16 +47,6 @@ extern inline void pte_free(struct page *pte) | |||
47 | 47 | ||
48 | #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) | 48 | #define __pte_free_tlb(tlb,pte) tlb_remove_page((tlb),(pte)) |
49 | 49 | ||
50 | /* | ||
51 | * We don't have any real pmd's, and this code never triggers because | ||
52 | * the pgd will always be present.. | ||
53 | */ | ||
54 | |||
55 | #define pmd_alloc_one(mm, addr) ({ BUG(); ((pmd_t *)2); }) | ||
56 | #define pmd_free(x) do { } while (0) | ||
57 | #define __pmd_free_tlb(tlb,x) do { } while (0) | ||
58 | #define pgd_populate(mm, pmd, pte) BUG() | ||
59 | |||
60 | #define check_pgt_cache() do { } while (0) | 50 | #define check_pgt_cache() do { } while (0) |
61 | 51 | ||
62 | #endif | 52 | #endif |