Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild

[karo-tx-linux.git] / arch / frv / mm / mmu-context.c

diff --git a/arch/frv/mm/mmu-context.c b/arch/frv/mm/mmu-context.c
index f2c6866fc88b93e1ffb6a3edf9ece5d6376e270b..81757d55a5b592fed1e38281edc0cbb6a256dff7 100644 (file)
--- a/arch/frv/mm/mmu-context.c
+++ b/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;
        }
@@ -181,7 +181,7 @@ int cxn_pin_by_pid(pid_t pid)
 
        /* get a handle on the mm_struct */
        read_lock(&tasklist_lock);
-       tsk = find_task_by_pid(pid);
+       tsk = find_task_by_vpid(pid);
        if (tsk) {
                ret = -EINVAL;