diff options
| author | Bob Moore <robert.moore@intel.com> | 2010-09-15 14:00:53 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2010-10-01 01:47:55 -0400 |
| commit | e786db75406b30fa74dea095c571c8c164a2f3dd (patch) | |
| tree | bb66c29a0981e781f6e16bde89b33091887cf05c | |
| parent | 28eb3fcf8762a3b52f4fef5af29dce50d23c7151 (diff) | |
| download | op-kernel-dev-e786db75406b30fa74dea095c571c8c164a2f3dd.zip op-kernel-dev-e786db75406b30fa74dea095c571c8c164a2f3dd.tar.gz | |
ACPICA: Update math module; no functional change
Move the 64-bit overlay structures to the utmath module since
they are used nowhere else. Update module comment. ACPICA BZ 829.
http://www.acpica.org/bugzilla/show_bug.cgi?id=829
Signed-off-by: Bob Moore <robert.moore@intel.com>
Signed-off-by: Lin Ming <ming.m.lin@intel.com>
Signed-off-by: Len Brown <len.brown@intel.com>
| -rw-r--r-- | drivers/acpi/acpica/utmath.c | 23 | ||||
| -rw-r--r-- | include/acpi/actypes.h | 10 |
2 files changed, 20 insertions, 13 deletions
diff --git a/drivers/acpi/acpica/utmath.c b/drivers/acpi/acpica/utmath.c index 35059a1..49cf7b7 100644 --- a/drivers/acpi/acpica/utmath.c +++ b/drivers/acpi/acpica/utmath.c @@ -48,11 +48,27 @@ ACPI_MODULE_NAME("utmath") /* - * Support for double-precision integer divide. This code is included here - * in order to support kernel environments where the double-precision math - * library is not available. + * Optional support for 64-bit double-precision integer divide. This code + * is configurable and is implemented in order to support 32-bit kernel + * environments where a 64-bit double-precision math library is not available. + * + * Support for a more normal 64-bit divide/modulo (with check for a divide- + * by-zero) appears after this optional section of code. */ #ifndef ACPI_USE_NATIVE_DIVIDE +/* Structures used only for 64-bit divide */ +typedef struct uint64_struct { + u32 lo; + u32 hi; + +} uint64_struct; + +typedef union uint64_overlay { + u64 full; + struct uint64_struct part; + +} uint64_overlay; + /******************************************************************************* * * FUNCTION: acpi_ut_short_divide @@ -69,6 +85,7 @@ ACPI_MODULE_NAME("utmath") * 32-bit remainder. * ******************************************************************************/ + acpi_status acpi_ut_short_divide(u64 dividend, u32 divisor, u64 *out_quotient, u32 *out_remainder) diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h index 864cfae..2b134b6 100644 --- a/include/acpi/actypes.h +++ b/include/acpi/actypes.h @@ -378,16 +378,6 @@ typedef void *acpi_handle; /* Actually a ptr to a NS Node */ typedef u8 acpi_owner_id; #define ACPI_OWNER_ID_MAX 0xFF -struct uint64_struct { - u32 lo; - u32 hi; -}; - -union uint64_overlay { - u64 full; - struct uint64_struct part; -}; - #define ACPI_INTEGER_BIT_SIZE 64 #define ACPI_MAX_DECIMAL_DIGITS 20 /* 2^64 = 18,446,744,073,709,551,616 */ |
