Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip

* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
  x86: Eliminate various 'set but not used' warnings
  x86, SMEP: Fix section mismatch warnings
  x86, amd: Use _safe() msr access for GartTlbWlk disable code

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)
         unsigned char *p;
         struct prefix_bits prf;
         int i;
-        unsigned long rv;
 
         p = (unsigned char *)ins_addr;
         p += skip_prefix(p, &prf);
         p += get_opcode(p, &opcode);
         for (i = 0; i < ARRAY_SIZE(reg_rop); i++)
-                if (reg_rop[i] == opcode) {
-                        rv = REG_READ;
+                if (reg_rop[i] == opcode)
                         goto do_work;
-                }
 
         for (i = 0; i < ARRAY_SIZE(reg_wop); i++)
-                if (reg_wop[i] == opcode) {
-                        rv = REG_WRITE;
+                if (reg_wop[i] == opcode)
                         goto do_work;
-                }
 
         printk(KERN_ERR "mmiotrace: Not a register instruction, opcode "
                                                         "0x%02x\n", opcode);
@@ -474,16 +469,13 @@ unsigned long get_ins_imm_val(unsigned long ins_addr)
         unsigned char *p;
         struct prefix_bits prf;
         int i;
-        unsigned long rv;
 
         p = (unsigned char *)ins_addr;
         p += skip_prefix(p, &prf);
         p += get_opcode(p, &opcode);
         for (i = 0; i < ARRAY_SIZE(imm_wop); i++)
-                if (imm_wop[i] == opcode) {
-                        rv = IMM_WRITE;
+                if (imm_wop[i] == opcode)
                         goto do_work;
-                }
 
         printk(KERN_ERR "mmiotrace: Not an immediate instruction, opcode "
                                                         "0x%02x\n", opcode);