Merge remote-tracking branch 'origin/master' into irqattach

This commit is contained in:
Gregory Nutt 2017-02-27 11:18:58 -06:00
commit cb927e3226

View File

@ -326,11 +326,11 @@
# define SYS_telldir (__SYS_filedesc+15)
# if defined(CONFIG_PSEUDOFS_SOFTLINKS)
# define SYS_link (__SYS_filedesc+15)
# define SYS_readlink (__SYS_filedesc+16)
# define __SYS_pipes (__SYS_filedesc+17)
# define SYS_link (__SYS_filedesc+16)
# define SYS_readlink (__SYS_filedesc+17)
# define __SYS_pipes (__SYS_filedesc+18)
# else
# define __SYS_pipes (__SYS_filedesc+15)
# define __SYS_pipes (__SYS_filedesc+16)
# endif
# if defined(CONFIG_PIPES) && CONFIG_DEV_PIPE_SIZE > 0