about summary refs log tree commit diff
diff options
context:
space:
mode:
authorUlrich Drepper <drepper@gmail.com>2011-08-11 13:02:45 -0400
committerUlrich Drepper <drepper@gmail.com>2011-08-11 13:02:45 -0400
commit2df1f7be58b2dfc80d29e7d53415df48949340ce (patch)
tree6f46f61265fd287cfb5123e4059eb5dae2d1d572
parent14d96785125abee5e9a49a1c3037f35a581750bd (diff)
parent6761ac045dd33da3e0e5c79b0879a0d7406b439e (diff)
downloadglibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.tar.gz
glibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.tar.xz
glibc-2df1f7be58b2dfc80d29e7d53415df48949340ce.zip
Merge branch 'master' of ssh://sourceware.org/git/glibc
Conflicts:
	ChangeLog
-rw-r--r--ChangeLog8
-rw-r--r--sysdeps/unix/sysv/linux/ia64/sys/ptrace.h2
-rw-r--r--sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h2
-rw-r--r--sysdeps/unix/sysv/linux/s390/sys/ptrace.h2
-rw-r--r--sysdeps/unix/sysv/linux/sparc/sys/ptrace.h2
5 files changed, 12 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 8ac7d9d0a5..c8bb204868 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -6,6 +6,14 @@
 	* dirent/scandirat64.c (SCANDIRAT): Remove underscores.
 	* sysdeps/unix/sysv/linux/i386/scandir64.c (SCANDIRAT): Likewise.
 
+2011-08-10  David S. Miller  <davem@davemloft.net>
+
+	* sysdeps/unix/sysv/linux/ia64/sys/ptrace.h: Add missing comma in
+	enum.
+	* sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h: Likewise.
+	* sysdeps/unix/sysv/linux/s390/sys/ptrace.h: Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sys/ptrace.h: Likewise.
+
 2011-08-09  Ulrich Drepper  <drepper@gmail.com>
 
 	* Versions.def [libc]: Add GLIBC_2.15.
diff --git a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
index c1874ee1f5..82d8843ce8 100644
--- a/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/ia64/sys/ptrace.h
@@ -108,7 +108,7 @@ enum __ptrace_request
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */
diff --git a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
index 18c6e09b91..da58035057 100644
--- a/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/powerpc/sys/ptrace.h
@@ -95,7 +95,7 @@ enum __ptrace_request
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */
diff --git a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
index 87eba90f64..bed48af09b 100644
--- a/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/s390/sys/ptrace.h
@@ -134,7 +134,7 @@ enum __ptrace_request
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */
diff --git a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
index a066f71ee3..e25090ea8e 100644
--- a/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
+++ b/sysdeps/unix/sysv/linux/sparc/sys/ptrace.h
@@ -179,7 +179,7 @@ enum __ptrace_request
 #define PT_GETSIGINFO PTRACE_GETSIGINFO
 
   /* Set new siginfo for process.  */
-  PTRACE_SETSIGINFO = 0x4203
+  PTRACE_SETSIGINFO = 0x4203,
 #define PT_SETSIGINFO PTRACE_SETSIGINFO
 
   /* Get register content.  */