wok-6.x diff syslinux/stuff/iso2exe/bootlinux.c @ rev 14268
syslinux/iso2exe: do not overload (setup) version in bootlinux.c
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Thu Apr 04 11:19:19 2013 +0200 (2013-04-04) |
parents | bf8be127c60b |
children | df021be024df |
line diff
1.1 --- a/syslinux/stuff/iso2exe/bootlinux.c Mon Apr 01 09:45:40 2013 +0200 1.2 +++ b/syslinux/stuff/iso2exe/bootlinux.c Thu Apr 04 11:19:19 2013 +0200 1.3 @@ -166,7 +166,7 @@ 1.4 unsigned long loadkernel(void) 1.5 { 1.6 unsigned setup, n = BUFFERSZ; 1.7 - unsigned long syssize = 0, version = 0; 1.8 + unsigned long syssize = 0, kernel_version = 0; 1.9 1.10 do { 1.11 isoread(buffer, n); 1.12 @@ -267,11 +267,11 @@ 1.13 shld edx, eax, #8 1.14 loop next 1.15 pop ds 1.16 - mov .loadkernel.version[bp], edx 1.17 + mov .loadkernel.kernel_version[bp], edx 1.18 noversion: 1.19 #endasm 1.20 load(&kernelmem, syssize); 1.21 - return version; 1.22 + return kernel_version; 1.23 } 1.24 1.25 void loadinitrd(void)