[LV-commit] CVS: kernel-2.5/include/linux elf.h,1.4,1.5 nfs_flushd.h,1.1.1.1,NONE nfsiod.h,1.1.1.1,NONE rpcsock.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-serv25701/include/linux

Modified Files:
	elf.h 
Removed Files:
	nfs_flushd.h nfsiod.h rpcsock.h 
Log Message:
Merge with 2.5.47


Index: elf.h
===================================================================
RCS file: /cvsroot/linux-vax/kernel-2.5/include/linux/elf.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- elf.h	11 May 2003 20:28:23 -0000	1.4
+++ elf.h	15 Jun 2003 23:31:28 -0000	1.5
@@ -1,6 +1,7 @@
 #ifndef _LINUX_ELF_H
 #define _LINUX_ELF_H
 
+#include <linux/sched.h>
 #include <linux/types.h>
 #include <asm/elf.h>
 
@@ -580,7 +581,8 @@
 #define NT_PRFPREG	2
 #define NT_PRPSINFO	3
 #define NT_TASKSTRUCT	4
-#define NT_PRFPXREG	20
+#define NT_PRXFPREG     0x46e62b7f      /* copied from gdb5.1/include/elf/common.h */
+
 
 /* Note header in a PT_NOTE section */
 typedef struct elf32_note {

--- nfs_flushd.h DELETED ---

--- nfsiod.h DELETED ---

--- rpcsock.h DELETED ---