patch from -mm kernel to use upper_32_bits

diff --git a/linux-core/i915_compat.c b/linux-core/i915_compat.c
index e119a99..58fb841 100644 (file)
--- a/linux-core/i915_compat.c
+++ b/linux-core/i915_compat.c
@@ -84,7 +84,8 @@ static void intel_i965_g33_setup_chipset_flush(struct pci_dev *pdev)
 
                intel_alloc_chipset_flush_resource(pdev);
 
-               pci_write_config_dword(pdev, I965_IFPADDR + 4, (i9xx_private.ifp_resource.start >> 32));
+               pci_write_config_dword(pdev, I965_IFPADDR + 4,
+                       upper_32_bits(i9xx_private.ifp_resource.start));
                pci_write_config_dword(pdev, I965_IFPADDR, (i9xx_private.ifp_resource.start & 0xffffffff) | 0x1);
        } else {
                u64 l64;