diff options
| author | Stefan Reinauer <reinauer@chromium.org> | 2012-03-30 13:00:46 -0700 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2012-04-02 18:39:48 +0200 |
| commit | d40393e3903e57496afcfc88ec094ae17f0e9437 (patch) | |
| tree | bf61b86b52b0010abeced7d0b9525066794edb34 | |
| parent | 9aea04aa892903009e487ada7f7b911691e68630 (diff) | |
| download | coreboot-d40393e3903e57496afcfc88ec094ae17f0e9437.tar.xz | |
Align: Make sure 1 is treated as unsigned long instead of int
... and drop duplicate definition in via/epia-n code.
Change-Id: Id79daaaa35c4d412c8c1f621a3638d129681d331
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/820
Tested-by: build bot (Jenkins)
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
| -rw-r--r-- | src/include/stdlib.h | 2 | ||||
| -rw-r--r-- | src/mainboard/via/epia-n/acpi_tables.c | 4 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/include/stdlib.h b/src/include/stdlib.h index 45420d7876..5465c14f92 100644 --- a/src/include/stdlib.h +++ b/src/include/stdlib.h @@ -5,7 +5,7 @@ #define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0])) -#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) +#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1UL) #define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) #define MIN(a,b) ((a) < (b) ? (a) : (b)) diff --git a/src/mainboard/via/epia-n/acpi_tables.c b/src/mainboard/via/epia-n/acpi_tables.c index 589e14c606..b4966bb1db 100644 --- a/src/mainboard/via/epia-n/acpi_tables.c +++ b/src/mainboard/via/epia-n/acpi_tables.c @@ -118,10 +118,6 @@ unsigned long acpi_fill_srat(unsigned long current) return current; } -#define ALIGN(x,a) __ALIGN_MASK(x,(typeof(x))(a)-1) -#define __ALIGN_MASK(x,mask) (((x)+(mask))&~(mask)) -#define ALIGN_CURRENT current = ((current + 0x0f) & -0x10) - unsigned long write_acpi_tables(unsigned long start) { unsigned long current; |