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 'release-2.6.27' of git://git.kernel.org/pub/scm/linux/kernel/git/ak...
[pandora-kernel.git]
/
arch
/
x86
/
ia32
/
ia32entry.S
diff --git
a/arch/x86/ia32/ia32entry.S
b/arch/x86/ia32/ia32entry.S
index
18808b1
..
e4bd179
100644
(file)
--- a/
arch/x86/ia32/ia32entry.S
+++ b/
arch/x86/ia32/ia32entry.S
@@
-828,7
+828,8
@@
ia32_sys_call_table:
.quad compat_sys_timerfd_gettime
.quad compat_sys_signalfd4
.quad sys_eventfd2
- .quad sys_epoll_create
2
+ .quad sys_epoll_create
1
.quad sys_dup3 /* 330 */
.quad sys_pipe2
+ .quad sys_inotify_init1
ia32_syscall_end: