diff options
| author | Lv Zheng <lv.zheng@intel.com> | 2012-10-31 06:25:52 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2012-11-15 03:31:23 +0400 |
| commit | 86ff0e508f88eda6e479a897476026055831d2d8 (patch) | |
| tree | b041d08418a9c4699e08d79708220567ac4450ed /drivers/acpi/acpica/psloop.c | |
| parent | 1f86e8c1c9f129d450fd75e42d25ddba69a522ac (diff) | |
| download | linux-86ff0e508f88eda6e479a897476026055831d2d8.tar.xz | |
ACPICA: Fix unmerged acmacros.h divergences.
The 20121018 release depends on some unmerged acmaros.h fixes.
This patch includes the fixes made on acmaros.h that will not affect
the generated vmlinux binary.
This patch will not affect the generated vmlinux binary.
This will decrease 157 lines of 20120913 divergence.diff.
Signed-off-by: Lv Zheng <lv.zheng@intel.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'drivers/acpi/acpica/psloop.c')
| -rw-r--r-- | drivers/acpi/acpica/psloop.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/drivers/acpi/acpica/psloop.c b/drivers/acpi/acpica/psloop.c index 799162c1b6df..31e2e9fb2def 100644 --- a/drivers/acpi/acpica/psloop.c +++ b/drivers/acpi/acpica/psloop.c @@ -843,8 +843,6 @@ acpi_ps_complete_op(struct acpi_walk_state *walk_state, *op = NULL; } - ACPI_PREEMPTION_POINT(); - return_ACPI_STATUS(AE_OK); } |