From aaacb505706de9fe5b9db3ad679199312a5bc6d5 Mon Sep 17 00:00:00 2001 From: Benjamin Herrenschmidt Date: Sat, 11 Nov 2006 17:25:05 +1100 Subject: [PATCH] --- yaml --- r: 42223 b: refs/heads/master c: e557a1c96c82f4d1a91b5c2e2e0275b5999c297d h: refs/heads/master i: 42221: 5dc1c2d23c7243efaddfe8c9bad7407e9f738879 42219: f221db68cabbd13d7f57619118144f00ff3eae7a 42215: 7d50d52b5817ef01732e00815ec26fe12b4c5245 42207: b4da6dc67d653a8b84611cbb0f883379b2a26b51 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/pci_64.c | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 61d50669e7eb..57141d8dc1e2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 868108784ccf0add6ac593bfbc2eb5a0804af48d +refs/heads/master: e557a1c96c82f4d1a91b5c2e2e0275b5999c297d diff --git a/trunk/arch/powerpc/kernel/pci_64.c b/trunk/arch/powerpc/kernel/pci_64.c index 88b78484b944..5ffab8787b93 100644 --- a/trunk/arch/powerpc/kernel/pci_64.c +++ b/trunk/arch/powerpc/kernel/pci_64.c @@ -967,11 +967,7 @@ void __devinit pci_process_bridge_OF_ranges(struct pci_controller *hose, res = NULL; pci_space = ranges[0]; pci_addr = ((unsigned long)ranges[1] << 32) | ranges[2]; - - cpu_phys_addr = ranges[3]; - if (na >= 2) - cpu_phys_addr = (cpu_phys_addr << 32) | ranges[4]; - + cpu_phys_addr = of_translate_address(dev, &ranges[3]); size = ((unsigned long)ranges[na+3] << 32) | ranges[na+4]; ranges += np; if (size == 0)