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

[linux-2.6-block.git] / drivers / hwmon / coretemp.c

diff --git a/drivers/hwmon/coretemp.c b/drivers/hwmon/coretemp.c
index a42744c7665b53c0c776338774b0511e052fc047..72c338eb5fae5a94c5558ebe5aae4530bb649763 100644 (file)
--- a/drivers/hwmon/coretemp.c
+++ b/drivers/hwmon/coretemp.c
@@ -246,7 +246,8 @@ static int adjust_tjmax(struct cpuinfo_x86 *c, u32 id, struct device *dev)
        int err;
        u32 eax, edx;
        int i;
-       struct pci_dev *host_bridge = pci_get_bus_and_slot(0, PCI_DEVFN(0, 0));
+       u16 devfn = PCI_DEVFN(0, 0);
+       struct pci_dev *host_bridge = pci_get_domain_bus_and_slot(0, 0, devfn);
 
        /*
         * Explicit tjmax table entries override heuristics.