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
Merge to kernel-2.6.20-1.2949.fc6.vs2.2.0.1
[linux-2.6.git]
/
arch
/
frv
/
mm
/
mmu-context.c
diff --git
a/arch/frv/mm/mmu-context.c
b/arch/frv/mm/mmu-context.c
index
6983198
..
1530a41
100644
(file)
--- a/
arch/frv/mm/mmu-context.c
+++ b/
arch/frv/mm/mmu-context.c
@@
-11,7
+11,6
@@
#include <linux/sched.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/mm.h>
-#include <linux/vs_cvirt.h>
#include <asm/tlbflush.h>
#define NR_CXN 4096
#include <asm/tlbflush.h>
#define NR_CXN 4096
@@
-55,9
+54,9
@@
static unsigned get_cxn(mm_context_t *ctx)
/* find the first unallocated context number
* - 0 is reserved for the kernel
*/
/* find the first unallocated context number
* - 0 is reserved for the kernel
*/
- cxn = find_next_zero_bit(
&
cxn_bitmap, NR_CXN, 1);
+ cxn = find_next_zero_bit(cxn_bitmap, NR_CXN, 1);
if (cxn < NR_CXN) {
if (cxn < NR_CXN) {
- set_bit(cxn,
&
cxn_bitmap);
+ set_bit(cxn, cxn_bitmap);
}
else {
/* none remaining - need to steal someone else's cxn */
}
else {
/* none remaining - need to steal someone else's cxn */
@@
-139,7
+138,7
@@
void destroy_context(struct mm_struct *mm)
cxn_pinned = -1;
list_del_init(&ctx->id_link);
cxn_pinned = -1;
list_del_init(&ctx->id_link);
- clear_bit(ctx->id,
&
cxn_bitmap);
+ clear_bit(ctx->id, cxn_bitmap);
__flush_tlb_mm(ctx->id);
ctx->id = 0;
}
__flush_tlb_mm(ctx->id);
ctx->id = 0;
}