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

* '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

diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c
index 873e7e1..cd8cbeb 100644 (file)
--- a/arch/x86/kernel/amd_iommu.c
+++ b/arch/x86/kernel/amd_iommu.c
@@ -1538,13 +1538,11 @@ static void do_detach(struct device *dev)
 {
        struct iommu_dev_data *dev_data;
        struct amd_iommu *iommu;
-       struct pci_dev *pdev;
        u16 devid;
 
        devid    = get_device_id(dev);
        iommu    = amd_iommu_rlookup_table[devid];
        dev_data = get_dev_data(dev);
-       pdev     = to_pci_dev(dev);
 
        /* decrease reference counters */
        dev_data->domain->dev_iommu[iommu->index] -= 1;
@@ -1703,10 +1701,9 @@ static struct protection_domain *domain_for_device(struct device *dev)
        struct protection_domain *dom;
        struct iommu_dev_data *dev_data, *alias_data;
        unsigned long flags;
-       u16 devid, alias;
+       u16 devid;
 
        devid      = get_device_id(dev);
-       alias      = amd_iommu_alias_table[devid];
        dev_data   = get_dev_data(dev);
        alias_data = get_dev_data(dev_data->alias);
        if (!alias_data)

diff --git a/arch/x86/kernel/cpu/amd.c b/arch/x86/kernel/cpu/amd.c
index 6f9d1f6..8f5cabb 100644 (file)
--- a/arch/x86/kernel/cpu/amd.c
+++ b/arch/x86/kernel/cpu/amd.c
@@ -629,10 +629,13 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
                 * Fixes: https://bugzilla.kernel.org/show_bug.cgi?id=33012
                 */
                u64 mask;
+               int err;
 
-               rdmsrl(MSR_AMD64_MCx_MASK(4), mask);
-               mask |= (1 << 10);
-               wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+               err = rdmsrl_safe(MSR_AMD64_MCx_MASK(4), &mask);
+               if (err == 0) {
+                       mask |= (1 << 10);
+                       checking_wrmsrl(MSR_AMD64_MCx_MASK(4), mask);
+               }
        }
 }
 

diff --git a/arch/x86/kernel/test_nx.c b/arch/x86/kernel/test_nx.c
index 787a5e4..3f92ce0 100644 (file)
--- a/arch/x86/kernel/test_nx.c
+++ b/arch/x86/kernel/test_nx.c
@@ -161,7 +161,7 @@ static int test_NX(void)
        }
 
 #endif
-       return 0;
+       return ret;
 }
 
 static void test_exit(void)

diff --git a/arch/x86/mm/pf_in.c b/arch/x86/mm/pf_in.c
index 38e6d17..9f0614d 100644 (file)
--- 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);