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 kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff
[linux-2.6.git]
/
arch
/
cris
/
mm
/
tlb.c
diff --git
a/arch/cris/mm/tlb.c
b/arch/cris/mm/tlb.c
index
23eca5a
..
0df390a
100644
(file)
--- a/
arch/cris/mm/tlb.c
+++ b/
arch/cris/mm/tlb.c
@@
-29,18
+29,6
@@
struct mm_struct *page_id_map[NUM_PAGEID];
static int map_replace_ptr = 1; /* which page_id_map entry to replace next */
struct mm_struct *page_id_map[NUM_PAGEID];
static int map_replace_ptr = 1; /* which page_id_map entry to replace next */
-/*
- * Initialize the context related info for a new mm_struct
- * instance.
- */
-
-int
-init_new_context(struct task_struct *tsk, struct mm_struct *mm)
-{
- mm->context = NO_CONTEXT;
- return 0;
-}
-
/* the following functions are similar to those used in the PPC port */
static inline void
/* the following functions are similar to those used in the PPC port */
static inline void
@@
-60,12
+48,12
@@
alloc_context(struct mm_struct *mm)
*/
flush_tlb_mm(old_mm);
*/
flush_tlb_mm(old_mm);
- old_mm->context = NO_CONTEXT;
+ old_mm->context
.page_id
= NO_CONTEXT;
}
/* insert it into the page_id_map */
}
/* insert it into the page_id_map */
- mm->context = map_replace_ptr;
+ mm->context
.page_id
= map_replace_ptr;
page_id_map[map_replace_ptr] = mm;
map_replace_ptr++;
page_id_map[map_replace_ptr] = mm;
map_replace_ptr++;
@@
-81,7
+69,7
@@
alloc_context(struct mm_struct *mm)
void
get_mmu_context(struct mm_struct *mm)
{
void
get_mmu_context(struct mm_struct *mm)
{
- if(mm->context == NO_CONTEXT)
+ if(mm->context
.page_id
== NO_CONTEXT)
alloc_context(mm);
}
alloc_context(mm);
}
@@
-96,11
+84,10
@@
get_mmu_context(struct mm_struct *mm)
void
destroy_context(struct mm_struct *mm)
{
void
destroy_context(struct mm_struct *mm)
{
- if(mm->context != NO_CONTEXT) {
- D(printk("destroy_context %d (%p)\n", mm->context, mm));
+ if(mm->context
.page_id
!= NO_CONTEXT) {
+ D(printk("destroy_context %d (%p)\n", mm->context
.page_id
, mm));
flush_tlb_mm(mm); /* TODO this might be redundant ? */
flush_tlb_mm(mm); /* TODO this might be redundant ? */
- page_id_map[mm->context] = NULL;
- /* mm->context = NO_CONTEXT; redundant.. mm will be freed */
+ page_id_map[mm->context.page_id] = NULL;
}
}
}
}