From: Vladimir 'phcoder' Serbinenko <phcoder@gmail.com>
Date: Mon, 21 Dec 2009 21:32:33 +0000 (+0100)
Subject: Fix abug in 64-bit memory address space
X-Git-Tag: 1.98~277^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7d991d17a896f77f22bc98d6b1121ec0083084fd;p=thirdparty%2Fgrub.git

Fix abug in 64-bit memory address space
---

diff --git a/commands/lspci.c b/commands/lspci.c
index fd07ad8d6..1eba10b43 100644
--- a/commands/lspci.c
+++ b/commands/lspci.c
@@ -176,7 +176,8 @@ grub_lspci_iter (int bus, int dev, int func, grub_pci_id_t pciid)
 	      if ((space & GRUB_PCI_ADDR_MEM_TYPE_MASK) 
 		  == GRUB_PCI_ADDR_MEM_TYPE_64)
 		{
-		  space |= grub_pci_make_address (dev, reg);
+		  addr = grub_pci_make_address (dev, reg);
+		  space |= ((grub_uint64_t) grub_pci_read (addr)) << 32;
 		  reg++;
 		  grub_printf ("\t64-bit memory space %d at 0x%016llx [%s]\n",
 			       i, (unsigned long long)