---

yaml --- r: 297749 b: refs/heads/master c: 31796ac h: refs/heads/master i: 297747: de53760 v: v3
git-mirror · Mar 14, 2012 · 37233fb · 37233fb
1 parent b14a117
commit 37233fb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: bb6fa8b275e132b1e9319dbab94211543a0b7bd3
+refs/heads/master: 31796ac4e8f0e88f5c10f1ad6dab8f19bebe44a4
diff --git a/trunk/arch/x86/include/asm/ia32.h b/trunk/arch/x86/include/asm/ia32.h
@@ -130,8 +130,8 @@ typedef struct compat_siginfo {
 			unsigned int _pid;	/* which child */
 			unsigned int _uid;	/* sender's uid */
 			int _status;		/* exit code */
-			s64 _utime;
-			s64 _stime;
+			compat_s64 _utime;
+			compat_s64 _stime;
 		} _sigchld_x32;
 
 		/* SIGILL, SIGFPE, SIGSEGV, SIGBUS */