← Back to branch summary

~ubuntu-branches/ubuntu/precise/linux-ti-omap4/precise

« back to all changes in this revision

Viewing changes to arch/x86/mm/pf_in.c

  • Committer: Bazaar Package Importer
  • Author(s): Paolo Pisati
  • Date: 2011-06-29 15:23:51 UTC
  • mfrom: (26.1.1 natty-proposed)
  • Revision ID: james.westby@ubuntu.com-20110629152351-xs96tm303d95rpbk
Tags: 3.0.0-1200.2
* Rebased against 3.0.0-6.7
* BSP from TI based on 3.0.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
arch/x86/mm/pf_in.c
414
414
        unsigned char *p;
415
415
        struct prefix_bits prf;
416
416
        int i;
417
 
        unsigned long rv;
418
417
 
419
418
        p = (unsigned char *)ins_addr;
420
419
        p += skip_prefix(p, &prf);
421
420
        p += get_opcode(p, &opcode);
422
421
        for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
423
 
                if (reg_rop[i] == opcode) {
424
 
                        rv = REG_READ;
 
422
                if (reg_rop[i] == opcode)
425
423
                        goto do_work;
426
 
                }
427
424
 
428
425
        for (i = 0; i < ARRAY_SIZE(reg_wop); i++)
429
 
                if (reg_wop[i] == opcode) {
430
 
                        rv = REG_WRITE;
 
426
                if (reg_wop[i] == opcode)
431
427
                        goto do_work;
432
 
                }
433
428
 
434
429
        printk(KERN_ERR "mmiotrace: Not a register instruction, opcode "
435
430
                                                        "0x%02x\n", opcode);
474
469
        unsigned char *p;
475
470
        struct prefix_bits prf;
476
471
        int i;
477
 
        unsigned long rv;
478
472
 
479
473
        p = (unsigned char *)ins_addr;
480
474
        p += skip_prefix(p, &prf);
481
475
        p += get_opcode(p, &opcode);
482
476
        for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
483
 
                if (imm_wop[i] == opcode) {
484
 
                        rv = IMM_WRITE;
 
477
                if (imm_wop[i] == opcode)
485
478
                        goto do_work;
486
 
                }
487
479
 
488
480
        printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode "
489
481
                                                        "0x%02x\n", opcode);