Pull asm-segment into release branch

diff --combined arch/ia64/pci/pci.c
index f9472c5,0addeca..9977c12
--- 1/arch/ia64/pci/pci.c
--- 2/arch/ia64/pci/pci.c
+++ b/arch/ia64/pci/pci.c
@@@ -24,7 -24,6 +24,6 @@@
  
  #include <asm/machvec.h>
  #include <asm/page.h>
- #include <asm/segment.h>
  #include <asm/system.h>
  #include <asm/io.h>
  #include <asm/sal.h>
@@@ -380,7 -379,6 +379,7 @@@ void pcibios_bus_to_resource(struct pci
        res->start = region->start + offset;
        res->end = region->end + offset;
  }
 +EXPORT_SYMBOL(pcibios_bus_to_resource);
  
  static int __devinit is_valid_resource(struct pci_dev *dev, int idx)
  {