git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into sh/for...
[sfrench/cifs-2.6.git]
/
arch
/
alpha
/
include
/
asm
/
unistd.h
diff --git
a/arch/alpha/include/asm/unistd.h
b/arch/alpha/include/asm/unistd.h
index 5b5c174859428edda511595e263a4540ce7d9354..7f23665122dfabda7f6e9d666164d6b5f277b344 100644
(file)
--- a/
arch/alpha/include/asm/unistd.h
+++ b/
arch/alpha/include/asm/unistd.h
@@
-433,10
+433,11
@@
#define __NR_signalfd 476
#define __NR_timerfd 477
#define __NR_eventfd 478
+#define __NR_recvmmsg 479
#ifdef __KERNEL__
-#define NR_SYSCALLS 4
79
+#define NR_SYSCALLS 4
80
#define __ARCH_WANT_IPC_PARSE_VERSION
#define __ARCH_WANT_OLD_READDIR