git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs-2.6
[pandora-kernel.git]
/
arch
/
ia64
/
include
/
asm
/
siginfo.h
diff --git
a/arch/ia64/include/asm/siginfo.h
b/arch/ia64/include/asm/siginfo.h
index
118d429
..
c8fcaa2
100644
(file)
--- a/
arch/ia64/include/asm/siginfo.h
+++ b/
arch/ia64/include/asm/siginfo.h
@@
-62,6
+62,7
@@
typedef struct siginfo {
int _imm; /* immediate value for "break" */
unsigned int _flags; /* see below */
unsigned long _isr; /* isr */
+ short _addr_lsb; /* lsb of faulting address */
} _sigfault;
/* SIGPOLL */