From 301423c90625c70d658efd05fab48011debef93c Mon Sep 17 00:00:00 2001
From: Andi Kleen <andi@firstfloor.org>
Date: Mon, 13 Apr 2009 14:39:56 -0700
Subject: [PATCH] --- yaml --- r: 143203 b: refs/heads/master c:
 0769c2981495c3d05429840d6fc7a1b5e26accaa h: refs/heads/master i:   143201:
 b7c24efb76a8f7aa70daa6b219add9dd553650d3   143199:
 2fd29d58bde978fed37714c38b8481f96199b290 v: v3

---
 [refs]                              | 2 +-
 trunk/include/asm-generic/siginfo.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 68a28684d0bf..1db130ce6425 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0efb2a03af7eddadb4d0db5f855b1614ba9b0a00
+refs/heads/master: 0769c2981495c3d05429840d6fc7a1b5e26accaa
diff --git a/trunk/include/asm-generic/siginfo.h b/trunk/include/asm-generic/siginfo.h
index 35752dadd6df..c840719a8c59 100644
--- a/trunk/include/asm-generic/siginfo.h
+++ b/trunk/include/asm-generic/siginfo.h
@@ -201,7 +201,7 @@ typedef struct siginfo {
 #define TRAP_TRACE	(__SI_FAULT|2)	/* process trace trap */
 #define TRAP_BRANCH     (__SI_FAULT|3)  /* process taken branch trap */
 #define TRAP_HWBKPT     (__SI_FAULT|4)  /* hardware breakpoint/watchpoint */
-#define NSIGTRAP	2
+#define NSIGTRAP	4
 
 /*
  * SIGCHLD si_codes