The patch titled
i386 boot: Add an ELF header to bzImage (udpate 2)
has been added to the -mm tree. Its filename is
i386-boot-add-an-elf-header-to-bzimage-update-2.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: i386 boot: Add an ELF header to bzImage (udpate 2)
From: Vivek Goyal <vgoyal@xxxxxxxxxx>
Ok. I changed virtual address to LOAD_PHYSICAL_ADDR. Please find attached
the regenrated patch.
Signed-off-by: Eric W. Biederman <ebiederm@xxxxxxxxxxxx>
Signed-off-by: Vivek Goyal <vgoyal@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/i386/boot/bootsect.S | 2 +-
include/linux/elf_boot.h | 19 -------------------
2 files changed, 1 insertion(+), 20 deletions(-)
diff -puN arch/i386/boot/Makefile~i386-boot-add-an-elf-header-to-bzimage-update-2 arch/i386/boot/Makefile
diff -puN arch/i386/boot/bootsect.S~i386-boot-add-an-elf-header-to-bzimage-update-2 arch/i386/boot/bootsect.S
--- a/arch/i386/boot/bootsect.S~i386-boot-add-an-elf-header-to-bzimage-update-2
+++ a/arch/i386/boot/bootsect.S
@@ -88,7 +88,7 @@ normalize:
phdr:
.int PT_LOAD # p_type
.int (SETUPSECTS+1)*512 # p_offset
- .int LOAD_PHYSICAL_ADDR + __PAGE_OFFSET # p_vaddr
+ .int LOAD_PHYSICAL_ADDR # p_vaddr
.int LOAD_PHYSICAL_ADDR # p_paddr
.int SYSSIZE*16 # p_filesz
.int 0 # p_memsz
diff -puN arch/i386/boot/tools/build.c~i386-boot-add-an-elf-header-to-bzimage-update-2 arch/i386/boot/tools/build.c
diff -puN include/linux/elf_boot.h~i386-boot-add-an-elf-header-to-bzimage-update-2 /dev/null
--- a/include/linux/elf_boot.h
+++ /dev/null
@@ -1,19 +0,0 @@
-#ifndef ELF_BOOT_H
-#define ELF_BOOT_H
-
-/* Elf notes to help bootloaders identify what program they are booting.
- */
-
-/* Standardized Elf image notes for booting... The name for all of these is ELFBoot */
-#define ELF_NOTE_BOOT "ELFBoot"
-
-#define EIN_PROGRAM_NAME 0x00000001
-/* The program in this ELF file */
-#define EIN_PROGRAM_VERSION 0x00000002
-/* The version of the program in this ELF file */
-#define EIN_PROGRAM_CHECKSUM 0x00000003
-/* ip style checksum of the memory image. */
-#define EIN_ARGUMENT_STYLE 0x00000004
-/* String identifying argument passing style */
-
-#endif /* ELF_BOOT_H */
_
Patches currently in -mm which might be from vgoyal@xxxxxxxxxx are
i386-distinguish-absolute-symbols.patch
i386-align-data-section-to-4k-boundary.patch
i386-define-__pa_symbol.patch
i386-setupc-reserve-kernel-memory-starting-from-_text.patch
i386-config_physical_start-cleanup.patch
make-linux-elfh-safe-to-be-included-in-assembly-files.patch
elf-add-elfosabi_standalone-to-elfh.patch
kallsyms-generate-relocatable-symbols.patch
i386-relocatable-kernel-support.patch
i386-implement-config_physical_align.patch
i386-boot-add-an-elf-header-to-bzimage.patch
i386-boot-add-an-elf-header-to-bzimage-fix.patch
i386-boot-add-an-elf-header-to-bzimage-update-2.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
