diff options
| author | Mark Brown <broonie@kernel.org> | 2020-12-04 20:39:45 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2020-12-04 20:39:45 +0000 |
| commit | 4ecc08b2f51d874f35185724eda769492b60a18d (patch) | |
| tree | f4d9e97304e9ff423fd4efa5193a1b94ebfc5912 /kernel/power/process.c | |
| parent | 0b3355b070434f9901f641aac9000df93e2c96ad (diff) | |
| parent | 0d2bf11a6b3e275a526b8d42d8d4a3a6067cf953 (diff) | |
Merge tag 'auxbus-5.11-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core into asoc-5.11
Auxiliary Bus support tag for 5.11-rc1
This is a signed tag for other subsystems to be able to pull in the
auxiliary bus support into their trees for the 5.11-rc1 merge.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/power/process.c')
| -rw-r--r-- | kernel/power/process.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/power/process.c b/kernel/power/process.c index 4b6a54da7e65..45b054b7b5ec 100644 --- a/kernel/power/process.c +++ b/kernel/power/process.c @@ -146,7 +146,7 @@ int freeze_processes(void) BUG_ON(in_atomic()); /* - * Now that the whole userspace is frozen we need to disbale + * Now that the whole userspace is frozen we need to disable * the OOM killer to disallow any further interference with * killable tasks. There is no guarantee oom victims will * ever reach a point they go away we have to wait with a timeout. |