Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e872d4ca authored by Len Brown's avatar Len Brown
Browse files

Merge ../from-linus

parents 1f3a7301 403fe5ae

Documentation/usb/usbmon.txt

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ Here is the list of words, from left to right: 
- URB Status. This field makes no sense for submissions, but is present

  to help scripts with parsing. In error case, it contains the error code.

  In case of a setup packet, it contains a Setup Tag. If scripts read a number

  in this field, the proceed to read Data Length. Otherwise, they read

  in this field, they proceed to read Data Length. Otherwise, they read

  the setup packet before reading the Data Length.

- Setup packet, if present, consists of 5 words: one of each for bmRequestType,

  bRequest, wValue, wIndex, wLength, as specified by the USB Specification 2.0.

arch/alpha/kernel/pci.c

+16 −0
Original line number Diff line number Diff line
@@ -350,8 +350,24 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
	region->end = res->end - offset;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	struct pci_controller *hose = (struct pci_controller *)dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = hose->io_space->start;

	else if (res->flags & IORESOURCE_MEM)

		offset = hose->mem_space->start;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif



int

arch/arm/kernel/bios32.c

+17 −0
Original line number Diff line number Diff line
@@ -447,9 +447,26 @@ pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
	region->end   = res->end - offset;

}



void __devinit

pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			struct pci_bus_region *region)

{

	struct pci_sys_data *root = dev->sysdata;

	unsigned long offset = 0;



	if (res->flags & IORESOURCE_IO)

		offset = root->io_offset;

	if (res->flags & IORESOURCE_MEM)

		offset = root->mem_offset;



	res->start = region->start + offset;

	res->end   = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_fixup_bus);

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif



/*

arch/ppc/kernel/pci.c

+15 −0
Original line number Diff line number Diff line
@@ -160,6 +160,21 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region, 
}

EXPORT_SYMBOL(pcibios_resource_to_bus);



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			     struct pci_bus_region *region)

{

	unsigned long offset = 0;

	struct pci_controller *hose = dev->sysdata;



	if (hose && res->flags & IORESOURCE_IO)

		offset = (unsigned long)hose->io_base_virt - isa_io_base;

	else if (hose && res->flags & IORESOURCE_MEM)

		offset = hose->pci_mem_offset;

	res->start = region->start + offset;

	res->end = region->end + offset;

}

EXPORT_SYMBOL(pcibios_bus_to_resource);



/*

 * We need to avoid collisions with `mirrored' VGA ports

 * and other strange ISA hardware, so we always want the

arch/ppc64/kernel/pci.c

+20 −0
Original line number Diff line number Diff line
@@ -108,8 +108,28 @@ void pcibios_resource_to_bus(struct pci_dev *dev, struct pci_bus_region *region 
	region->end = res->end - offset;

}



void pcibios_bus_to_resource(struct pci_dev *dev, struct resource *res,

			      struct pci_bus_region *region)

{

	unsigned long offset = 0;

	struct pci_controller *hose = pci_bus_to_host(dev->bus);



	if (!hose)

		return;



	if (res->flags & IORESOURCE_IO)

	        offset = (unsigned long)hose->io_base_virt - pci_io_base;



	if (res->flags & IORESOURCE_MEM)

		offset = hose->pci_mem_offset;



	res->start = region->start + offset;

	res->end = region->end + offset;

}



#ifdef CONFIG_HOTPLUG

EXPORT_SYMBOL(pcibios_resource_to_bus);

EXPORT_SYMBOL(pcibios_bus_to_resource);

#endif



/*