···434434 The DRM core includes two memory managers, namely Translation Table Maps435435 (TTM) and Graphics Execution Manager (GEM). TTM was the first DRM memory436436 manager to be developed and tried to be a one-size-fits-them all437437- solution. It provides a single userspace API to accomodate the need of437437+ solution. It provides a single userspace API to accommodate the need of438438 all hardware, supporting both Unified Memory Architecture (UMA) devices439439 and devices with dedicated video RAM (i.e. most discrete video cards).440440 This resulted in a large, complex piece of code that turned out to be···701701 <para>702702 Similar to global names, GEM file descriptors are also used to share GEM703703 objects across processes. They offer additional security: as file704704- descriptors must be explictly sent over UNIX domain sockets to be shared704704+ descriptors must be explicitly sent over UNIX domain sockets to be shared705705 between applications, they can't be guessed like the globally unique GEM706706 names.707707 </para>···11541154 </para>11551155 <para>11561156 The <methodname>page_flip</methodname> operation schedules a page flip.11571157- Once any pending rendering targetting the new frame buffer has11571157+ Once any pending rendering targeting the new frame buffer has11581158 completed, the CRTC will be reprogrammed to display that frame buffer11591159 after the next vertical refresh. The operation must return immediately11601160 without waiting for rendering or page flip to complete and must block
+1-1
Documentation/DocBook/media/dvb/frontend.xml
···233233<entry align="char">The frontend FEC inner coding (Viterbi, LDPC or other inner code) is stable</entry>234234</row><row>235235<entry align="char">FE_HAS_SYNC</entry>236236-<entry align="char">Syncronization bytes was found</entry>236236+<entry align="char">Synchronization bytes was found</entry>237237</row><row>238238<entry align="char">FE_HAS_LOCK</entry>239239<entry align="char">The DVB were locked and everything is working</entry>
+1-1
Documentation/DocBook/media/v4l/controls.xml
···31473147 <entry>A multi-zone metering. The light intensity is measured31483148in several points of the frame and the the results are combined. The31493149algorithm of the zones selection and their significance in calculating the31503150-final value is device dependant.</entry>31503150+final value is device dependent.</entry>31513151 </row>31523152 </tbody>31533153 </entrytbl>
+1-1
Documentation/DocBook/writing_usb_driver.tmpl
···8383 </para>8484 <para>8585 Because each different protocol causes a new driver to be created, I have8686- written a generic USB driver skeleton, modeled after the pci-skeleton.c8686+ written a generic USB driver skeleton, modelled after the pci-skeleton.c8787 file in the kernel source tree upon which many PCI network drivers have8888 been based. This USB skeleton can be found at drivers/usb/usb-skeleton.c8989 in the kernel source tree. In this article I will walk through the basics
+5-5
Documentation/bcache.txt
···181181182182 In practice this isn't an issue because as soon as a write comes along it'll183183 cause the btree node to be split, and you need almost no write traffic for184184- this to not show up enough to be noticable (especially since bcache's btree184184+ this to not show up enough to be noticeable (especially since bcache's btree185185 nodes are huge and index large regions of the device). But when you're186186 benchmarking, if you're trying to warm the cache by reading a bunch of data187187 and there's no other traffic - that can be a problem.···222222 it's in passthrough mode or caching).223223224224sequential_cutoff225225- A sequential IO will bypass the cache once it passes this threshhold; the225225+ A sequential IO will bypass the cache once it passes this threshold; the226226 most recent 128 IOs are tracked so sequential IO can be detected even when227227 it isn't all done at once.228228···296296 since the synchronization for cache misses was rewritten)297297298298cache_readaheads299299- Count of times readahead occured.299299+ Count of times readahead occurred.300300301301SYSFS - CACHE SET:302302···359359SYSFS - CACHE SET INTERNAL:360360361361This directory also exposes timings for a number of internal operations, with362362-separate files for average duration, average frequency, last occurence and max362362+separate files for average duration, average frequency, last occurrence and max363363duration: garbage collection, btree read, btree node sorts and btree splits.364364365365active_journal_entries···414414 space.415415416416io_errors417417- Number of errors that have occured, decayed by io_error_halflife.417417+ Number of errors that have occurred, decayed by io_error_halflife.418418419419metadata_written420420 Sum of all non data writes (btree writes and all other metadata).
+1-1
Documentation/block/queue-sysfs.txt
···9393queue maintains a separate request pool per each cgroup when9494CONFIG_BLK_CGROUP is enabled, and this parameter applies to each such9595per-block-cgroup request pool. IOW, if there are N block cgroups,9696-each request queue may have upto N request pools, each independently9696+each request queue may have up to N request pools, each independently9797regulated by nr_requests.98989999optimal_io_size (RO)
+1-1
Documentation/cgroups/memory.txt
···304304memory usage is too high.305305306306* slab pages: pages allocated by the SLAB or SLUB allocator are tracked. A copy307307-of each kmem_cache is created everytime the cache is touched by the first time307307+of each kmem_cache is created every time the cache is touched by the first time308308from inside the memcg. The creation is done lazily, so some objects can still be309309skipped while the cache is being created. All objects in a slab page should310310belong to the same memcg. This only fails to hold when a task is migrated to a
+1-1
Documentation/device-mapper/cache.txt
···87878888Migrating data between the origin and cache device uses bandwidth.8989The user can set a throttle to prevent more than a certain amount of9090-migration occuring at any one time. Currently we're not taking any9090+migration occurring at any one time. Currently we're not taking any9191account of normal io traffic going to the devices. More work needs9292doing here to avoid migrating during those peak io moments.9393
···55for the group. The interrupt request from each group are connected to a parent66interrupt controller, such as GIC in case of Exynos4210.7788-The interrupt combiner controller consists of multiple combiners. Upto eight88+The interrupt combiner controller consists of multiple combiners. Up to eight99interrupt sources can be connected to a combiner. The combiner outputs one1010combined interrupt for its eight interrupt sources. The combined interrupt1111is usually connected to a parent interrupt controller.···1414controller module (which includes multiple combiners). A combiner in the1515interrupt controller module shares config/control registers with other1616combiners. For example, a 32-bit interrupt enable/disable config register1717-can accommodate upto 4 interrupt combiners (with each combiner supporting1818-upto 8 interrupt sources).1717+can accommodate up to 4 interrupt combiners (with each combiner supporting1818+up to 8 interrupt sources).19192020Required properties:2121- compatible: should be "samsung,exynos4210-combiner".
···1414interrupt multiplexor (one node for all groups). A group in the1515interrupt controller shares config/control registers with other groups.1616For example, a 32-bit interrupt enable/disable config register can1717-accommodate upto 4 interrupt groups.1717+accommodate up to 4 interrupt groups.18181919Required properties:2020 - compatible: should be, either of
···44[1] Si5351A/B/C Data Sheet55 http://www.silabs.com/Support%20Documents/TechnicalDocs/Si5351.pdf6677-The Si5351a/b/c are programmable i2c clock generators with upto 8 output77+The Si5351a/b/c are programmable i2c clock generators with up to 8 output88clocks. Si5351a also has a reduced pin-count package (MSOP10) where only993 output clocks are accessible. The internal structure of the clock1010generators can be found in [1].
···5151* card-detect-delay: Delay in milli-seconds before detecting card after card5252 insert event. The default value is 0.53535454-* supports-highspeed: Enables support for high speed cards (upto 50MHz)5454+* supports-highspeed: Enables support for high speed cards (up to 50MHz)55555656* broken-cd: as documented in mmc core bindings.5757
···11 4xx/Axon EMAC ethernet nodes2233 The EMAC ethernet controller in IBM and AMCC 4xx chips, and also44- the Axon bridge. To operate this needs to interact with a ths44+ the Axon bridge. To operate this needs to interact with a this55 special McMAL DMA controller, and sometimes an RGMII or ZMII66 interface. In addition to the nodes and properties described77 below, the node for the OPB bus on which the EMAC sits must have a
···2233The BCM2835 contains two forms of SPI master controller, one known simply as44SPI0, and the other known as the "Universal SPI Master"; part of the55-auxilliary block. This binding applies to the SPI0 controller.55+auxiliary block. This binding applies to the SPI0 controller.6677Required properties:88- compatible: Should be "brcm,bcm2835-spi".
···4444 };45454646Example 2: In this example, the MCT global and local timer interrupts are4747- connected to two seperate interrupt controllers. Hence, an4747+ connected to two separate interrupt controllers. Hence, an4848 interrupt-map is created to map the interrupts to the respective4949 interrupt controllers.5050
···1212 represents PERIPHERAL.1313 - port1-mode : Should be "1" to represent HOST. "3" signifies OTG and "2"1414 represents PERIPHERAL.1515- - power : Should be "250". This signifies the controller can supply upto1515+ - power : Should be "250". This signifies the controller can supply up to1616 500mA when operating in host mode.17171818Example:
···1616 specifying ULPI and UTMI respectively.1717 - mode : Should be "3" to represent OTG. "1" signifies HOST and "2"1818 represents PERIPHERAL.1919- - power : Should be "50". This signifies the controller can supply upto1919+ - power : Should be "50". This signifies the controller can supply up to2020 100mA when operating in host mode.2121 - usb-phy : the phandle for the PHY device2222
+1-1
Documentation/dynamic-debug-howto.txt
···279279280280- modules do not need to define it explicitly281281- every module gets it tacitly, whether they use pr_debug or not282282-- it doesnt appear in /sys/module/$module/parameters/282282+- it doesn't appear in /sys/module/$module/parameters/283283 To see it, grep the control file, or inspect /proc/cmdline.284284285285For CONFIG_DYNAMIC_DEBUG kernels, any settings given at boot-time (or
+1-1
Documentation/fb/cirrusfb.txt
···5555* Overhaul color register routines.5656* Associated with the above, console colors are now obtained from a LUT5757 called 'palette' instead of from the VGA registers. This code was5858- modeled after that in atyfb and matroxfb.5858+ modelled after that in atyfb and matroxfb.5959* Code cleanup, add comments.6060* Overhaul SR07 handling.6161* Bug fixes.
+1-1
Documentation/filesystems/jfs.txt
···4242 devices and sparse/thinly-provisioned LUNs. The FITRIM ioctl4343 command is also available together with the nodiscard option.4444 The value of minlen specifies the minimum blockcount, when4545- a TRIM command to the block device is considered usefull.4545+ a TRIM command to the block device is considered useful.4646 When no value is given to the discard option, it defaults to4747 64 blocks, which means 256KiB in JFS.4848 The minlen value of discard overrides the minlen value given
+1-1
Documentation/filesystems/qnx6.txt
···148148Bitmap system area149149------------------150150151151-The bitmap itself is devided into three parts.151151+The bitmap itself is divided into three parts.152152First the system area, that is split into two halfs.153153Then userspace.154154
+1-1
Documentation/filesystems/vfat.txt
···307307308308 <proceeding files...>309309 <slot #3, id = 0x43, characters = "h is long">310310- <slot #2, id = 0x02, characters = "xtension whic">310310+ <slot #2, id = 0x02, characters = "xtension which">311311 <slot #1, id = 0x01, characters = "My Big File.E">312312 <directory entry, name = "MYBIGFIL.EXT">313313
+1-1
Documentation/laptops/dslm.c
···22 * dslm.c33 * Simple Disk Sleep Monitor44 * by Bartek Kania55- * Licenced under the GPL55+ * Licensed under the GPL66 */77#include <unistd.h>88#include <stdlib.h>
+1-1
Documentation/media-framework.txt
···18181919Discovering a device internal topology, and configuring it at runtime, is one2020of the goals of the media framework. To achieve this, hardware devices are2121-modeled as an oriented graph of building blocks called entities connected2121+modelled as an oriented graph of building blocks called entities connected2222through pads.23232424An entity is a basic media hardware building block. It can correspond to
+1-1
Documentation/metag/kernel-ABI.txt
···18918919019064-bit arguments are placed in matching pairs of registers (i.e. the same191191register number in both D0 and D1 units), with the least significant half in D0192192-and the most significant half in D1, leaving a gap where necessary. Futher192192+and the most significant half in D1, leaving a gap where necessary. Further193193arguments are stored on the stack in reverse order (earlier arguments at higher194194addresses):195195
+1-1
Documentation/misc-devices/mei/mei.txt
···120120 Notes:121121 max_msg_length (MTU) in client properties describes the maximum122122 data that can be sent or received. (e.g. if MTU=2K, can send123123- requests up to bytes 2k and received responses upto 2k bytes).123123+ requests up to bytes 2k and received responses up to 2k bytes).124124125125Intel ME Applications:126126==============
+1-1
Documentation/networking/ip-sysctl.txt
···183183 for triggering fast retransmit when the amount of outstanding data is184184 small and when no previously unsent data can be transmitted (such185185 that limited transmit could be used). Also controls the use of186186- Tail loss probe (TLP) that converts RTOs occuring due to tail186186+ Tail loss probe (TLP) that converts RTOs occurring due to tail187187 losses into fast recovery (draft-dukkipati-tcpm-tcp-loss-probe-01).188188 Possible values:189189 0 disables ER
+6-6
Documentation/networking/netlink_mmap.txt
···5454 copied to the ring on transmission, nullifying most of the performance gains.5555Dumps of kernel databases automatically support memory mapped I/O.56565757-Conversion of the transmit path involves changing message contruction to5757+Conversion of the transmit path involves changing message construction to5858use memory from the TX ring instead of (usually) a buffer declared on the5959stack and setting up the frame header approriately. Optionally poll() can6060be used to wait for free frames in the TX ring.···6565RX and TX rings6666----------------67676868-Each ring contains a number of continous memory blocks, containing frames of6969-fixed size dependant on the parameters used for ring setup.6868+Each ring contains a number of continuous memory blocks, containing frames of6969+fixed size dependent on the parameters used for ring setup.70707171Ring: [ block 0 ]7272 [ frame 0 ]···8080 [ frame 2 * n + 1 ]81818282The blocks are only visible to the kernel, from the point of view of user-space8383-the ring just contains the frames in a continous memory zone.8383+the ring just contains the frames in a continuous memory zone.84848585The ring parameters used for setting up the ring are defined as follows:8686···9191 unsigned int nm_frame_nr;9292};93939494-Frames are grouped into blocks, where each block is a continous region of memory9494+Frames are grouped into blocks, where each block is a continuous region of memory9595and holds nm_block_size / nm_frame_size frames. The total number of frames in9696the ring is nm_frame_nr. The following invariants hold:9797···113113114114- nm_frame_nr must equal the actual number of frames as specified above.115115116116-When the kernel can't allocate phsyically continous memory for a ring block,116116+When the kernel can't allocate physically continuous memory for a ring block,117117it will fall back to use physically discontinous memory. This might affect118118performance negatively, in order to avoid this the nm_frame_size parameter119119should be chosen to be as small as possible for the required frame size and
+1-1
Documentation/pinctrl.txt
···298298controller we need a mapping so that the pin control subsystem can figure out299299which pin controller handles control of a certain GPIO pin. Since a single300300pin controller may be muxing several GPIO ranges (typically SoCs that have301301-one set of pins but internally several GPIO silicon blocks, each modeled as301301+one set of pins but internally several GPIO silicon blocks, each modelled as302302a struct gpio_chip) any number of GPIO ranges can be added to a pin controller303303instance like this:304304
+1-1
Documentation/thermal/exynos_thermal_emulation
···2020The sysfs node, 'emul_node', will contain value 0 for the initial state. When you input any2121temperature you want to update to sysfs node, it automatically enable emulation mode and2222current temperature will be changed into it.2323-(Exynos also supports user changable delay time which would be used to delay of2323+(Exynos also supports user changeable delay time which would be used to delay of2424 changing temperature. However, this node only uses same delay of real sensing time, 938us.)25252626Exynos emulation mode requires synchronous of value changing and enabling. It means when you
+3-3
Documentation/virtual/kvm/api.txt
···1683168316841684This ioctl maps the memory at "user_addr" with the length "length" to16851685the vcpu's address space starting at "vcpu_addr". All parameters need to16861686-be alligned by 1 megabyte.16861686+be aligned by 1 megabyte.1687168716881688168916894.66 KVM_S390_UCAS_UNMAP···1703170317041704This ioctl unmaps the memory in the vcpu's address space starting at17051705"vcpu_addr" with the length "length". The field "user_addr" is ignored.17061706-All parameters need to be alligned by 1 megabyte.17061706+All parameters need to be aligned by 1 megabyte.1707170717081708170917094.67 KVM_S390_VCPU_FAULT···20192019The "enc" array is a list which for each of those segment base page20202020size provides the list of supported actual page sizes (which can be20212021only larger or equal to the base page size), along with the20222022-corresponding encoding in the hash PTE. Similarily, the array is20222022+corresponding encoding in the hash PTE. Similarly, the array is202320238 entries sorted by increasing sizes and an entry with a "0" shift20242024is an empty entry and a terminator:20252025
+1-1
Documentation/vm/pagemap.txt
···147147Other notes:148148149149Reading from any of the files will return -EINVAL if you are not starting150150-the read on an 8-byte boundary (e.g., if you seeked an odd number of bytes150150+the read on an 8-byte boundary (e.g., if you sought an odd number of bytes151151into the file), or if the size of the read is not a multiple of 8 bytes.
+1-1
Documentation/w1/slaves/w1_ds28e04
···24242525 A write operation on the "eeprom" file writes the given byte sequence2626 to the EEPROM of the DS28E04. If CRC checking mode is enabled only2727- fully alligned blocks of 32 bytes with valid CRC16 values (in bytes 302727+ fully aligned blocks of 32 bytes with valid CRC16 values (in bytes 302828 and 31) are allowed to be written.29293030PIO Access