From 8e68069b485846b2e9ae95742c04e75aa388d0ad Mon Sep 17 00:00:00 2001 From: chaac Date: Tue, 2 May 2006 20:46:24 +0000 Subject: [PATCH] 2006-05-02 Vesa Jaaskelainen * stage2/shared.h (vbe_mode): Back ported aligment fix from GRUB 2 to GRUB Legacy. Problem reported by Gerardo Richarte. --- ChangeLog | 5 +++++ stage2/shared.h | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 6382cb772..fca765cd5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-05-02 Vesa Jaaskelainen + + * stage2/shared.h (vbe_mode): Back ported aligment fix from GRUB 2 + to GRUB Legacy. Problem reported by Gerardo Richarte. + 2006-04-23 Robert Millan * grub/asmstub.c (get_diskinfo): Optimize sysctl routine. diff --git a/stage2/shared.h b/stage2/shared.h index 77eef11fc..609549a50 100644 --- a/stage2/shared.h +++ b/stage2/shared.h @@ -499,7 +499,11 @@ struct vbe_mode unsigned char linear_reserved_field_position; unsigned long max_pixel_clock; - unsigned char reserved3[189]; + /* Reserved field to make structure to be 256 bytes long, VESA BIOS + Extension 3.0 Specification says to reserve 189 bytes here but + that doesn't make structure to be 256 bytes. So additional one is + added here. */ + unsigned char reserved3[189 + 1]; } __attribute__ ((packed));