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

Commit b876d08f authored by David Woodhouse's avatar David Woodhouse
Browse files

Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6 

Conflicts:

	drivers/pci/dmar.c
parents b364776a 2515ddc6

CREDITS

+6 −6
Original line number Diff line number Diff line
@@ -1653,14 +1653,14 @@ S: Chapel Hill, North Carolina 27514-4818 
S: USA



N: Dave Jones

E: davej@codemonkey.org.uk

E: davej@redhat.com

W: http://www.codemonkey.org.uk

D: x86 errata/setup maintenance.

D: AGPGART driver.

D: Assorted VIA x86 support.

D: 2.5 AGPGART overhaul.

D: CPUFREQ maintenance.

D: Backport/Forwardport merge monkey.

D: Various Janitor work.

S: United Kingdom

D: Fedora kernel maintainence.

D: Misc/Other.

S: 314 Littleton Rd, Westford, MA 01886, USA



N: Martin Josfsson

E: gandalf@wlug.westbo.se

Documentation/DocBook/kernel-hacking.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -1105,7 +1105,7 @@ static struct block_device_operations opt_fops = { 
    </listitem>

    <listitem>

     <para>

      Function names as strings (__FUNCTION__).

      Function names as strings (__func__).

     </para>

    </listitem>

    <listitem>

Documentation/MSI-HOWTO.txt

+2 −4
Original line number Diff line number Diff line
@@ -236,10 +236,8 @@ software system can set different pages for controlling accesses to the 
MSI-X structure. The implementation of MSI support requires the PCI

subsystem, not a device driver, to maintain full control of the MSI-X

table/MSI-X PBA (Pending Bit Array) and MMIO address space of the MSI-X

table/MSI-X PBA.  A device driver is prohibited from requesting the MMIO

address space of the MSI-X table/MSI-X PBA. Otherwise, the PCI subsystem

will fail enabling MSI-X on its hardware device when it calls the function

pci_enable_msix().

table/MSI-X PBA.  A device driver should not access the MMIO address

space of the MSI-X table/MSI-X PBA.



5.3.2 API pci_enable_msix

Documentation/PCI/pci.txt

+4 −0
Original line number Diff line number Diff line
@@ -163,6 +163,10 @@ need pass only as many optional fields as necessary: 
	o class and classmask fields default to 0

	o driver_data defaults to 0UL.



Note that driver_data must match the value used by any of the pci_device_id

entries defined in the driver. This makes the driver_data field mandatory

if all the pci_device_id entries have a non-zero driver_data value.



Once added, the driver probe routine will be invoked for any unclaimed

PCI devices listed in its (newly updated) pci_ids list.

Documentation/PCI/pcieaer-howto.txt

+3 −8
Original line number Diff line number Diff line
@@ -203,22 +203,17 @@ to mmio_enabled. 


3.3 helper functions



3.3.1 int pci_find_aer_capability(struct pci_dev *dev);

pci_find_aer_capability locates the PCI Express AER capability

in the device configuration space. If the device doesn't support

PCI-Express AER, the function returns 0.



3.3.2 int pci_enable_pcie_error_reporting(struct pci_dev *dev);

3.3.1 int pci_enable_pcie_error_reporting(struct pci_dev *dev);

pci_enable_pcie_error_reporting enables the device to send error

messages to root port when an error is detected. Note that devices

don't enable the error reporting by default, so device drivers need

call this function to enable it.



3.3.3 int pci_disable_pcie_error_reporting(struct pci_dev *dev);

3.3.2 int pci_disable_pcie_error_reporting(struct pci_dev *dev);

pci_disable_pcie_error_reporting disables the device to send error

messages to root port when an error is detected.



3.3.4 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

3.3.3 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev);

pci_cleanup_aer_uncorrect_error_status cleanups the uncorrectable

error status register.