sparc, sparc64: use arch/sparc/include

The majority of this patch was created by the following script:

***
ASM=arch/sparc/include/asm
mkdir -p $ASM
git mv include/asm-sparc64/ftrace.h $ASM
git rm include/asm-sparc64/*
git mv include/asm-sparc/* $ASM
sed -ie 's/asm-sparc64/asm/g' $ASM/*
sed -ie 's/asm-sparc/asm/g' $ASM/*
***

The rest was an update of the top-level Makefile to use sparc
for header files when sparc64 is being build.
And a small fixlet to pick up the correct unistd.h from
sparc64 code.

Signed-off-by: Sam Ravnborg <sam@ravnborg.org>

1 files changed, 0 insertions, 40 deletions

diff --git a/include/asm-sparc/fcntl.h b/include/asm-sparc/fcntl.h
deleted file mode 100644
index d4d9c9d852c3..000000000000
--- a/include/asm-sparc/fcntl.h
+++ /dev/null
@@ -1,40 +0,0 @@
-#ifndef _SPARC_FCNTL_H
-#define _SPARC_FCNTL_H
-
-/* open/fcntl - O_SYNC is only implemented on blocks devices and on files
-   located on an ext2 file system */
-#define O_APPEND        0x0008
-#define FASYNC          0x0040  /* fcntl, for BSD compatibility */
-#define O_CREAT         0x0200  /* not fcntl */
-#define O_TRUNC         0x0400  /* not fcntl */
-#define O_EXCL          0x0800  /* not fcntl */
-#define O_SYNC          0x2000
-#define O_NONBLOCK      0x4000
-#if defined(__sparc__) && defined(__arch64__)
-#define O_NDELAY        0x0004
-#else
-#define O_NDELAY        (0x0004 | O_NONBLOCK)
-#endif
-#define O_NOCTTY        0x8000  /* not fcntl */
-#define O_LARGEFILE     0x40000
-#define O_DIRECT        0x100000 /* direct disk access hint */
-#define O_NOATIME       0x200000
-#define O_CLOEXEC       0x400000
-
-#define F_GETOWN        5       /*  for sockets. */
-#define F_SETOWN        6       /*  for sockets. */
-#define F_GETLK         7
-#define F_SETLK         8
-#define F_SETLKW        9
-
-/* for posix fcntl() and lockf() */
-#define F_RDLCK         1
-#define F_WRLCK         2
-#define F_UNLCK         3
-
-#define __ARCH_FLOCK_PAD        short __unused;
-#define __ARCH_FLOCK64_PAD      short __unused;
-
-#include <asm-generic/fcntl.h>
-
-#endif