summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorAndrew Morton <akpm@digeo.com>2003-05-25 01:15:16 -0700
committerLinus Torvalds <torvalds@home.transmeta.com>2003-05-25 01:15:16 -0700
commit2de9a7416201f8d71c79a4d82e033e2f48a648b0 (patch)
treea0c7ed3370e41f06323c8ba2e7bab5b4dfd81bc5 /include
parent1c9b29ce227144d6c6b91021dde1b228c8572287 (diff)
[PATCH] ACPI constant overflow fixes
From: William Lee Irwin III <wli@holomorphy.com> 64-bit ACPI fixes
Diffstat (limited to 'include')
-rw-r--r--include/acpi/actypes.h14
1 files changed, 9 insertions, 5 deletions
diff --git a/include/acpi/actypes.h b/include/acpi/actypes.h
index 875bee2947a8..d077d7419682 100644
--- a/include/acpi/actypes.h
+++ b/include/acpi/actypes.h
@@ -51,10 +51,10 @@
/*
* Data type ranges
*/
-#define ACPI_UINT8_MAX (UINT8) 0xFF
-#define ACPI_UINT16_MAX (UINT16) 0xFFFF
-#define ACPI_UINT32_MAX (UINT32) 0xFFFFFFFF
-#define ACPI_UINT64_MAX (UINT64) 0xFFFFFFFFFFFFFFFF
+#define ACPI_UINT8_MAX (~((UINT8) 0))
+#define ACPI_UINT16_MAX (~((UINT16) 0))
+#define ACPI_UINT32_MAX (~((UINT32) 0))
+#define ACPI_UINT64_MAX (~((UINT64) 0))
#define ACPI_ASCII_MAX 0x7F
@@ -313,7 +313,11 @@ typedef u32 acpi_integer;
typedef u64 acpi_integer;
#define ACPI_INTEGER_MAX ACPI_UINT64_MAX
#define ACPI_INTEGER_BIT_SIZE 64
-#define ACPI_MAX_BCD_VALUE 9999999999999999
+#if ACPI_MACHINE_WIDTH == 64
+#define ACPI_MAX_BCD_VALUE 9999999999999999UL
+#else
+#define ACPI_MAX_BCD_VALUE 9999999999999999ULL
+#endif
#define ACPI_MAX_BCD_DIGITS 16
#define ACPI_MAX_DECIMAL_DIGITS 19