[LV-commit] CVS: kernel-2.5/include/linux elf.h,1.15,1.16 wrapper.h,1.1.1.1,NONE

[Kenn H. <ke...@us...>]

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1:/tmp/cvs-serv16408/include/linux

Modified Files:
	elf.h 
Removed Files:
	wrapper.h 
Log Message:
Merge with 2.5.69


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- elf.h	26 Aug 2003 23:59:56 -0000	1.15
+++ elf.h	28 Aug 2003 00:42:08 -0000	1.16
@@ -29,8 +29,11 @@
 #define PT_NOTE    4
 #define PT_SHLIB   5
 #define PT_PHDR    6
+#define PT_LOOS	   0x60000000
+#define PT_HIOS	   0x6fffffff
 #define PT_LOPROC  0x70000000
 #define PT_HIPROC  0x7fffffff
+#define PT_GNU_EH_FRAME		0x6474e550
 #define PT_MIPS_REGINFO		0x70000000
 
 /* Flags in the e_flags field of the header */

--- wrapper.h DELETED ---