[LV-k25-commit] kernel-2.5/include/linux elf.h,1.23,1.24

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

Update of /cvsroot/linux-vax/kernel-2.5/include/linux
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12986/include/linux

Modified Files:
	elf.h 
Log Message:
Merge with 2.6.11


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- elf.h	2 Sep 2004 19:51:19 -0000	1.23
+++ elf.h	27 Mar 2005 23:46:48 -0000	1.24
@@ -36,8 +36,9 @@
 #define PT_NOTE    4
 #define PT_SHLIB   5
 #define PT_PHDR    6
-#define PT_LOOS	   0x60000000
-#define PT_HIOS	   0x6fffffff
+#define PT_TLS     7               /* Thread local storage segment */
+#define PT_LOOS    0x60000000      /* OS-specific */
+#define PT_HIOS    0x6fffffff      /* OS-specific */
 #define PT_LOPROC  0x70000000
 #define PT_HIPROC  0x7fffffff
 #define PT_GNU_EH_FRAME		0x6474e550
@@ -106,6 +107,8 @@
  */
 #define EM_S390_OLD     0xA390
 
+#define EM_FRV		0x5441		/* Fujitsu FR-V */
+
 /* This is the info that is needed to parse the dynamic section of the file */
 #define DT_NULL		0
 #define DT_NEEDED	1