diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2007-10-25 23:09:38 (GMT) |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2007-10-26 03:20:06 (GMT) |
| commit | e6e1ace9904b72478f0c5a5aa7bd174cb6f62561 (patch) | |
| tree | 8858fe4c1d37e4e9278020bf8fba369dfdddd2a7 /arch/x86/boot/boot.h | |
| parent | 6b6815c6d5d1dc209701d1661a7a0e09a295db2f (diff) | |
| download | linux-e6e1ace9904b72478f0c5a5aa7bd174cb6f62561.tar.xz | |
x86 setup: sizeof() is unsigned, unbreak comparisons
We use signed values for limit checking since the values can go
negative under certain circumstances. However, sizeof() is unsigned
and forces the comparison to be unsigned, so move the comparison into
the heap_free() macros so we can ensure it is a signed comparison.
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/x86/boot/boot.h')
| -rw-r--r-- | arch/x86/boot/boot.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/boot/boot.h b/arch/x86/boot/boot.h index 887874f..d2b5adf 100644 --- a/arch/x86/boot/boot.h +++ b/arch/x86/boot/boot.h @@ -216,9 +216,9 @@ static inline char *__get_heap(size_t s, size_t a, size_t n) #define GET_HEAP(type, n) \ ((type *)__get_heap(sizeof(type),__alignof__(type),(n))) -static inline int heap_free(void) +static inline bool heap_free(size_t n) { - return heap_end-HEAP; + return (int)(heap_end-HEAP) >= (int)n; } /* copy.S */ |