diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 13:56:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-26 13:56:01 -0700 |
| commit | 26adc0d5859788b74f86677538236f807e6d9021 (patch) | |
| tree | 78b3c4018161d72b6d8d1f2485c52fc552caa61a /arch/x86/boot/video.c | |
| parent | 0e4bd10c9b7e9ed65132f5935328275deb760384 (diff) | |
| parent | e6e1ace9904b72478f0c5a5aa7bd174cb6f62561 (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/hpa/linux-2.6-x86setup:
x86 setup: sizeof() is unsigned, unbreak comparisons
x86 setup: handle boot loaders which set up the stack incorrectly
Diffstat (limited to 'arch/x86/boot/video.c')
| -rw-r--r-- | arch/x86/boot/video.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/boot/video.c b/arch/x86/boot/video.c index e4ba897bf9a..ad9712f0173 100644 --- a/arch/x86/boot/video.c +++ b/arch/x86/boot/video.c @@ -371,7 +371,7 @@ static void save_screen(void) saved.curx = boot_params.screen_info.orig_x; saved.cury = boot_params.screen_info.orig_y; - if (heap_free() < saved.x*saved.y*sizeof(u16)+512) + if (!heap_free(saved.x*saved.y*sizeof(u16)+512)) return; /* Not enough heap to save the screen */ saved.data = GET_HEAP(u16, saved.x*saved.y); |