aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/cgroups/cgroups.txt2
-rw-r--r--Documentation/kbuild/kconfig.txt2
-rw-r--r--Documentation/sysfs-rules.txt2
-rw-r--r--Documentation/trace/events.txt8
4 files changed, 7 insertions, 7 deletions
diff --git a/Documentation/cgroups/cgroups.txt b/Documentation/cgroups/cgroups.txt
index fd588ff0e296..5eb279a48fa4 100644
--- a/Documentation/cgroups/cgroups.txt
+++ b/Documentation/cgroups/cgroups.txt
@@ -573,7 +573,7 @@ void cancel_attach(struct cgroup_subsys *ss, struct cgroup *cgrp,
573 573
574Called when a task attach operation has failed after can_attach() has succeeded. 574Called when a task attach operation has failed after can_attach() has succeeded.
575A subsystem whose can_attach() has some side-effects should provide this 575A subsystem whose can_attach() has some side-effects should provide this
576function, so that the subsytem can implement a rollback. If not, not necessary. 576function, so that the subsystem can implement a rollback. If not, not necessary.
577This will be called only about subsystems whose can_attach() operation have 577This will be called only about subsystems whose can_attach() operation have
578succeeded. 578succeeded.
579 579
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt
index 49efae703979..b2cb16ebcb16 100644
--- a/Documentation/kbuild/kconfig.txt
+++ b/Documentation/kbuild/kconfig.txt
@@ -96,7 +96,7 @@ Environment variables for 'silentoldconfig'
96KCONFIG_NOSILENTUPDATE 96KCONFIG_NOSILENTUPDATE
97-------------------------------------------------- 97--------------------------------------------------
98If this variable has a non-blank value, it prevents silent kernel 98If this variable has a non-blank value, it prevents silent kernel
99config udpates (requires explicit updates). 99config updates (requires explicit updates).
100 100
101KCONFIG_AUTOCONFIG 101KCONFIG_AUTOCONFIG
102-------------------------------------------------- 102--------------------------------------------------
diff --git a/Documentation/sysfs-rules.txt b/Documentation/sysfs-rules.txt
index 5d8bc2cd250c..c1a1fd636bf9 100644
--- a/Documentation/sysfs-rules.txt
+++ b/Documentation/sysfs-rules.txt
@@ -125,7 +125,7 @@ versions of the sysfs interface.
125- Block 125- Block
126 The converted block subsystem at /sys/class/block or 126 The converted block subsystem at /sys/class/block or
127 /sys/subsystem/block will contain the links for disks and partitions 127 /sys/subsystem/block will contain the links for disks and partitions
128 at the same level, never in a hierarchy. Assuming the block subsytem to 128 at the same level, never in a hierarchy. Assuming the block subsystem to
129 contain only disks and not partition devices in the same flat list is 129 contain only disks and not partition devices in the same flat list is
130 a bug in the application. 130 a bug in the application.
131 131
diff --git a/Documentation/trace/events.txt b/Documentation/trace/events.txt
index 02ac6ed38b2d..b22000dbc57d 100644
--- a/Documentation/trace/events.txt
+++ b/Documentation/trace/events.txt
@@ -238,7 +238,7 @@ subsystem's filter file.
238 238
239For convenience, filters for every event in a subsystem can be set or 239For convenience, filters for every event in a subsystem can be set or
240cleared as a group by writing a filter expression into the filter file 240cleared as a group by writing a filter expression into the filter file
241at the root of the subsytem. Note however, that if a filter for any 241at the root of the subsystem. Note however, that if a filter for any
242event within the subsystem lacks a field specified in the subsystem 242event within the subsystem lacks a field specified in the subsystem
243filter, or if the filter can't be applied for any other reason, the 243filter, or if the filter can't be applied for any other reason, the
244filter for that event will retain its previous setting. This can 244filter for that event will retain its previous setting. This can
@@ -250,7 +250,7 @@ fields can be guaranteed to propagate successfully to all events.
250Here are a few subsystem filter examples that also illustrate the 250Here are a few subsystem filter examples that also illustrate the
251above points: 251above points:
252 252
253Clear the filters on all events in the sched subsytem: 253Clear the filters on all events in the sched subsystem:
254 254
255# cd /sys/kernel/debug/tracing/events/sched 255# cd /sys/kernel/debug/tracing/events/sched
256# echo 0 > filter 256# echo 0 > filter
@@ -260,7 +260,7 @@ none
260none 260none
261 261
262Set a filter using only common fields for all events in the sched 262Set a filter using only common fields for all events in the sched
263subsytem (all events end up with the same filter): 263subsystem (all events end up with the same filter):
264 264
265# cd /sys/kernel/debug/tracing/events/sched 265# cd /sys/kernel/debug/tracing/events/sched
266# echo common_pid == 0 > filter 266# echo common_pid == 0 > filter
@@ -270,7 +270,7 @@ common_pid == 0
270common_pid == 0 270common_pid == 0
271 271
272Attempt to set a filter using a non-common field for all events in the 272Attempt to set a filter using a non-common field for all events in the
273sched subsytem (all events but those that have a prev_pid field retain 273sched subsystem (all events but those that have a prev_pid field retain
274their old filters): 274their old filters):
275 275
276# cd /sys/kernel/debug/tracing/events/sched 276# cd /sys/kernel/debug/tracing/events/sched