diff --git a/[refs] b/[refs] index b41c0688a6f9..7f6fd57f2ad7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b53f7870d1657831df23788d1984aac3b5a97bd +refs/heads/master: 0f7217f4accad73e0a86febadb5a5d6e74ff7c37 diff --git a/trunk/arch/frv/mm/mmu-context.c b/trunk/arch/frv/mm/mmu-context.c index f2c6866fc88b..1530a4111e6d 100644 --- a/trunk/arch/frv/mm/mmu-context.c +++ b/trunk/arch/frv/mm/mmu-context.c @@ -54,9 +54,9 @@ static unsigned get_cxn(mm_context_t *ctx) /* 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) { - set_bit(cxn, &cxn_bitmap); + set_bit(cxn, cxn_bitmap); } else { /* none remaining - need to steal someone else's cxn */ @@ -138,7 +138,7 @@ void destroy_context(struct mm_struct *mm) 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; }