diff options
| author | H. Peter Anvin <hpa@zytor.com> | 2006-06-25 15:03:47 -0700 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2006-06-25 15:03:47 -0700 |
| commit | 287268e70213b3ff9ba30cada45853214cd36a0c (patch) | |
| tree | 0449b3f39ab008677f47b3209f2870dae2df267f | |
| parent | 0ba34a10b095d25601dacd540420a97b71278a28 (diff) | |
| parent | f9c47f51adf5a998180ee75344155c6086ea1bd1 (diff) | |
| download | klibc-287268e70213b3ff9ba30cada45853214cd36a0c.tar.gz | |
Merge with git+ssh://master.kernel.org/pub/scm/libs/klibc/klibc.gitklibc-1.4.5
| -rw-r--r-- | usr/include/sys/sendfile.h | 14 | ||||
| -rw-r--r-- | usr/klibc/SYSCALLS.def | 1 | ||||
| -rw-r--r-- | usr/klibc/arch/i386/socketcall.S | 2 | ||||
| -rw-r--r-- | usr/klibc/version | 2 | ||||
| -rw-r--r-- | usr/utils/Kbuild | 2 |
5 files changed, 18 insertions, 3 deletions
diff --git a/usr/include/sys/sendfile.h b/usr/include/sys/sendfile.h new file mode 100644 index 0000000000000..a745f1068c1c8 --- /dev/null +++ b/usr/include/sys/sendfile.h @@ -0,0 +1,14 @@ +/* + * sys/sendfile.h + */ + +#ifndef _SYS_SENDFILE_H +#define _SYS_SENDFILE_H + +#include <klibc/extern.h> +#include <stddef.h> +#include <sys/types.h> + +__extern ssize_t sendfile(int, int, off_t *, size_t, off_t); + +#endif /* _SYS_SENDFILE_H */ diff --git a/usr/klibc/SYSCALLS.def b/usr/klibc/SYSCALLS.def index 8c257babc0bee..64b92be7e57a0 100644 --- a/usr/klibc/SYSCALLS.def +++ b/usr/klibc/SYSCALLS.def @@ -179,6 +179,7 @@ ssize_t pwrite64,pwrite::pwrite(int, void *, size_t, off_t); int sync_file_range,fdatasync,fsync::sync_file_range(int, off_t, off_t, unsigned int); <?> int splice(int, off_t *, int, off_t *, size_t, unsigned int); <?> int tee(int, int, size_t, unsigned int); +ssize_t sendfile64,sendfile::sendfile(int, int, off_t *, size_t, off_t); /* * Signal operations diff --git a/usr/klibc/arch/i386/socketcall.S b/usr/klibc/arch/i386/socketcall.S index 3649b0dbc43d1..a2762dce14f14 100644 --- a/usr/klibc/arch/i386/socketcall.S +++ b/usr/klibc/arch/i386/socketcall.S @@ -23,7 +23,7 @@ __socketcall_common: movl $__NR_socketcall,%eax int $0x80 - cmpl $-4096,%eax # Error return? + cmpl $-4095,%eax # Error return? popl %ebx diff --git a/usr/klibc/version b/usr/klibc/version index 1c99cf0e80935..e516bb9d963a0 100644 --- a/usr/klibc/version +++ b/usr/klibc/version @@ -1 +1 @@ -1.4.4 +1.4.5 diff --git a/usr/utils/Kbuild b/usr/utils/Kbuild index 75618cc5248e3..76ffff0e43a8c 100644 --- a/usr/utils/Kbuild +++ b/usr/utils/Kbuild @@ -59,4 +59,4 @@ $(obj)/shared/reboot $(obj)/shared/poweroff: $(obj)/shared/halt clean-dirs := static shared # install only install the shared binaries -install-y := $(shared-y) +install-y := $(shared-y) shared/reboot shared/poweroff |