diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/ABI/testing/sysfs-bus-pci | 12 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-class-regulator | 21 | ||||
-rw-r--r-- | Documentation/ABI/testing/sysfs-driver-wacom | 13 | ||||
-rw-r--r-- | Documentation/RCU/checklist.txt | 6 | ||||
-rw-r--r-- | Documentation/RCU/stallwarn.txt | 16 | ||||
-rw-r--r-- | Documentation/RCU/trace.txt | 43 | ||||
-rw-r--r-- | Documentation/RCU/whatisRCU.txt | 9 | ||||
-rw-r--r-- | Documentation/accounting/getdelays.c | 5 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/regulator/regulator.txt | 5 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/regulator/tps65217.txt | 31 | ||||
-rw-r--r-- | Documentation/devicetree/bindings/regulator/tps6586x.txt | 73 | ||||
-rw-r--r-- | Documentation/dontdiff | 1 | ||||
-rw-r--r-- | Documentation/feature-removal-schedule.txt | 2 | ||||
-rw-r--r-- | Documentation/i2c/busses/i2c-i801 | 1 | ||||
-rw-r--r-- | Documentation/ia64/aliasing-test.c | 1 | ||||
-rw-r--r-- | Documentation/kernel-parameters.txt | 14 | ||||
-rw-r--r-- | Documentation/power/swsusp.txt | 2 | ||||
-rw-r--r-- | Documentation/scheduler/sched-arch.txt | 10 | ||||
-rw-r--r-- | Documentation/trace/kprobetrace.txt | 2 | ||||
-rw-r--r-- | Documentation/vfio.txt | 2 |
20 files changed, 142 insertions, 127 deletions
diff --git a/Documentation/ABI/testing/sysfs-bus-pci b/Documentation/ABI/testing/sysfs-bus-pci index 34f51100f029..dff1f48d252d 100644 --- a/Documentation/ABI/testing/sysfs-bus-pci +++ b/Documentation/ABI/testing/sysfs-bus-pci | |||
@@ -210,3 +210,15 @@ Users: | |||
210 | firmware assigned instance number of the PCI | 210 | firmware assigned instance number of the PCI |
211 | device that can help in understanding the firmware | 211 | device that can help in understanding the firmware |
212 | intended order of the PCI device. | 212 | intended order of the PCI device. |
213 | |||
214 | What: /sys/bus/pci/devices/.../d3cold_allowed | ||
215 | Date: July 2012 | ||
216 | Contact: Huang Ying <ying.huang@intel.com> | ||
217 | Description: | ||
218 | d3cold_allowed is bit to control whether the corresponding PCI | ||
219 | device can be put into D3Cold state. If it is cleared, the | ||
220 | device will never be put into D3Cold state. If it is set, the | ||
221 | device may be put into D3Cold state if other requirements are | ||
222 | satisfied too. Reading this attribute will show the current | ||
223 | value of d3cold_allowed bit. Writing this attribute will set | ||
224 | the value of d3cold_allowed bit. | ||
diff --git a/Documentation/ABI/testing/sysfs-class-regulator b/Documentation/ABI/testing/sysfs-class-regulator index e091fa873792..bc578bc60628 100644 --- a/Documentation/ABI/testing/sysfs-class-regulator +++ b/Documentation/ABI/testing/sysfs-class-regulator | |||
@@ -349,3 +349,24 @@ Description: | |||
349 | 349 | ||
350 | This will be one of the same strings reported by | 350 | This will be one of the same strings reported by |
351 | the "state" attribute. | 351 | the "state" attribute. |
352 | |||
353 | What: /sys/class/regulator/.../bypass | ||
354 | Date: September 2012 | ||
355 | KernelVersion: 3.7 | ||
356 | Contact: Mark Brown <broonie@opensource.wolfsonmicro.com> | ||
357 | Description: | ||
358 | Some regulator directories will contain a field called | ||
359 | bypass. This indicates if the device is in bypass mode. | ||
360 | |||
361 | This will be one of the following strings: | ||
362 | |||
363 | 'enabled' | ||
364 | 'disabled' | ||
365 | 'unknown' | ||
366 | |||
367 | 'enabled' means the regulator is in bypass mode. | ||
368 | |||
369 | 'disabled' means that the regulator is regulating. | ||
370 | |||
371 | 'unknown' means software cannot determine the state, or | ||
372 | the reported state is invalid. | ||
diff --git a/Documentation/ABI/testing/sysfs-driver-wacom b/Documentation/ABI/testing/sysfs-driver-wacom index 8d55a83d6921..7fc781048b79 100644 --- a/Documentation/ABI/testing/sysfs-driver-wacom +++ b/Documentation/ABI/testing/sysfs-driver-wacom | |||
@@ -1,3 +1,16 @@ | |||
1 | WWhat: /sys/class/hidraw/hidraw*/device/oled*_img | ||
2 | Date: June 2012 | ||
3 | Contact: linux-bluetooth@vger.kernel.org | ||
4 | Description: | ||
5 | The /sys/class/hidraw/hidraw*/device/oled*_img files control | ||
6 | OLED mocro displays on Intuos4 Wireless tablet. Accepted image | ||
7 | has to contain 256 bytes (64x32 px 1 bit colour). The format | ||
8 | is the same as PBM image 62x32px without header (64 bits per | ||
9 | horizontal line, 32 lines). An example of setting OLED No. 0: | ||
10 | dd bs=256 count=1 if=img_file of=[path to oled0_img]/oled0_img | ||
11 | The attribute is read only and no local copy of the image is | ||
12 | stored. | ||
13 | |||
1 | What: /sys/class/hidraw/hidraw*/device/speed | 14 | What: /sys/class/hidraw/hidraw*/device/speed |
2 | Date: April 2010 | 15 | Date: April 2010 |
3 | Kernel Version: 2.6.35 | 16 | Kernel Version: 2.6.35 |
diff --git a/Documentation/RCU/checklist.txt b/Documentation/RCU/checklist.txt index fc103d7a0474..cdb20d41a44a 100644 --- a/Documentation/RCU/checklist.txt +++ b/Documentation/RCU/checklist.txt | |||
@@ -310,6 +310,12 @@ over a rather long period of time, but improvements are always welcome! | |||
310 | code under the influence of preempt_disable(), you instead | 310 | code under the influence of preempt_disable(), you instead |
311 | need to use synchronize_irq() or synchronize_sched(). | 311 | need to use synchronize_irq() or synchronize_sched(). |
312 | 312 | ||
313 | This same limitation also applies to synchronize_rcu_bh() | ||
314 | and synchronize_srcu(), as well as to the asynchronous and | ||
315 | expedited forms of the three primitives, namely call_rcu(), | ||
316 | call_rcu_bh(), call_srcu(), synchronize_rcu_expedited(), | ||
317 | synchronize_rcu_bh_expedited(), and synchronize_srcu_expedited(). | ||
318 | |||
313 | 12. Any lock acquired by an RCU callback must be acquired elsewhere | 319 | 12. Any lock acquired by an RCU callback must be acquired elsewhere |
314 | with softirq disabled, e.g., via spin_lock_irqsave(), | 320 | with softirq disabled, e.g., via spin_lock_irqsave(), |
315 | spin_lock_bh(), etc. Failing to disable irq on a given | 321 | spin_lock_bh(), etc. Failing to disable irq on a given |
diff --git a/Documentation/RCU/stallwarn.txt b/Documentation/RCU/stallwarn.txt index 523364e4e1f1..1927151b386b 100644 --- a/Documentation/RCU/stallwarn.txt +++ b/Documentation/RCU/stallwarn.txt | |||
@@ -99,7 +99,7 @@ In kernels with CONFIG_RCU_FAST_NO_HZ, even more information is | |||
99 | printed: | 99 | printed: |
100 | 100 | ||
101 | INFO: rcu_preempt detected stall on CPU | 101 | INFO: rcu_preempt detected stall on CPU |
102 | 0: (64628 ticks this GP) idle=dd5/3fffffffffffffff/0 drain=0 . timer=-1 | 102 | 0: (64628 ticks this GP) idle=dd5/3fffffffffffffff/0 drain=0 . timer not pending |
103 | (t=65000 jiffies) | 103 | (t=65000 jiffies) |
104 | 104 | ||
105 | The "(64628 ticks this GP)" indicates that this CPU has taken more | 105 | The "(64628 ticks this GP)" indicates that this CPU has taken more |
@@ -116,13 +116,13 @@ number between the two "/"s is the value of the nesting, which will | |||
116 | be a small positive number if in the idle loop and a very large positive | 116 | be a small positive number if in the idle loop and a very large positive |
117 | number (as shown above) otherwise. | 117 | number (as shown above) otherwise. |
118 | 118 | ||
119 | For CONFIG_RCU_FAST_NO_HZ kernels, the "drain=0" indicates that the | 119 | For CONFIG_RCU_FAST_NO_HZ kernels, the "drain=0" indicates that the CPU is |
120 | CPU is not in the process of trying to force itself into dyntick-idle | 120 | not in the process of trying to force itself into dyntick-idle state, the |
121 | state, the "." indicates that the CPU has not given up forcing RCU | 121 | "." indicates that the CPU has not given up forcing RCU into dyntick-idle |
122 | into dyntick-idle mode (it would be "H" otherwise), and the "timer=-1" | 122 | mode (it would be "H" otherwise), and the "timer not pending" indicates |
123 | indicates that the CPU has not recented forced RCU into dyntick-idle | 123 | that the CPU has not recently forced RCU into dyntick-idle mode (it |
124 | mode (it would otherwise indicate the number of microseconds remaining | 124 | would otherwise indicate the number of microseconds remaining in this |
125 | in this forced state). | 125 | forced state). |
126 | 126 | ||
127 | 127 | ||
128 | Multiple Warnings From One Stall | 128 | Multiple Warnings From One Stall |
diff --git a/Documentation/RCU/trace.txt b/Documentation/RCU/trace.txt index f6f15ce39903..672d19083252 100644 --- a/Documentation/RCU/trace.txt +++ b/Documentation/RCU/trace.txt | |||
@@ -333,23 +333,23 @@ o Each element of the form "1/1 0:127 ^0" represents one struct | |||
333 | The output of "cat rcu/rcu_pending" looks as follows: | 333 | The output of "cat rcu/rcu_pending" looks as follows: |
334 | 334 | ||
335 | rcu_sched: | 335 | rcu_sched: |
336 | 0 np=255892 qsp=53936 rpq=85 cbr=0 cng=14417 gpc=10033 gps=24320 nf=6445 nn=146741 | 336 | 0 np=255892 qsp=53936 rpq=85 cbr=0 cng=14417 gpc=10033 gps=24320 nn=146741 |
337 | 1 np=261224 qsp=54638 rpq=33 cbr=0 cng=25723 gpc=16310 gps=2849 nf=5912 nn=155792 | 337 | 1 np=261224 qsp=54638 rpq=33 cbr=0 cng=25723 gpc=16310 gps=2849 nn=155792 |
338 | 2 np=237496 qsp=49664 rpq=23 cbr=0 cng=2762 gpc=45478 gps=1762 nf=1201 nn=136629 | 338 | 2 np=237496 qsp=49664 rpq=23 cbr=0 cng=2762 gpc=45478 gps=1762 nn=136629 |
339 | 3 np=236249 qsp=48766 rpq=98 cbr=0 cng=286 gpc=48049 gps=1218 nf=207 nn=137723 | 339 | 3 np=236249 qsp=48766 rpq=98 cbr=0 cng=286 gpc=48049 gps=1218 nn=137723 |
340 | 4 np=221310 qsp=46850 rpq=7 cbr=0 cng=26 gpc=43161 gps=4634 nf=3529 nn=123110 | 340 | 4 np=221310 qsp=46850 rpq=7 cbr=0 cng=26 gpc=43161 gps=4634 nn=123110 |
341 | 5 np=237332 qsp=48449 rpq=9 cbr=0 cng=54 gpc=47920 gps=3252 nf=201 nn=137456 | 341 | 5 np=237332 qsp=48449 rpq=9 cbr=0 cng=54 gpc=47920 gps=3252 nn=137456 |
342 | 6 np=219995 qsp=46718 rpq=12 cbr=0 cng=50 gpc=42098 gps=6093 nf=4202 nn=120834 | 342 | 6 np=219995 qsp=46718 rpq=12 cbr=0 cng=50 gpc=42098 gps=6093 nn=120834 |
343 | 7 np=249893 qsp=49390 rpq=42 cbr=0 cng=72 gpc=38400 gps=17102 nf=41 nn=144888 | 343 | 7 np=249893 qsp=49390 rpq=42 cbr=0 cng=72 gpc=38400 gps=17102 nn=144888 |
344 | rcu_bh: | 344 | rcu_bh: |
345 | 0 np=146741 qsp=1419 rpq=6 cbr=0 cng=6 gpc=0 gps=0 nf=2 nn=145314 | 345 | 0 np=146741 qsp=1419 rpq=6 cbr=0 cng=6 gpc=0 gps=0 nn=145314 |
346 | 1 np=155792 qsp=12597 rpq=3 cbr=0 cng=0 gpc=4 gps=8 nf=3 nn=143180 | 346 | 1 np=155792 qsp=12597 rpq=3 cbr=0 cng=0 gpc=4 gps=8 nn=143180 |
347 | 2 np=136629 qsp=18680 rpq=1 cbr=0 cng=0 gpc=7 gps=6 nf=0 nn=117936 | 347 | 2 np=136629 qsp=18680 rpq=1 cbr=0 cng=0 gpc=7 gps=6 nn=117936 |
348 | 3 np=137723 qsp=2843 rpq=0 cbr=0 cng=0 gpc=10 gps=7 nf=0 nn=134863 | 348 | 3 np=137723 qsp=2843 rpq=0 cbr=0 cng=0 gpc=10 gps=7 nn=134863 |
349 | 4 np=123110 qsp=12433 rpq=0 cbr=0 cng=0 gpc=4 gps=2 nf=0 nn=110671 | 349 | 4 np=123110 qsp=12433 rpq=0 cbr=0 cng=0 gpc=4 gps=2 nn=110671 |
350 | 5 np=137456 qsp=4210 rpq=1 cbr=0 cng=0 gpc=6 gps=5 nf=0 nn=133235 | 350 | 5 np=137456 qsp=4210 rpq=1 cbr=0 cng=0 gpc=6 gps=5 nn=133235 |
351 | 6 np=120834 qsp=9902 rpq=2 cbr=0 cng=0 gpc=6 gps=3 nf=2 nn=110921 | 351 | 6 np=120834 qsp=9902 rpq=2 cbr=0 cng=0 gpc=6 gps=3 nn=110921 |
352 | 7 np=144888 qsp=26336 rpq=0 cbr=0 cng=0 gpc=8 gps=2 nf=0 nn=118542 | 352 | 7 np=144888 qsp=26336 rpq=0 cbr=0 cng=0 gpc=8 gps=2 nn=118542 |
353 | 353 | ||
354 | As always, this is once again split into "rcu_sched" and "rcu_bh" | 354 | As always, this is once again split into "rcu_sched" and "rcu_bh" |
355 | portions, with CONFIG_TREE_PREEMPT_RCU kernels having an additional | 355 | portions, with CONFIG_TREE_PREEMPT_RCU kernels having an additional |
@@ -377,17 +377,6 @@ o "gpc" is the number of times that an old grace period had | |||
377 | o "gps" is the number of times that a new grace period had started, | 377 | o "gps" is the number of times that a new grace period had started, |
378 | but this CPU was not yet aware of it. | 378 | but this CPU was not yet aware of it. |
379 | 379 | ||
380 | o "nf" is the number of times that this CPU suspected that the | ||
381 | current grace period had run for too long, and thus needed to | ||
382 | be forced. | ||
383 | |||
384 | Please note that "forcing" consists of sending resched IPIs | ||
385 | to holdout CPUs. If that CPU really still is in an old RCU | ||
386 | read-side critical section, then we really do have to wait for it. | ||
387 | The assumption behing "forcing" is that the CPU is not still in | ||
388 | an old RCU read-side critical section, but has not yet responded | ||
389 | for some other reason. | ||
390 | |||
391 | o "nn" is the number of times that this CPU needed nothing. Alert | 380 | o "nn" is the number of times that this CPU needed nothing. Alert |
392 | readers will note that the rcu "nn" number for a given CPU very | 381 | readers will note that the rcu "nn" number for a given CPU very |
393 | closely matches the rcu_bh "np" number for that same CPU. This | 382 | closely matches the rcu_bh "np" number for that same CPU. This |
diff --git a/Documentation/RCU/whatisRCU.txt b/Documentation/RCU/whatisRCU.txt index 69ee188515e7..bf0f6de2aa00 100644 --- a/Documentation/RCU/whatisRCU.txt +++ b/Documentation/RCU/whatisRCU.txt | |||
@@ -873,7 +873,7 @@ d. Do you need to treat NMI handlers, hardirq handlers, | |||
873 | and code segments with preemption disabled (whether | 873 | and code segments with preemption disabled (whether |
874 | via preempt_disable(), local_irq_save(), local_bh_disable(), | 874 | via preempt_disable(), local_irq_save(), local_bh_disable(), |
875 | or some other mechanism) as if they were explicit RCU readers? | 875 | or some other mechanism) as if they were explicit RCU readers? |
876 | If so, you need RCU-sched. | 876 | If so, RCU-sched is the only choice that will work for you. |
877 | 877 | ||
878 | e. Do you need RCU grace periods to complete even in the face | 878 | e. Do you need RCU grace periods to complete even in the face |
879 | of softirq monopolization of one or more of the CPUs? For | 879 | of softirq monopolization of one or more of the CPUs? For |
@@ -884,7 +884,12 @@ f. Is your workload too update-intensive for normal use of | |||
884 | RCU, but inappropriate for other synchronization mechanisms? | 884 | RCU, but inappropriate for other synchronization mechanisms? |
885 | If so, consider SLAB_DESTROY_BY_RCU. But please be careful! | 885 | If so, consider SLAB_DESTROY_BY_RCU. But please be careful! |
886 | 886 | ||
887 | g. Otherwise, use RCU. | 887 | g. Do you need read-side critical sections that are respected |
888 | even though they are in the middle of the idle loop, during | ||
889 | user-mode execution, or on an offlined CPU? If so, SRCU is the | ||
890 | only choice that will work for you. | ||
891 | |||
892 | h. Otherwise, use RCU. | ||
888 | 893 | ||
889 | Of course, this all assumes that you have determined that RCU is in fact | 894 | Of course, this all assumes that you have determined that RCU is in fact |
890 | the right tool for your job. | 895 | the right tool for your job. |
diff --git a/Documentation/accounting/getdelays.c b/Documentation/accounting/getdelays.c index f6318f6d7baf..6f706aca2049 100644 --- a/Documentation/accounting/getdelays.c +++ b/Documentation/accounting/getdelays.c | |||
@@ -98,10 +98,9 @@ static int create_nl_socket(int protocol) | |||
98 | if (rcvbufsz) | 98 | if (rcvbufsz) |
99 | if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, | 99 | if (setsockopt(fd, SOL_SOCKET, SO_RCVBUF, |
100 | &rcvbufsz, sizeof(rcvbufsz)) < 0) { | 100 | &rcvbufsz, sizeof(rcvbufsz)) < 0) { |
101 | fprintf(stderr, "Unable to set socket rcv buf size " | 101 | fprintf(stderr, "Unable to set socket rcv buf size to %d\n", |
102 | "to %d\n", | ||
103 | rcvbufsz); | 102 | rcvbufsz); |
104 | return -1; | 103 | goto error; |
105 | } | 104 | } |
106 | 105 | ||
107 | memset(&local, 0, sizeof(local)); | 106 | memset(&local, 0, sizeof(local)); |
diff --git a/Documentation/devicetree/bindings/regulator/regulator.txt b/Documentation/devicetree/bindings/regulator/regulator.txt index 66ece3f87bbc..ecfc6ccd67ef 100644 --- a/Documentation/devicetree/bindings/regulator/regulator.txt +++ b/Documentation/devicetree/bindings/regulator/regulator.txt | |||
@@ -11,10 +11,13 @@ Optional properties: | |||
11 | - regulator-boot-on: bootloader/firmware enabled regulator | 11 | - regulator-boot-on: bootloader/firmware enabled regulator |
12 | - <name>-supply: phandle to the parent supply/regulator node | 12 | - <name>-supply: phandle to the parent supply/regulator node |
13 | - regulator-ramp-delay: ramp delay for regulator(in uV/uS) | 13 | - regulator-ramp-delay: ramp delay for regulator(in uV/uS) |
14 | |||
15 | Deprecated properties: | ||
14 | - regulator-compatible: If a regulator chip contains multiple | 16 | - regulator-compatible: If a regulator chip contains multiple |
15 | regulators, and if the chip's binding contains a child node that | 17 | regulators, and if the chip's binding contains a child node that |
16 | describes each regulator, then this property indicates which regulator | 18 | describes each regulator, then this property indicates which regulator |
17 | this child node is intended to configure. | 19 | this child node is intended to configure. If this property is missing, |
20 | the node's name will be used instead. | ||
18 | 21 | ||
19 | Example: | 22 | Example: |
20 | 23 | ||
diff --git a/Documentation/devicetree/bindings/regulator/tps65217.txt b/Documentation/devicetree/bindings/regulator/tps65217.txt index 0487e9675ba0..d316fb895daf 100644 --- a/Documentation/devicetree/bindings/regulator/tps65217.txt +++ b/Documentation/devicetree/bindings/regulator/tps65217.txt | |||
@@ -22,66 +22,49 @@ Example: | |||
22 | compatible = "ti,tps65217"; | 22 | compatible = "ti,tps65217"; |
23 | 23 | ||
24 | regulators { | 24 | regulators { |
25 | #address-cells = <1>; | 25 | dcdc1_reg: dcdc1 { |
26 | #size-cells = <0>; | ||
27 | |||
28 | dcdc1_reg: regulator@0 { | ||
29 | reg = <0>; | ||
30 | regulator-compatible = "dcdc1"; | ||
31 | regulator-min-microvolt = <900000>; | 26 | regulator-min-microvolt = <900000>; |
32 | regulator-max-microvolt = <1800000>; | 27 | regulator-max-microvolt = <1800000>; |
33 | regulator-boot-on; | 28 | regulator-boot-on; |
34 | regulator-always-on; | 29 | regulator-always-on; |
35 | }; | 30 | }; |
36 | 31 | ||
37 | dcdc2_reg: regulator@1 { | 32 | dcdc2_reg: dcdc2 { |
38 | reg = <1>; | ||
39 | regulator-compatible = "dcdc2"; | ||
40 | regulator-min-microvolt = <900000>; | 33 | regulator-min-microvolt = <900000>; |
41 | regulator-max-microvolt = <3300000>; | 34 | regulator-max-microvolt = <3300000>; |
42 | regulator-boot-on; | 35 | regulator-boot-on; |
43 | regulator-always-on; | 36 | regulator-always-on; |
44 | }; | 37 | }; |
45 | 38 | ||
46 | dcdc3_reg: regulator@2 { | 39 | dcdc3_reg: dcc3 { |
47 | reg = <2>; | ||
48 | regulator-compatible = "dcdc3"; | ||
49 | regulator-min-microvolt = <900000>; | 40 | regulator-min-microvolt = <900000>; |
50 | regulator-max-microvolt = <1500000>; | 41 | regulator-max-microvolt = <1500000>; |
51 | regulator-boot-on; | 42 | regulator-boot-on; |
52 | regulator-always-on; | 43 | regulator-always-on; |
53 | }; | 44 | }; |
54 | 45 | ||
55 | ldo1_reg: regulator@3 { | 46 | ldo1_reg: ldo1 { |
56 | reg = <3>; | ||
57 | regulator-compatible = "ldo1"; | ||
58 | regulator-min-microvolt = <1000000>; | 47 | regulator-min-microvolt = <1000000>; |
59 | regulator-max-microvolt = <3300000>; | 48 | regulator-max-microvolt = <3300000>; |
60 | regulator-boot-on; | 49 | regulator-boot-on; |
61 | regulator-always-on; | 50 | regulator-always-on; |
62 | }; | 51 | }; |
63 | 52 | ||
64 | ldo2_reg: regulator@4 { | 53 | ldo2_reg: ldo2 { |
65 | reg = <4>; | ||
66 | regulator-compatible = "ldo2"; | ||
67 | regulator-min-microvolt = <900000>; | 54 | regulator-min-microvolt = <900000>; |
68 | regulator-max-microvolt = <3300000>; | 55 | regulator-max-microvolt = <3300000>; |
69 | regulator-boot-on; | 56 | regulator-boot-on; |
70 | regulator-always-on; | 57 | regulator-always-on; |
71 | }; | 58 | }; |
72 | 59 | ||
73 | ldo3_reg: regulator@5 { | 60 | ldo3_reg: ldo3 { |
74 | reg = <5>; | ||
75 | regulator-compatible = "ldo3"; | ||
76 | regulator-min-microvolt = <1800000>; | 61 | regulator-min-microvolt = <1800000>; |
77 | regulator-max-microvolt = <3300000>; | 62 | regulator-max-microvolt = <3300000>; |
78 | regulator-boot-on; | 63 | regulator-boot-on; |
79 | regulator-always-on; | 64 | regulator-always-on; |
80 | }; | 65 | }; |
81 | 66 | ||
82 | ldo4_reg: regulator@6 { | 67 | ldo4_reg: ldo4 { |
83 | reg = <6>; | ||
84 | regulator-compatible = "ldo4"; | ||
85 | regulator-min-microvolt = <1800000>; | 68 | regulator-min-microvolt = <1800000>; |
86 | regulator-max-microvolt = <3300000>; | 69 | regulator-max-microvolt = <3300000>; |
87 | regulator-boot-on; | 70 | regulator-boot-on; |
diff --git a/Documentation/devicetree/bindings/regulator/tps6586x.txt b/Documentation/devicetree/bindings/regulator/tps6586x.txt index da80c2ae0915..07b9ef6e49d5 100644 --- a/Documentation/devicetree/bindings/regulator/tps6586x.txt +++ b/Documentation/devicetree/bindings/regulator/tps6586x.txt | |||
@@ -6,9 +6,13 @@ Required properties: | |||
6 | - interrupts: the interrupt outputs of the controller | 6 | - interrupts: the interrupt outputs of the controller |
7 | - #gpio-cells: number of cells to describe a GPIO | 7 | - #gpio-cells: number of cells to describe a GPIO |
8 | - gpio-controller: mark the device as a GPIO controller | 8 | - gpio-controller: mark the device as a GPIO controller |
9 | - regulators: list of regulators provided by this controller, must have | 9 | - regulators: A node that houses a sub-node for each regulator within the |
10 | property "regulator-compatible" to match their hardware counterparts: | 10 | device. Each sub-node is identified using the node's name (or the deprecated |
11 | sm[0-2], ldo[0-9] and ldo_rtc | 11 | regulator-compatible property if present), with valid values listed below. |
12 | The content of each sub-node is defined by the standard binding for | ||
13 | regulators; see regulator.txt. | ||
14 | sys, sm[0-2], ldo[0-9] and ldo_rtc | ||
15 | - sys-supply: The input supply for SYS. | ||
12 | - vin-sm0-supply: The input supply for the SM0. | 16 | - vin-sm0-supply: The input supply for the SM0. |
13 | - vin-sm1-supply: The input supply for the SM1. | 17 | - vin-sm1-supply: The input supply for the SM1. |
14 | - vin-sm2-supply: The input supply for the SM2. | 18 | - vin-sm2-supply: The input supply for the SM2. |
@@ -20,6 +24,9 @@ Required properties: | |||
20 | 24 | ||
21 | Each regulator is defined using the standard binding for regulators. | 25 | Each regulator is defined using the standard binding for regulators. |
22 | 26 | ||
27 | Note: LDO5 and LDO_RTC is supplied by SYS regulator internally and driver | ||
28 | take care of making proper parent child relationship. | ||
29 | |||
23 | Example: | 30 | Example: |
24 | 31 | ||
25 | pmu: tps6586x@34 { | 32 | pmu: tps6586x@34 { |
@@ -30,6 +37,7 @@ Example: | |||
30 | #gpio-cells = <2>; | 37 | #gpio-cells = <2>; |
31 | gpio-controller; | 38 | gpio-controller; |
32 | 39 | ||
40 | sys-supply = <&some_reg>; | ||
33 | vin-sm0-supply = <&some_reg>; | 41 | vin-sm0-supply = <&some_reg>; |
34 | vin-sm1-supply = <&some_reg>; | 42 | vin-sm1-supply = <&some_reg>; |
35 | vin-sm2-supply = <&some_reg>; | 43 | vin-sm2-supply = <&some_reg>; |
@@ -40,103 +48,80 @@ Example: | |||
40 | vinldo9-supply = <...>; | 48 | vinldo9-supply = <...>; |
41 | 49 | ||
42 | regulators { | 50 | regulators { |
43 | #address-cells = <1>; | 51 | sys_reg: sys { |
44 | #size-cells = <0>; | 52 | regulator-name = "vdd_sys"; |
53 | regulator-boot-on; | ||
54 | regulator-always-on; | ||
55 | }; | ||
45 | 56 | ||
46 | sm0_reg: regulator@0 { | 57 | sm0_reg: sm0 { |
47 | reg = <0>; | ||
48 | regulator-compatible = "sm0"; | ||
49 | regulator-min-microvolt = < 725000>; | 58 | regulator-min-microvolt = < 725000>; |
50 | regulator-max-microvolt = <1500000>; | 59 | regulator-max-microvolt = <1500000>; |
51 | regulator-boot-on; | 60 | regulator-boot-on; |
52 | regulator-always-on; | 61 | regulator-always-on; |
53 | }; | 62 | }; |
54 | 63 | ||
55 | sm1_reg: regulator@1 { | 64 | sm1_reg: sm1 { |
56 | reg = <1>; | ||
57 | regulator-compatible = "sm1"; | ||
58 | regulator-min-microvolt = < 725000>; | 65 | regulator-min-microvolt = < 725000>; |
59 | regulator-max-microvolt = <1500000>; | 66 | regulator-max-microvolt = <1500000>; |
60 | regulator-boot-on; | 67 | regulator-boot-on; |
61 | regulator-always-on; | 68 | regulator-always-on; |
62 | }; | 69 | }; |
63 | 70 | ||
64 | sm2_reg: regulator@2 { | 71 | sm2_reg: sm2 { |
65 | reg = <2>; | ||
66 | regulator-compatible = "sm2"; | ||
67 | regulator-min-microvolt = <3000000>; | 72 | regulator-min-microvolt = <3000000>; |
68 | regulator-max-microvolt = <4550000>; | 73 | regulator-max-microvolt = <4550000>; |
69 | regulator-boot-on; | 74 | regulator-boot-on; |
70 | regulator-always-on; | 75 | regulator-always-on; |
71 | }; | 76 | }; |
72 | 77 | ||
73 | ldo0_reg: regulator@3 { | 78 | ldo0_reg: ldo0 { |
74 | reg = <3>; | ||
75 | regulator-compatible = "ldo0"; | ||
76 | regulator-name = "PCIE CLK"; | 79 | regulator-name = "PCIE CLK"; |
77 | regulator-min-microvolt = <3300000>; | 80 | regulator-min-microvolt = <3300000>; |
78 | regulator-max-microvolt = <3300000>; | 81 | regulator-max-microvolt = <3300000>; |
79 | }; | 82 | }; |
80 | 83 | ||
81 | ldo1_reg: regulator@4 { | 84 | ldo1_reg: ldo1 { |
82 | reg = <4>; | ||
83 | regulator-compatible = "ldo1"; | ||
84 | regulator-min-microvolt = < 725000>; | 85 | regulator-min-microvolt = < 725000>; |
85 | regulator-max-microvolt = <1500000>; | 86 | regulator-max-microvolt = <1500000>; |
86 | }; | 87 | }; |
87 | 88 | ||
88 | ldo2_reg: regulator@5 { | 89 | ldo2_reg: ldo2 { |
89 | reg = <5>; | ||
90 | regulator-compatible = "ldo2"; | ||
91 | regulator-min-microvolt = < 725000>; | 90 | regulator-min-microvolt = < 725000>; |
92 | regulator-max-microvolt = <1500000>; | 91 | regulator-max-microvolt = <1500000>; |
93 | }; | 92 | }; |
94 | 93 | ||
95 | ldo3_reg: regulator@6 { | 94 | ldo3_reg: ldo3 { |
96 | reg = <6>; | ||
97 | regulator-compatible = "ldo3"; | ||
98 | regulator-min-microvolt = <1250000>; | 95 | regulator-min-microvolt = <1250000>; |
99 | regulator-max-microvolt = <3300000>; | 96 | regulator-max-microvolt = <3300000>; |
100 | }; | 97 | }; |
101 | 98 | ||
102 | ldo4_reg: regulator@7 { | 99 | ldo4_reg: ldo4 { |
103 | reg = <7>; | ||
104 | regulator-compatible = "ldo4"; | ||
105 | regulator-min-microvolt = <1700000>; | 100 | regulator-min-microvolt = <1700000>; |
106 | regulator-max-microvolt = <2475000>; | 101 | regulator-max-microvolt = <2475000>; |
107 | }; | 102 | }; |
108 | 103 | ||
109 | ldo5_reg: regulator@8 { | 104 | ldo5_reg: ldo5 { |
110 | reg = <8>; | ||
111 | regulator-compatible = "ldo5"; | ||
112 | regulator-min-microvolt = <1250000>; | 105 | regulator-min-microvolt = <1250000>; |
113 | regulator-max-microvolt = <3300000>; | 106 | regulator-max-microvolt = <3300000>; |
114 | }; | 107 | }; |
115 | 108 | ||
116 | ldo6_reg: regulator@9 { | 109 | ldo6_reg: ldo6 { |
117 | reg = <9>; | ||
118 | regulator-compatible = "ldo6"; | ||
119 | regulator-min-microvolt = <1250000>; | 110 | regulator-min-microvolt = <1250000>; |
120 | regulator-max-microvolt = <3300000>; | 111 | regulator-max-microvolt = <3300000>; |
121 | }; | 112 | }; |
122 | 113 | ||
123 | ldo7_reg: regulator@10 { | 114 | ldo7_reg: ldo7 { |
124 | reg = <10>; | ||
125 | regulator-compatible = "ldo7"; | ||
126 | regulator-min-microvolt = <1250000>; | 115 | regulator-min-microvolt = <1250000>; |
127 | regulator-max-microvolt = <3300000>; | 116 | regulator-max-microvolt = <3300000>; |
128 | }; | 117 | }; |
129 | 118 | ||
130 | ldo8_reg: regulator@11 { | 119 | ldo8_reg: ldo8 { |
131 | reg = <11>; | ||
132 | regulator-compatible = "ldo8"; | ||
133 | regulator-min-microvolt = <1250000>; | 120 | regulator-min-microvolt = <1250000>; |
134 | regulator-max-microvolt = <3300000>; | 121 | regulator-max-microvolt = <3300000>; |
135 | }; | 122 | }; |
136 | 123 | ||
137 | ldo9_reg: regulator@12 { | 124 | ldo9_reg: ldo9 { |
138 | reg = <12>; | ||
139 | regulator-compatible = "ldo9"; | ||
140 | regulator-min-microvolt = <1250000>; | 125 | regulator-min-microvolt = <1250000>; |
141 | regulator-max-microvolt = <3300000>; | 126 | regulator-max-microvolt = <3300000>; |
142 | }; | 127 | }; |
diff --git a/Documentation/dontdiff b/Documentation/dontdiff index 39462cf35cd4..74c25c8d8884 100644 --- a/Documentation/dontdiff +++ b/Documentation/dontdiff | |||
@@ -162,7 +162,6 @@ mach-types.h | |||
162 | machtypes.h | 162 | machtypes.h |
163 | map | 163 | map |
164 | map_hugetlb | 164 | map_hugetlb |
165 | maui_boot.h | ||
166 | media | 165 | media |
167 | mconf | 166 | mconf |
168 | miboot* | 167 | miboot* |
diff --git a/Documentation/feature-removal-schedule.txt b/Documentation/feature-removal-schedule.txt index afaff312bf41..f4d8c7105fcd 100644 --- a/Documentation/feature-removal-schedule.txt +++ b/Documentation/feature-removal-schedule.txt | |||
@@ -579,7 +579,7 @@ Why: KVM tracepoints provide mostly equivalent information in a much more | |||
579 | ---------------------------- | 579 | ---------------------------- |
580 | 580 | ||
581 | What: at91-mci driver ("CONFIG_MMC_AT91") | 581 | What: at91-mci driver ("CONFIG_MMC_AT91") |
582 | When: 3.7 | 582 | When: 3.8 |
583 | Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support | 583 | Why: There are two mci drivers: at91-mci and atmel-mci. The PDC support |
584 | was added to atmel-mci as a first step to support more chips. | 584 | was added to atmel-mci as a first step to support more chips. |
585 | Then at91-mci was kept only for old IP versions (on at91rm9200 and | 585 | Then at91-mci was kept only for old IP versions (on at91rm9200 and |
diff --git a/Documentation/i2c/busses/i2c-i801 b/Documentation/i2c/busses/i2c-i801 index 615142da4ef6..157416e78cc4 100644 --- a/Documentation/i2c/busses/i2c-i801 +++ b/Documentation/i2c/busses/i2c-i801 | |||
@@ -21,6 +21,7 @@ Supported adapters: | |||
21 | * Intel DH89xxCC (PCH) | 21 | * Intel DH89xxCC (PCH) |
22 | * Intel Panther Point (PCH) | 22 | * Intel Panther Point (PCH) |
23 | * Intel Lynx Point (PCH) | 23 | * Intel Lynx Point (PCH) |
24 | * Intel Lynx Point-LP (PCH) | ||
24 | Datasheets: Publicly available at the Intel website | 25 | Datasheets: Publicly available at the Intel website |
25 | 26 | ||
26 | On Intel Patsburg and later chipsets, both the normal host SMBus controller | 27 | On Intel Patsburg and later chipsets, both the normal host SMBus controller |
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c index 5caa2af33207..62a190d45f38 100644 --- a/Documentation/ia64/aliasing-test.c +++ b/Documentation/ia64/aliasing-test.c | |||
@@ -132,6 +132,7 @@ static int read_rom(char *path) | |||
132 | 132 | ||
133 | rc = write(fd, "1", 2); | 133 | rc = write(fd, "1", 2); |
134 | if (rc <= 0) { | 134 | if (rc <= 0) { |
135 | close(fd); | ||
135 | perror("write"); | 136 | perror("write"); |
136 | return -1; | 137 | return -1; |
137 | } | 138 | } |
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 46a6a8288dec..df551dfa8e52 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -2391,6 +2391,17 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2391 | rcutree.rcu_cpu_stall_timeout= [KNL,BOOT] | 2391 | rcutree.rcu_cpu_stall_timeout= [KNL,BOOT] |
2392 | Set timeout for RCU CPU stall warning messages. | 2392 | Set timeout for RCU CPU stall warning messages. |
2393 | 2393 | ||
2394 | rcutree.jiffies_till_first_fqs= [KNL,BOOT] | ||
2395 | Set delay from grace-period initialization to | ||
2396 | first attempt to force quiescent states. | ||
2397 | Units are jiffies, minimum value is zero, | ||
2398 | and maximum value is HZ. | ||
2399 | |||
2400 | rcutree.jiffies_till_next_fqs= [KNL,BOOT] | ||
2401 | Set delay between subsequent attempts to force | ||
2402 | quiescent states. Units are jiffies, minimum | ||
2403 | value is one, and maximum value is HZ. | ||
2404 | |||
2394 | rcutorture.fqs_duration= [KNL,BOOT] | 2405 | rcutorture.fqs_duration= [KNL,BOOT] |
2395 | Set duration of force_quiescent_state bursts. | 2406 | Set duration of force_quiescent_state bursts. |
2396 | 2407 | ||
@@ -2644,9 +2655,6 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
2644 | smart2= [HW] | 2655 | smart2= [HW] |
2645 | Format: <io1>[,<io2>[,...,<io8>]] | 2656 | Format: <io1>[,<io2>[,...,<io8>]] |
2646 | 2657 | ||
2647 | smp-alt-once [X86-32,SMP] On a hotplug CPU system, only | ||
2648 | attempt to substitute SMP alternatives once at boot. | ||
2649 | |||
2650 | smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices | 2658 | smsc-ircc2.nopnp [HW] Don't use PNP to discover SMC devices |
2651 | smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port | 2659 | smsc-ircc2.ircc_cfg= [HW] Device configuration I/O port |
2652 | smsc-ircc2.ircc_sir= [HW] SIR base I/O port | 2660 | smsc-ircc2.ircc_sir= [HW] SIR base I/O port |
diff --git a/Documentation/power/swsusp.txt b/Documentation/power/swsusp.txt index 92341b84250d..0b4b63e7e9b6 100644 --- a/Documentation/power/swsusp.txt +++ b/Documentation/power/swsusp.txt | |||
@@ -53,7 +53,7 @@ before suspend (it is limited to 500 MB by default). | |||
53 | 53 | ||
54 | Article about goals and implementation of Software Suspend for Linux | 54 | Article about goals and implementation of Software Suspend for Linux |
55 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ | 55 | ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ |
56 | Author: Gábor Kuti | 56 | Author: Gábor Kuti |
57 | Last revised: 2003-10-20 by Pavel Machek | 57 | Last revised: 2003-10-20 by Pavel Machek |
58 | 58 | ||
59 | Idea and goals to achieve | 59 | Idea and goals to achieve |
diff --git a/Documentation/scheduler/sched-arch.txt b/Documentation/scheduler/sched-arch.txt index 28aa1075e291..b1b8587b86f0 100644 --- a/Documentation/scheduler/sched-arch.txt +++ b/Documentation/scheduler/sched-arch.txt | |||
@@ -17,16 +17,6 @@ you must `#define __ARCH_WANT_UNLOCKED_CTXSW` in a header file | |||
17 | Unlocked context switches introduce only a very minor performance | 17 | Unlocked context switches introduce only a very minor performance |
18 | penalty to the core scheduler implementation in the CONFIG_SMP case. | 18 | penalty to the core scheduler implementation in the CONFIG_SMP case. |
19 | 19 | ||
20 | 2. Interrupt status | ||
21 | By default, the switch_to arch function is called with interrupts | ||
22 | disabled. Interrupts may be enabled over the call if it is likely to | ||
23 | introduce a significant interrupt latency by adding the line | ||
24 | `#define __ARCH_WANT_INTERRUPTS_ON_CTXSW` in the same place as for | ||
25 | unlocked context switches. This define also implies | ||
26 | `__ARCH_WANT_UNLOCKED_CTXSW`. See arch/arm/include/asm/system.h for an | ||
27 | example. | ||
28 | |||
29 | |||
30 | CPU idle | 20 | CPU idle |
31 | ======== | 21 | ======== |
32 | Your cpu_idle routines need to obey the following rules: | 22 | Your cpu_idle routines need to obey the following rules: |
diff --git a/Documentation/trace/kprobetrace.txt b/Documentation/trace/kprobetrace.txt index d0d0bb9e3e25..d68ea5fc812b 100644 --- a/Documentation/trace/kprobetrace.txt +++ b/Documentation/trace/kprobetrace.txt | |||
@@ -12,7 +12,7 @@ kprobes can probe (this means, all functions body except for __kprobes | |||
12 | functions). Unlike the Tracepoint based event, this can be added and removed | 12 | functions). Unlike the Tracepoint based event, this can be added and removed |
13 | dynamically, on the fly. | 13 | dynamically, on the fly. |
14 | 14 | ||
15 | To enable this feature, build your kernel with CONFIG_KPROBE_TRACING=y. | 15 | To enable this feature, build your kernel with CONFIG_KPROBE_EVENT=y. |
16 | 16 | ||
17 | Similar to the events tracer, this doesn't need to be activated via | 17 | Similar to the events tracer, this doesn't need to be activated via |
18 | current_tracer. Instead of that, add probe points via | 18 | current_tracer. Instead of that, add probe points via |
diff --git a/Documentation/vfio.txt b/Documentation/vfio.txt index 0cb6685c8029..8eda3635a17d 100644 --- a/Documentation/vfio.txt +++ b/Documentation/vfio.txt | |||
@@ -133,7 +133,7 @@ character devices for this group: | |||
133 | $ lspci -n -s 0000:06:0d.0 | 133 | $ lspci -n -s 0000:06:0d.0 |
134 | 06:0d.0 0401: 1102:0002 (rev 08) | 134 | 06:0d.0 0401: 1102:0002 (rev 08) |
135 | # echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind | 135 | # echo 0000:06:0d.0 > /sys/bus/pci/devices/0000:06:0d.0/driver/unbind |
136 | # echo 1102 0002 > /sys/bus/pci/drivers/vfio/new_id | 136 | # echo 1102 0002 > /sys/bus/pci/drivers/vfio-pci/new_id |
137 | 137 | ||
138 | Now we need to look at what other devices are in the group to free | 138 | Now we need to look at what other devices are in the group to free |
139 | it for use by VFIO: | 139 | it for use by VFIO: |