diff options
| author | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 07:18:36 +0200 |
|---|---|---|
| committer | Benjamin Herrenschmidt <benh@kernel.crashing.org> | 2010-10-13 07:18:36 +0200 |
| commit | 4783f393de3077211c14675a0e57c8a02e9190b0 (patch) | |
| tree | 6c37d8664eb072fd026db3706481d771da4495ca /drivers/acpi/processor_perflib.c | |
| parent | powerpc/perf: Fix sampling enable for PPC970 (diff) | |
| parent | powerpc/ppc64e: Fix link problem when building ppc64e_defconfig (diff) | |
| download | linux-4783f393de3077211c14675a0e57c8a02e9190b0.tar.xz linux-4783f393de3077211c14675a0e57c8a02e9190b0.zip | |
Merge remote branch 'kumar/merge' into next
Diffstat (limited to 'drivers/acpi/processor_perflib.c')
| -rw-r--r-- | drivers/acpi/processor_perflib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/processor_perflib.c b/drivers/acpi/processor_perflib.c index ba1bd263d903..3a73a93596e8 100644 --- a/drivers/acpi/processor_perflib.c +++ b/drivers/acpi/processor_perflib.c @@ -447,8 +447,8 @@ int acpi_processor_notify_smm(struct module *calling_module) if (!try_module_get(calling_module)) return -EINVAL; - /* is_done is set to negative if an error occured, - * and to postitive if _no_ error occured, but SMM + /* is_done is set to negative if an error occurred, + * and to postitive if _no_ error occurred, but SMM * was already notified. This avoids double notification * which might lead to unexpected results... */ |