diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 08:41:41 -0400 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-06-24 13:07:53 -0400 |
| commit | 816724e65c72a90a44fbad0ef0b59b186c85fa90 (patch) | |
| tree | 421fa29aedff988e392f92780637553e275d37a0 /drivers/acpi/utilities/utmath.c | |
| parent | 70ac4385a13f78bc478f26d317511893741b05bd (diff) | |
| parent | d384ea691fe4ea8c2dd5b9b8d9042eb181776f18 (diff) | |
Merge branch 'master' of /home/trondmy/kernel/linux-2.6/
Conflicts:
fs/nfs/inode.c
fs/super.c
Fix conflicts between patch 'NFS: Split fs/nfs/inode.c' and patch
'VFS: Permit filesystem to override root dentry on mount'
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 | ||