History

Merge branch 'akpm' (patches from Andrew)

Merge third patchbomb from Andrew Morton: - various misc things - a couple of lib/ optimisations - provide DIV_ROUND_CLOSEST_ULL() - checkpatch updates - rtc tree - befs, nilfs2, hfs, hfsplus, fatfs, adfs, affs, bfs - ptrace fixes - fork() fixes - seccomp cleanups - more mmap_sem hold time reductions from Davidlohr * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (138 commits) proc: show locks in /proc/pid/fdinfo/X docs: add missing and new /proc/PID/status file entries, fix typos drivers/rtc/rtc-at91rm9200.c: make IO endian agnostic Documentation/spi/spidev_test.c: fix warning drivers/rtc/rtc-s5m.c: allow usage on device type different than main MFD type .gitignore: ignore *.tar MAINTAINERS: add Mediatek SoC mailing list tomoyo: reduce mmap_sem hold for mm->exe_file powerpc/oprofile: reduce mmap_sem hold for exe_file oprofile: reduce mmap_sem hold for mm->exe_file mips: ip32: add platform data hooks to use DS1685 driver lib/Kconfig: fix up HAVE_ARCH_BITREVERSE help text x86: switch to using asm-generic for seccomp.h sparc: switch to using asm-generic for seccomp.h powerpc: switch to using asm-generic for seccomp.h parisc: switch to using asm-generic for seccomp.h mips: switch to using asm-generic for seccomp.h microblaze: use asm-generic for seccomp.h arm: use asm-generic for seccomp.h seccomp: allow COMPAT sigreturn overrides ...

Linus Torvalds committed 11 years ago

Commit 54e514b2 parents 4fc8adc 6c8c903158 files · +2190 −1551Browse files

Showing the changes to include/uapi (1 of 158 files). Show all

Unified · Split

include/uapi/asm-generic/errno.h+10−1
@@ -6,7 +6,16 @@ · 5 unmodified lines
66 #define EDEADLK 35 /* Resource deadlock would occur */
77 #define ENAMETOOLONG 36 /* File name too long */
88 #define ENOLCK 37 /* No record locks available */
9−#define ENOSYS 38 /* Function not implemented */
9+
10+/*
11+ * This error code is special: arch syscall entry code will return
12+ * -ENOSYS if users try to call a syscall that doesn't exist. To keep
13+ * failures of syscalls that really do exist distinguishable from
14+ * failures due to attempts to use a nonexistent syscall, syscall
15+ * implementations should refrain from returning -ENOSYS.
16+ */
17+#define ENOSYS 38 /* Invalid system call number */
18+
1019 #define ENOTEMPTY 39 /* Directory not empty */
1120 #define ELOOP 40 /* Too many symbolic links encountered */
1221 #define EWOULDBLOCK EAGAIN /* Operation would block */