diff options
author | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2010-02-10 15:59:46 -0800 |
commit | e8d0e6fb18aae44474e864d8040d5ed44ff6acab (patch) | |
tree | 547115848f342060950112d85b83706ef12fd800 /gpxe/src/arch/i386/drivers/net/undiload.c | |
parent | 5396e250a679c368b3dd353c730358d6c54960c8 (diff) | |
parent | 2dafb8402ed666b37f96f6e1579a99b8a8c85452 (diff) | |
download | syslinux-e8d0e6fb18aae44474e864d8040d5ed44ff6acab.tar.gz |
Merge branch 'fsc' into pathbased
Resolved Conflicts:
core/fs/ext2/ext2.c
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'gpxe/src/arch/i386/drivers/net/undiload.c')
-rw-r--r-- | gpxe/src/arch/i386/drivers/net/undiload.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/gpxe/src/arch/i386/drivers/net/undiload.c b/gpxe/src/arch/i386/drivers/net/undiload.c index dbd9e7c2..1d4e88d7 100644 --- a/gpxe/src/arch/i386/drivers/net/undiload.c +++ b/gpxe/src/arch/i386/drivers/net/undiload.c @@ -16,6 +16,8 @@ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +FILE_LICENCE ( GPL2_OR_LATER ); + #include <stdint.h> #include <stdlib.h> #include <string.h> @@ -90,11 +92,10 @@ int undi_load ( struct undi_device *undi, struct undi_rom *undirom ) { undi_loader_entry = undirom->loader_entry; __asm__ __volatile__ ( REAL_CODE ( "pushw %%ds\n\t" "pushw %%ax\n\t" - "lcall *%c2\n\t" + "lcall *undi_loader_entry\n\t" "addw $4, %%sp\n\t" ) : "=a" ( exit ) - : "a" ( __from_data16 ( &undi_loader ) ), - "p" ( __from_data16 ( &undi_loader_entry ) ) + : "a" ( __from_data16 ( &undi_loader ) ) : "ebx", "ecx", "edx", "esi", "edi", "ebp" ); /* UNDI API calls may rudely change the status of A20 and not |