Merge from trunk.

4 files changed, 15 insertions, 8 deletions

diff --git a/libc/sysdeps/linux/m68k/bits/fcntl.h b/libc/sysdeps/linux/m68k/bits/fcntl.h
index 6983cd410..85cc59188 100644
--- a/libc/sysdeps/linux/m68k/bits/fcntl.h
+++ b/libc/sysdeps/linux/m68k/bits/fcntl.h
@@ -196,13 +196,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);
@@ -219,6 +220,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/m68k/bits/kernel_stat.h b/libc/sysdeps/linux/m68k/bits/kernel_stat.h
index 3d2805e7f..5f0514843 100644
--- a/libc/sysdeps/linux/m68k/bits/kernel_stat.h
+++ b/libc/sysdeps/linux/m68k/bits/kernel_stat.h
@@ -1,6 +1,10 @@
 #ifndef _BITS_STAT_STRUCT_H
 #define _BITS_STAT_STRUCT_H
 
+#ifndef _LIBC
+#error bits/kernel_stat.h is for internal uClibc use only!
+#endif
+
 /* This file provides whatever this particular arch's kernel thinks 
  * struct kernel_stat should look like...  It turns out each arch has a 
  * different opinion on the subject... */
diff --git a/libc/sysdeps/linux/m68k/bits/syscalls.h b/libc/sysdeps/linux/m68k/bits/syscalls.h
index 3e3303897..d1ade8036 100644
--- a/libc/sysdeps/linux/m68k/bits/syscalls.h
+++ b/libc/sysdeps/linux/m68k/bits/syscalls.h
@@ -4,13 +4,6 @@
 # error "Never use <bits/syscalls.h> directly; include <sys/syscall.h> instead."
 #endif
 
-#include <errno.h>
-
-/* This includes the `__NR_<name>' syscall numbers taken from the Linux kernel
- * header files.  It also defines the traditional `SYS_<name>' macros for older
- * programs.  */
-#include <bits/sysnum.h>
-
 /* m68k headers does stupid stuff with __NR_iopl / __NR_vm86:
  * #define __NR_iopl   not supported
  * #define __NR_vm86   not supported
@@ -20,6 +13,8 @@
 
 #ifndef __ASSEMBLER__
 
+#include <errno.h>
+
 /* Linux takes system call arguments in registers:
 
 	syscall number	%d0	     call-clobbered
diff --git a/libc/sysdeps/linux/m68k/bits/uClibc_page.h b/libc/sysdeps/linux/m68k/bits/uClibc_page.h
index 57bea0724..51c6f1446 100644
--- a/libc/sysdeps/linux/m68k/bits/uClibc_page.h
+++ b/libc/sysdeps/linux/m68k/bits/uClibc_page.h
@@ -20,15 +20,21 @@
 #ifndef _UCLIBC_PAGE_H
 #define _UCLIBC_PAGE_H
 
+/*
 #include <linux/config.h>
+*/
 
 /* PAGE_SHIFT determines the page size */
 
+/*
 #ifndef CONFIG_SUN3
+*/
 #define PAGE_SHIFT	(12)
+/*
 #else
 #define PAGE_SHIFT	(13)
 #endif
+*/
 #define PAGE_SIZE	(1UL << PAGE_SHIFT)
 #define PAGE_MASK	(~(PAGE_SIZE-1))