Merge branch 'master' into new-shuffler

Conflicts:
	com32/lib/syslinux/memmap.c

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

15 files changed, 25 insertions, 10 deletions

diff --git a/core/Makefile b/core/Makefile
index ce9fd453..14bb6d0b 100644
--- a/core/Makefile
+++ b/core/Makefile
@@ -1,6 +1,7 @@
 ## -----------------------------------------------------------------------
 ##
 ##   Copyright 1998-2009 H. Peter Anvin - All Rights Reserved
+##   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ##
 ##   This program is free software; you can redistribute it and/or modify
 ##   it under the terms of the GNU General Public License as published by
diff --git a/core/abort.inc b/core/abort.inc
index 19cc6419..d8cd7f24 100644
--- a/core/abort.inc
+++ b/core/abort.inc
@@ -1,6 +1,7 @@
 ; -----------------------------------------------------------------------
 ;
-;   Copyright 2005-2008 H. Peter Anvin - All Rights Reserved
+;   Copyright 2005-2009 H. Peter Anvin - All Rights Reserved
+;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;
 ;   This program is free software; you can redistribute it and/or modify
 ;   it under the terms of the GNU General Public License as published by
diff --git a/core/bootsect.inc b/core/bootsect.inc
index 8480e14f..c7d82a49 100644
--- a/core/bootsect.inc
+++ b/core/bootsect.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
 ;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/com32.inc b/core/com32.inc
index e6543fcd..28e8d528 100644
--- a/core/com32.inc
+++ b/core/com32.inc
@@ -172,13 +172,14 @@ com32_call_start:
 
 		; Now everything is set up for interrupts...
 
+		push dword [HighMemSize]	; Memory managed by Syslinux
 		push dword com32_cfarcall	; Cfarcall entry point
 		push dword com32_farcall	; Farcall entry point
 		push dword (1 << 16)		; 64K bounce buffer
 		push dword (comboot_seg << 4)	; Bounce buffer address
 		push dword com32_intcall	; Intcall entry point
 		push dword command_line		; Command line pointer
-		push dword 6			; Argument count
+		push dword 7			; Argument count
 		sti				; Interrupts OK now
 		call pm_entry			; Run the program...
 		; ... on return, fall through to com32_exit ...
diff --git a/core/comboot.inc b/core/comboot.inc
index 8226d478..452076c6 100644
--- a/core/comboot.inc
+++ b/core/comboot.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
 ;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/extlinux.asm b/core/extlinux.asm
index 5c6c023c..833cb2b0 100644
--- a/core/extlinux.asm
+++ b/core/extlinux.asm
@@ -5,7 +5,8 @@
 ;
 ;  A program to boot Linux kernels off an ext2/ext3 filesystem.
 ;
-;   Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
@@ -1553,7 +1554,7 @@ build_curdir_str:
 		section .data
 copyright_str   db ' Copyright (C) 1994-'
 		asciidec YEAR
-		db ' H. Peter Anvin and contributors', CR, LF, 0
+		db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed	db CR, LF, 'Boot failed: please change disks and press '
 		db 'a key to continue.', CR, LF, 0
 config_name	db 'extlinux.conf',0		; Unmangled form
diff --git a/core/getc.inc b/core/getc.inc
index 3fb88566..bb12047b 100644
--- a/core/getc.inc
+++ b/core/getc.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
-;;   Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/isolinux.asm b/core/isolinux.asm
index 2da96d4a..e3599d9c 100644
--- a/core/isolinux.asm
+++ b/core/isolinux.asm
@@ -9,6 +9,7 @@
 ;  floppies.
 ;
 ;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
@@ -1029,7 +1030,7 @@ writestr_early	equ writestr
 syslinux_banner	db CR, LF, 'ISOLINUX ', VERSION_STR, ' ', DATE_STR, ' ', 0
 copyright_str   db ' Copyright (C) 1994-'
 		asciidec YEAR
-		db ' H. Peter Anvin and contributors', CR, LF, 0
+		db ' H. Peter Anvin et al', CR, LF, 0
 isolinux_str	db 'isolinux: ', 0
 %ifdef DEBUG_MESSAGES
 startup_msg:	db 'Starting up, DL = ', 0
diff --git a/core/ldlinux.asm b/core/ldlinux.asm
index b05a7e1c..72a6d15d 100644
--- a/core/ldlinux.asm
+++ b/core/ldlinux.asm
@@ -12,6 +12,7 @@
 ;  umsdos filesystem.
 ;
 ;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
@@ -2056,7 +2057,7 @@ getfatsector:
 		section .data
 copyright_str   db ' Copyright (C) 1994-'
 		asciidec YEAR
-		db ' H. Peter Anvin and contributors', CR, LF, 0
+		db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed	db CR, LF, 'Boot failed: please change disks and press '
 		db 'a key to continue.', CR, LF, 0
 syslinux_cfg1	db '/boot'			; /boot/syslinux/syslinux.cfg
diff --git a/core/loadhigh.inc b/core/loadhigh.inc
index 21d4cc6f..8ff9da1c 100644
--- a/core/loadhigh.inc
+++ b/core/loadhigh.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
-;;   Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/parsecmd.inc b/core/parsecmd.inc
index a7a00d5a..e63c205e 100644
--- a/core/parsecmd.inc
+++ b/core/parsecmd.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
 ;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/parseconfig.inc b/core/parseconfig.inc
index 37fe97fe..0ea1f137 100644
--- a/core/parseconfig.inc
+++ b/core/parseconfig.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
 ;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/pxelinux.asm b/core/pxelinux.asm
index 6a38e5fe..82240226 100644
--- a/core/pxelinux.asm
+++ b/core/pxelinux.asm
@@ -8,6 +8,7 @@
 ;  MS-DOS floppies.
 ;
 ;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;
 ;  This program is free software; you can redistribute it and/or modify
 ;  it under the terms of the GNU General Public License as published by
@@ -2657,7 +2658,7 @@ writestr_early	equ writestr
 
 copyright_str   db ' Copyright (C) 1994-'
 		asciidec YEAR
-		db ' H. Peter Anvin and contributors', CR, LF, 0
+		db ' H. Peter Anvin et al', CR, LF, 0
 err_bootfailed	db CR, LF, 'Boot failed: press a key to retry, or wait for reset...', CR, LF, 0
 bailmsg		equ err_bootfailed
 err_nopxe	db "No !PXE or PXENV+ API found; we're dead...", CR, LF, 0
diff --git a/core/runkernel.inc b/core/runkernel.inc
index dbb9a374..8dbcd4bd 100644
--- a/core/runkernel.inc
+++ b/core/runkernel.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
 ;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by
diff --git a/core/ui.inc b/core/ui.inc
index 937dd526..d59143bb 100644
--- a/core/ui.inc
+++ b/core/ui.inc
@@ -1,6 +1,7 @@
 ;; -----------------------------------------------------------------------
 ;;
-;;   Copyright 1994-2008 H. Peter Anvin - All Rights Reserved
+;;   Copyright 1994-2009 H. Peter Anvin - All Rights Reserved
+;;   Copyright 2009 Intel Corporation; author: H. Peter Anvin
 ;;
 ;;   This program is free software; you can redistribute it and/or modify
 ;;   it under the terms of the GNU General Public License as published by