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

Commit 418f19ea authored by Pierre Ossman's avatar Pierre Ossman
Browse files

Merge branch 'master' of ../mmc

parents 98444d3d f6e10b86

Documentation/DMA-API.txt

+3 −5
Original line number Original line Diff line number Diff line
@@ -316,12 +316,10 @@ reduce current DMA mapping usage or delay and try again later). 
	pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,

	pci_map_sg(struct pci_dev *hwdev, struct scatterlist *sg,

		int nents, int direction)

		int nents, int direction)





Maps a scatter gather list from the block layer.



Returns: the number of physical segments mapped (this may be shorter

Returns: the number of physical segments mapped (this may be shorter

than <nents> passed in if the block layer determines that some

than <nents> passed in if some elements of the scatter/gather list are

elements of the scatter/gather list are physically adjacent and thus

physically or virtually adjacent and an IOMMU maps them with a single

may be mapped with a single entry).

entry).





Please note that the sg cannot be mapped again if it has been mapped once.

Please note that the sg cannot be mapped again if it has been mapped once.

The mapping process is allowed to destroy information in the sg.

The mapping process is allowed to destroy information in the sg.

Documentation/DocBook/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -6,7 +6,7 @@ 
# To add a new book the only step required is to add the book to the

# To add a new book the only step required is to add the book to the

# list of DOCBOOKS.

# list of DOCBOOKS.





DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml \

DOCBOOKS := z8530book.xml mcabook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    kernel-hacking.xml kernel-locking.xml deviceiobook.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    procfs-guide.xml writing_usb_driver.xml networking.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

	    kernel-api.xml filesystems.xml lsm.xml usb.xml kgdb.xml \

Documentation/DocBook/networking.tmpl

+0 −3
Original line number Original line Diff line number Diff line
@@ -98,9 +98,6 @@ 
X!Enet/core/wireless.c

X!Enet/core/wireless.c

     </sect1>

     </sect1>

-->

-->

     <sect1><title>Synchronous PPP</title>

!Edrivers/net/wan/syncppp.c

     </sect1>

  </chapter>

  </chapter>





</book>
 
</book>

Documentation/DocBook/wanbook.tmpl

deleted100644 → 0
+0 −99
Original line number Original line Diff line number Diff line 
<?xml version="1.0" encoding="UTF-8"?>

<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"

	"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []>



<book id="WANGuide">

 <bookinfo>

  <title>Synchronous PPP and Cisco HDLC Programming Guide</title>

  

  <authorgroup>

   <author>

    <firstname>Alan</firstname>

    <surname>Cox</surname>

    <affiliation>

     <address>

      <email>alan@lxorguk.ukuu.org.uk</email>

     </address>

    </affiliation>

   </author>

  </authorgroup>



  <copyright>

   <year>2000</year>

   <holder>Alan Cox</holder>

  </copyright>



  <legalnotice>

   <para>

     This documentation is free software; you can redistribute

     it and/or modify it under the terms of the GNU General Public

     License as published by the Free Software Foundation; either

     version 2 of the License, or (at your option) any later

     version.

   </para>

      

   <para>

     This program is distributed in the hope that it will be

     useful, but WITHOUT ANY WARRANTY; without even the implied

     warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

     See the GNU General Public License for more details.

   </para>

      

   <para>

     You should have received a copy of the GNU General Public

     License along with this program; if not, write to the Free

     Software Foundation, Inc., 59 Temple Place, Suite 330, Boston,

     MA 02111-1307 USA

   </para>

      

   <para>

     For more details see the file COPYING in the source

     distribution of Linux.

   </para>

  </legalnotice>

 </bookinfo>



<toc></toc>



  <chapter id="intro">

      <title>Introduction</title>

  <para>

	The syncppp drivers in Linux provide a fairly complete 

	implementation of Cisco HDLC and a minimal implementation of

	PPP. The longer term goal is to switch the PPP layer to the

	generic PPP interface that is new in Linux 2.3.x. The API should

	remain unchanged when this is done, but support will then be

	available for IPX, compression and other PPP features

  </para>

  </chapter>

  <chapter id="bugs">

     <title>Known Bugs And Assumptions</title>

  <para>

  <variablelist>

    <varlistentry><term>PPP is minimal</term>

    <listitem>

    <para>

	The current PPP implementation is very basic, although sufficient

	for most wan usages.

    </para>

    </listitem></varlistentry>



    <varlistentry><term>Cisco HDLC Quirks</term>

    <listitem>

    <para>

	Currently we do not end all packets with the correct Cisco multicast

	or unicast flags. Nothing appears to mind too much but this should

	be corrected.

    </para>

    </listitem></varlistentry>

  </variablelist>

	

  </para>

  </chapter>



  <chapter id="pubfunctions">

     <title>Public Functions Provided</title>

!Edrivers/net/wan/syncppp.c

  </chapter>



</book>

Documentation/RCU/00-INDEX

+2 −0
Original line number Original line Diff line number Diff line
@@ -16,6 +16,8 @@ RTFP.txt 
	- List of RCU papers (bibliography) going back to 1980.

	- List of RCU papers (bibliography) going back to 1980.

torture.txt

torture.txt

	- RCU Torture Test Operation (CONFIG_RCU_TORTURE_TEST)

	- RCU Torture Test Operation (CONFIG_RCU_TORTURE_TEST)

trace.txt

	- CONFIG_RCU_TRACE debugfs files and formats

UP.txt

UP.txt

	- RCU on Uniprocessor Systems

	- RCU on Uniprocessor Systems

whatisRCU.txt

whatisRCU.txt