diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:52:36 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-23 10:52:36 -0400 |
| commit | 37224470c8c6d90a4062e76a08d4dc1fcf91fc89 (patch) | |
| tree | 627f537177bf8e951c12bec04c4a85f0125f5ece /drivers/acpi/utilities/utmath.c | |
| parent | e83319510b04dd51a60da8a0b4ccf8b92b3ab1ad (diff) | |
| parent | ae6c859b7dcd708efadf1c76279c33db213e3506 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6: (65 commits)
ACPI: suppress power button event on S3 resume
ACPI: resolve merge conflict between sem2mutex and processor_perflib.c
ACPI: use for_each_possible_cpu() instead of for_each_cpu()
ACPI: delete newly added debugging macros in processor_perflib.c
ACPI: UP build fix for bugzilla-5737
Enable P-state software coordination via _PDC
P-state software coordination for speedstep-centrino
P-state software coordination for acpi-cpufreq
P-state software coordination for ACPI core
ACPI: create acpi_thermal_resume()
ACPI: create acpi_fan_suspend()/acpi_fan_resume()
ACPI: pass pm_message_t from acpi_device_suspend() to root_suspend()
ACPI: create acpi_device_suspend()/acpi_device_resume()
ACPI: replace spin_lock_irq with mutex for ec poll mode
ACPI: Allow a WAN module enable/disable on a Thinkpad X60.
sem2mutex: acpi, acpi_link_lock
ACPI: delete unused acpi_bus_drivers_lock
sem2mutex: drivers/acpi/processor_perflib.c
ACPI add ia64 exports to build acpi_memhotplug as a module
ACPI: asus_acpi_init(): propagate correct return value
...
Manual resolve of conflicts in:
arch/i386/kernel/cpu/cpufreq/acpi-cpufreq.c
arch/i386/kernel/cpu/cpufreq/speedstep-centrino.c
include/acpi/processor.h
Diffstat (limited to 'drivers/acpi/utilities/utmath.c')
| -rw-r--r-- | drivers/acpi/utilities/utmath.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/acpi/utilities/utmath.c b/drivers/acpi/utilities/utmath.c index 4a3360484e72..19d74bedce27 100644 --- a/drivers/acpi/utilities/utmath.c +++ b/drivers/acpi/utilities/utmath.c | |||
| @@ -77,7 +77,7 @@ acpi_ut_short_divide(acpi_integer dividend, | |||
| 77 | union uint64_overlay quotient; | 77 | union uint64_overlay quotient; |
| 78 | u32 remainder32; | 78 | u32 remainder32; |
| 79 | 79 | ||
| 80 | ACPI_FUNCTION_TRACE("ut_short_divide"); | 80 | ACPI_FUNCTION_TRACE(ut_short_divide); |
| 81 | 81 | ||
| 82 | /* Always check for a zero divisor */ | 82 | /* Always check for a zero divisor */ |
| 83 | 83 | ||
| @@ -139,7 +139,7 @@ acpi_ut_divide(acpi_integer in_dividend, | |||
| 139 | union uint64_overlay partial2; | 139 | union uint64_overlay partial2; |
| 140 | union uint64_overlay partial3; | 140 | union uint64_overlay partial3; |
| 141 | 141 | ||
| 142 | ACPI_FUNCTION_TRACE("ut_divide"); | 142 | ACPI_FUNCTION_TRACE(ut_divide); |
| 143 | 143 | ||
| 144 | /* Always check for a zero divisor */ | 144 | /* Always check for a zero divisor */ |
| 145 | 145 | ||
| @@ -261,7 +261,7 @@ acpi_ut_short_divide(acpi_integer in_dividend, | |||
| 261 | acpi_integer * out_quotient, u32 * out_remainder) | 261 | acpi_integer * out_quotient, u32 * out_remainder) |
| 262 | { | 262 | { |
| 263 | 263 | ||
| 264 | ACPI_FUNCTION_TRACE("ut_short_divide"); | 264 | ACPI_FUNCTION_TRACE(ut_short_divide); |
| 265 | 265 | ||
| 266 | /* Always check for a zero divisor */ | 266 | /* Always check for a zero divisor */ |
| 267 | 267 | ||
| @@ -287,7 +287,7 @@ acpi_ut_divide(acpi_integer in_dividend, | |||
| 287 | acpi_integer in_divisor, | 287 | acpi_integer in_divisor, |
| 288 | acpi_integer * out_quotient, acpi_integer * out_remainder) | 288 | acpi_integer * out_quotient, acpi_integer * out_remainder) |
| 289 | { | 289 | { |
| 290 | ACPI_FUNCTION_TRACE("ut_divide"); | 290 | ACPI_FUNCTION_TRACE(ut_divide); |
| 291 | 291 | ||
| 292 | /* Always check for a zero divisor */ | 292 | /* Always check for a zero divisor */ |
| 293 | 293 | ||