4 files changed, 7 insertions, 13 deletions
diff --git a/libc/sysdeps/linux/cris/bits/fcntl.h b/libc/sysdeps/linux/cris/bits/fcntl.h
index 8baa20555..87e943f78 100644
--- a/libc/sysdeps/linux/cris/bits/fcntl.h
+++ b/libc/sysdeps/linux/cris/bits/fcntl.h
@@ -197,13 +197,14 @@ struct flock64
 
 __BEGIN_DECLS
 
-#if 0 /*def __USE_GNU*/
+#ifdef __USE_GNU
 
 /* Provide kernel hint to read ahead.  */
 extern ssize_t readahead (int __fd, __off64_t __offset, size_t __count)
     __THROW;
 
 
+#if 0
 /* Selective file content synch'ing.  */
 extern int sync_file_range (int __fd, __off64_t __from, __off64_t __to,
 			    unsigned int __flags);
@@ -220,6 +221,7 @@ extern int splice (int __fdin, int __fdout, size_t __len, unsigned int __flags)
 /* In-kernel implementation of tee for pipe buffers.  */
 extern int tee (int __fdin, int __fdout, size_t __len, unsigned int __flags)
     __THROW;
+#endif
 
 #endif
 
diff --git a/libc/sysdeps/linux/cris/bits/kernel_stat.h b/libc/sysdeps/linux/cris/bits/kernel_stat.h
index d4be6a64d..50202e542 100644
--- a/libc/sysdeps/linux/cris/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/cris/bits/kernel_stat.h
@@ -3,6 +3,10 @@
 #ifndef _CRIS_STAT_H
 #define _CRIS_STAT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 struct __old_kernel_stat {
 	unsigned short st_dev;
 	unsigned short st_ino;
diff --git a/libc/sysdeps/linux/cris/bits/syscalls.h b/libc/sysdeps/linux/cris/bits/syscalls.h
index 8b74518ce..065f48742 100644
--- a/libc/sysdeps/linux/cris/bits/syscalls.h
+++ b/libc/sysdeps/linux/cris/bits/syscalls.h
@@ -5,9 +5,6 @@
 #error "Never use <bits/syscall.h> directly; include <sys/syscall.h> instead."
 #endif
 
-/* Include the __NR_<name> definitions. */
-#include <bits/sysnum.h>
-
 #ifndef __ASSEMBLER__
 
 #include <errno.h>
diff --git a/libc/sysdeps/linux/cris/sysdep.S b/libc/sysdeps/linux/cris/sysdep.S
index 4e558153b..416751d65 100644
--- a/libc/sysdeps/linux/cris/sysdep.S
+++ b/libc/sysdeps/linux/cris/sysdep.S
@@ -19,15 +19,6 @@
 #include <features.h>
 #include "sysdep.h"
 
-/* Make space for the errno variable.  */
-
-	.globl	C_SYMBOL_NAME(errno)
-	.type	C_SYMBOL_NAME(errno),@object
-	.lcomm	C_SYMBOL_NAME(errno),4
-
-	.weak errno
-	errno = _errno
-
 /* The syscall stubs jump here when they detect an error, bot for PIC and
    non-PIC.  */