diff options
| author | Matt Fleming <matt.fleming@intel.com> | 2012-04-02 15:51:45 +0100 |
|---|---|---|
| committer | Matt Fleming <matt.fleming@intel.com> | 2012-04-17 10:58:34 +0100 |
| commit | a523208a0d1bb820d82c5b00125876476453afd1 (patch) | |
| tree | 76383ae526293fc49a209c0ec8e7fcfbda2b1224 | |
| parent | 1149eb499e93e7723ef32362dfa867aff8ab0c23 (diff) | |
| download | syslinux-a523208a0d1bb820d82c5b00125876476453afd1.tar.gz syslinux-a523208a0d1bb820d82c5b00125876476453afd1.tar.xz syslinux-a523208a0d1bb820d82c5b00125876476453afd1.zip | |
ldlinux: Fix number of arguments to start_ldlinux()
Commit 3a316db1 ("ldlinux: Loading a config file should cause
re-initialisation") added a call to start_ldlinux() with an incorrect
number of arguments. Add the prototype to core.h so this error doesn't
go unnoticed again.
Signed-off-by: Matt Fleming <matt.fleming@intel.com>
| -rw-r--r-- | com32/elflink/ldlinux/execute.c | 2 | ||||
| -rw-r--r-- | core/include/core.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/com32/elflink/ldlinux/execute.c b/com32/elflink/ldlinux/execute.c index 7dde6cfa..9a17cf5a 100644 --- a/com32/elflink/ldlinux/execute.c +++ b/com32/elflink/ldlinux/execute.c @@ -96,7 +96,7 @@ void execute(const char *cmdline, enum kernel_type type) if (*args) mangle_name(config_cwd, args); - start_ldlinux("ldlinux.c32", 1, argv); + start_ldlinux(argv); } else if (type == KT_LOCALBOOT) { /* process the image need int 22 support */ ireg.eax.w[0] = 0x0014; /* Local boot */ diff --git a/core/include/core.h b/core/include/core.h index d2aaf72d..c1b26714 100644 --- a/core/include/core.h +++ b/core/include/core.h @@ -99,4 +99,6 @@ static inline void set_flags(com32sys_t *regs, uint32_t flags) regs->eflags.l = eflags; } +extern int start_ldlinux(char **argv); + #endif /* CORE_H */ |