summaryrefslogtreecommitdiffstats
path: root/Documentation/power/freezing-of-tasks.txt
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-02-08 00:04:15 +0100
committerOlof Johansson <olof@lixom.net>2012-02-08 00:05:20 +0100
commita5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13 (patch)
treecce7eab28de00a88d75b8eda704f5838e10947b1 /Documentation/power/freezing-of-tasks.txt
parentMerge branch 'amba' into for-armsoc (diff)
parentLinux 3.3-rc2 (diff)
downloadlinux-a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13.tar.xz
linux-a5f17d1f4c2831b9b9bf8b1a537cdbac995d6e13.zip
Merge tag 'v3.3-rc2' into depends/rmk/for-armsoc
There were conflicts between fixes going in after 3.3-rc1 and Russell's stable arm-soc base branch. Resolving it in the dependency branch so that each topic branch shares the same resolution. Conflicts: arch/arm/mach-at91/at91cap9.c arch/arm/mach-at91/at91sam9g45.c
Diffstat (limited to 'Documentation/power/freezing-of-tasks.txt')
-rw-r--r--Documentation/power/freezing-of-tasks.txt8
1 files changed, 4 insertions, 4 deletions
diff --git a/Documentation/power/freezing-of-tasks.txt b/Documentation/power/freezing-of-tasks.txt
index 6ccb68f68da6..ebd7490ef1df 100644
--- a/Documentation/power/freezing-of-tasks.txt
+++ b/Documentation/power/freezing-of-tasks.txt
@@ -120,10 +120,10 @@ So in practice, the 'at all' may become a 'why freeze kernel threads?' and
freezing user threads I don't find really objectionable."
Still, there are kernel threads that may want to be freezable. For example, if
-a kernel that belongs to a device driver accesses the device directly, it in
-principle needs to know when the device is suspended, so that it doesn't try to
-access it at that time. However, if the kernel thread is freezable, it will be
-frozen before the driver's .suspend() callback is executed and it will be
+a kernel thread that belongs to a device driver accesses the device directly, it
+in principle needs to know when the device is suspended, so that it doesn't try
+to access it at that time. However, if the kernel thread is freezable, it will
+be frozen before the driver's .suspend() callback is executed and it will be
thawed after the driver's .resume() callback has run, so it won't be accessing
the device while it's suspended.