aboutsummaryrefslogtreecommitdiffstats
path: root/com32/gfxboot
diff options
context:
space:
mode:
authorMatt Fleming <matt.fleming@intel.com>2012-07-19 16:03:19 +0100
committerMatt Fleming <matt.fleming@intel.com>2012-07-19 16:07:01 +0100
commit7cc3ba019aee913d09e7bf0b6711da2e1f6b2db4 (patch)
tree944e4a5f9967abe993c47d66bf89b4e0ef8cfb07 /com32/gfxboot
parentf351d07ddc7f1d7ed786d88f5725db20ef288439 (diff)
parent0a0e0e41cad93cd16c323cf16f40264a21eedd6c (diff)
downloadsyslinux-7cc3ba019aee913d09e7bf0b6711da2e1f6b2db4.tar.gz
syslinux-7cc3ba019aee913d09e7bf0b6711da2e1f6b2db4.tar.xz
syslinux-7cc3ba019aee913d09e7bf0b6711da2e1f6b2db4.zip
Merge branch 'master' into elflink
The reason for this merge is that we need the fix to core/fs/cache.c without which we can potentially dereference an invalid pointer. The below conflict is a result of the new setup_data blob code being merged from the master branch. Conflicts: com32/lib/Makefile
Diffstat (limited to 'com32/gfxboot')
-rw-r--r--com32/gfxboot/gfxboot.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/com32/gfxboot/gfxboot.c b/com32/gfxboot/gfxboot.c
index 35d180a6..aa05caf8 100644
--- a/com32/gfxboot/gfxboot.c
+++ b/com32/gfxboot/gfxboot.c
@@ -962,7 +962,7 @@ void boot_entry(menu_t *menu_ptr, char *arg)
gfx_done();
- syslinux_boot_linux(kernel, kernel_size, initrd, arg);
+ syslinux_boot_linux(kernel, kernel_size, initrd, NULL, arg);
}