diff options
Diffstat (limited to 'arch/x86/mm')
-rw-r--r-- | arch/x86/mm/pf_in.c | 14 |
1 files changed, 3 insertions, 11 deletions
diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c index 38e6d174c497..9f0614daea85 100644 --- a/arch/x86/mm/pf_in.c +++ b/arch/x86/mm/pf_in.c | |||
@@ -414,22 +414,17 @@ unsigned long get_ins_reg_val(unsigned long ins_addr, struct pt_regs *regs) | |||
414 | unsigned char *p; | 414 | unsigned char *p; |
415 | struct prefix_bits prf; | 415 | struct prefix_bits prf; |
416 | int i; | 416 | int i; |
417 | unsigned long rv; | ||
418 | 417 | ||
419 | p = (unsigned char *)ins_addr; | 418 | p = (unsigned char *)ins_addr; |
420 | p += skip_prefix(p, &prf); | 419 | p += skip_prefix(p, &prf); |
421 | p += get_opcode(p, &opcode); | 420 | p += get_opcode(p, &opcode); |
422 | for (i = 0; i < ARRAY_SIZE(reg_rop); i++) | 421 | for (i = 0; i < ARRAY_SIZE(reg_rop); i++) |
423 | if (reg_rop[i] == opcode) { | 422 | if (reg_rop[i] == opcode) |
424 | rv = REG_READ; | ||
425 | goto do_work; | 423 | goto do_work; |
426 | } | ||
427 | 424 | ||
428 | for (i = 0; i < ARRAY_SIZE(reg_wop); i++) | 425 | for (i = 0; i < ARRAY_SIZE(reg_wop); i++) |
429 | if (reg_wop[i] == opcode) { | 426 | if (reg_wop[i] == opcode) |
430 | rv = REG_WRITE; | ||
431 | goto do_work; | 427 | goto do_work; |
432 | } | ||
433 | 428 | ||
434 | printk(KERN_ERR "mmiotrace: Not a register instruction, opcode " | 429 | printk(KERN_ERR "mmiotrace: Not a register instruction, opcode " |
435 | "0x%02x\n", opcode); | 430 | "0x%02x\n", opcode); |
@@ -474,16 +469,13 @@ unsigned long get_ins_imm_val(unsigned long ins_addr) | |||
474 | unsigned char *p; | 469 | unsigned char *p; |
475 | struct prefix_bits prf; | 470 | struct prefix_bits prf; |
476 | int i; | 471 | int i; |
477 | unsigned long rv; | ||
478 | 472 | ||
479 | p = (unsigned char *)ins_addr; | 473 | p = (unsigned char *)ins_addr; |
480 | p += skip_prefix(p, &prf); | 474 | p += skip_prefix(p, &prf); |
481 | p += get_opcode(p, &opcode); | 475 | p += get_opcode(p, &opcode); |
482 | for (i = 0; i < ARRAY_SIZE(imm_wop); i++) | 476 | for (i = 0; i < ARRAY_SIZE(imm_wop); i++) |
483 | if (imm_wop[i] == opcode) { | 477 | if (imm_wop[i] == opcode) |
484 | rv = IMM_WRITE; | ||
485 | goto do_work; | 478 | goto do_work; |
486 | } | ||
487 | 479 | ||
488 | printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode " | 480 | printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode " |
489 | "0x%02x\n", opcode); | 481 | "0x%02x\n", opcode); |