Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC]: Remove SunOS and Solaris binary support.

14 files changed, 2 insertions, 435 deletions

diff --git a/include/asm-sparc64/Kbuild b/include/asm-sparc64/Kbuild
index a90dc82129d1..dce1cf9a9313 100644
--- a/include/asm-sparc64/Kbuild
+++ b/include/asm-sparc64/Kbuild
@@ -12,7 +12,6 @@ header-y += display7seg.h
 header-y += envctrl.h
 header-y += openprom.h
 header-y += openpromio.h
-header-y += pconf.h
 header-y += psrcompat.h
 header-y += pstate.h
 header-y += reg.h
diff --git a/include/asm-sparc64/a.out-core.h b/include/asm-sparc64/a.out-core.h
deleted file mode 100644
index 3499b3c425ca..000000000000
--- a/include/asm-sparc64/a.out-core.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/* a.out coredump register dumper
- *
- * Copyright (C) 2007 Red Hat, Inc. All Rights Reserved.
- * Written by David Howells (dhowells@redhat.com)
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
- * as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
- */
-
-#ifndef _ASM_A_OUT_CORE_H
-#define _ASM_A_OUT_CORE_H
-
-#ifdef __KERNEL__
-
-#include <linux/user.h>
-
-/*
- * fill in the user structure for an a.out core dump
- */
-static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
-{
-        /* Only should be used for SunOS and ancient a.out
-         * SparcLinux binaries...  Not worth implementing.
-         */
-        memset(dump, 0, sizeof(struct user));
-}
-
-#endif /* __KERNEL__ */
-#endif /* _ASM_A_OUT_CORE_H */
diff --git a/include/asm-sparc64/a.out.h b/include/asm-sparc64/a.out.h
deleted file mode 100644
index 44208c2a188e..000000000000
--- a/include/asm-sparc64/a.out.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-sparc/a.out.h>
diff --git a/include/asm-sparc64/ioctls.h b/include/asm-sparc64/ioctls.h
index 083c9a0f37de..c1be40647c99 100644
--- a/include/asm-sparc64/ioctls.h
+++ b/include/asm-sparc64/ioctls.h
@@ -44,8 +44,6 @@
 #define __TIOCSETX        _IOW('t', 34, int) /* SunOS Specific */
 #define __TIOCGETX        _IOR('t', 35, int) /* SunOS Specific */
 #define TIOCCONS        _IO('t', 36)
-#define __TIOCSSIZE     _IOW('t', 37, struct sunos_ttysize) /* SunOS Specific */
-#define __TIOCGSIZE     _IOR('t', 38, struct sunos_ttysize) /* SunOS Specific */
 #define TIOCGSOFTCAR    _IOR('t', 100, int)
 #define TIOCSSOFTCAR    _IOW('t', 101, int)
 #define __TIOCUCNTL       _IOW('t', 102, int) /* SunOS Specific */
diff --git a/include/asm-sparc64/mman.h b/include/asm-sparc64/mman.h
index 8cc1860be630..e584563b56eb 100644
--- a/include/asm-sparc64/mman.h
+++ b/include/asm-sparc64/mman.h
@@ -22,19 +22,6 @@
 #define MAP_POPULATE    0x8000          /* populate (prefault) pagetables */
 #define MAP_NONBLOCK    0x10000         /* do not block on IO */
 
-/* XXX Need to add flags to SunOS's mctl, mlockall, and madvise system
- * XXX calls.
- */
-
-/* SunOS sys_mctl() stuff... */
-#define MC_SYNC         1  /* Sync pages in memory with storage (usu. a file) */
-#define MC_LOCK         2  /* Lock pages into core ram, do not allow swapping of them */
-#define MC_UNLOCK       3  /* Unlock pages locked via previous mctl() with MC_LOCK arg */
-#define MC_LOCKAS       5  /* Lock an entire address space of the calling process */
-#define MC_UNLOCKAS     6  /* Unlock entire address space of calling process */
-
-#define MADV_FREE       0x5             /* (Solaris) contents can be freed */
-
 #ifdef __KERNEL__
 #ifndef __ASSEMBLY__
 #define arch_mmap_check sparc64_mmap_check
diff --git a/include/asm-sparc64/namei.h b/include/asm-sparc64/namei.h
index ccda19e28695..275161f21213 100644
--- a/include/asm-sparc64/namei.h
+++ b/include/asm-sparc64/namei.h
@@ -8,19 +8,6 @@
 #ifndef __SPARC64_NAMEI_H
 #define __SPARC64_NAMEI_H
 
-#define SPARC_BSD_EMUL "/usr/gnemul/sunos/"
-#define SPARC_SOL_EMUL "/usr/gnemul/solaris/"
-
-static inline char * __emul_prefix(void)
-{
-        switch (current->personality) {
-        case PER_SUNOS:
-                return SPARC_BSD_EMUL;
-        case PER_SVR4:
-                return SPARC_SOL_EMUL;
-        default:
-                return NULL;
-        }
-}
+#define __emul_prefix() NULL
 
 #endif /* __SPARC64_NAMEI_H */
diff --git a/include/asm-sparc64/pconf.h b/include/asm-sparc64/pconf.h
deleted file mode 100644
index aad106a70908..000000000000
--- a/include/asm-sparc64/pconf.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/* $Id: pconf.h,v 1.1 1996/12/02 00:09:10 davem Exp $
- * pconf.h: pathconf() and fpathconf() defines for SunOS
- *          system call compatibility.
- *
- * Copyright (C) 1995, 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-
-#ifndef _SPARC64_PCONF_H
-#define _SPARC64_PCONF_H
-
-#include <linux/fs.h>
-#include <linux/limits.h>
-
-#define _PCONF_LINK       1 /* Max number of links to an object        */
-#define _PCONF_CANON      2 /* TTY input buffer line size              */
-#define _PCONF_INPUT      3 /* Biggest packet a tty can imbibe at once */
-#define _PCONF_NAME       4 /* Filename length max                     */
-#define _PCONF_PATH       5 /* Max size of a pathname                  */
-#define _PCONF_PIPE       6 /* Buffer size for a pipe                  */
-#define _PCONF_CHRESTRICT 7 /* Can only root chown files?              */
-#define _PCONF_NOTRUNC    8 /* Are pathnames truncated if too big?     */
-#define _PCONF_VDISABLE   9 /* Magic char to disable special tty chars */
-#define _PCONF_MAXPCONF   9
-
-#endif /* !(_SPARC64_PCONF_H) */
diff --git a/include/asm-sparc64/socket.h b/include/asm-sparc64/socket.h
index 44a625af6e31..8cf071fae3eb 100644
--- a/include/asm-sparc64/socket.h
+++ b/include/asm-sparc64/socket.h
@@ -24,9 +24,6 @@
 #define SO_SNDTIMEO     0x4000
 #define SO_ACCEPTCONN   0x8000
 
-/* wha!??? */
-#define SO_DONTLINGER   (~SO_LINGER)  /* Older SunOS compat. hack */
-
 #define SO_SNDBUF       0x1001
 #define SO_RCVBUF       0x1002
 #define SO_SNDBUFFORCE  0x100a
diff --git a/include/asm-sparc64/solerrno.h b/include/asm-sparc64/solerrno.h
deleted file mode 100644
index a2ea6fcf3446..000000000000
--- a/include/asm-sparc64/solerrno.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* $Id: solerrno.h,v 1.1 1996/12/26 14:22:40 davem Exp $
- * solerrno.h: Solaris error return codes for compatibility.
- *
- * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
- */
-
-#ifndef _SPARC64_SOLERRNO_H
-#define _SPARC64_SOLERRNO_H
-
-#define SOL_EPERM          1     /* Required superuser access perms  */
-#define SOL_ENOENT         2     /* File or directory does not exist */
-#define SOL_ESRCH          3     /* Process did not exist            */
-#define SOL_EINTR          4     /* System call was interrupted      */
-#define SOL_EIO            5     /* An i/o error occurred            */
-#define SOL_ENXIO          6     /* Device or Address does not exist */
-#define SOL_E2BIG          7     /* Too many arguments were given    */
-#define SOL_ENOEXEC        8     /* Header of executable was munged  */
-#define SOL_EBADF          9     /* Bogus file number                */
-#define SOL_ECHILD         10    /* No children of process exist     */
-#define SOL_EAGAIN         11    /* beep beep, "try again later"     */
-#define SOL_ENOMEM         12    /* No memory available              */
-#define SOL_EACCES         13    /* Access not allowed               */
-#define SOL_EFAULT         14    /* Address passed was invalid       */
-#define SOL_ENOTBLK        15    /* blkdev op on non-block device    */
-#define SOL_EBUSY          16    /* Mounted device was busy          */
-#define SOL_EEXIST         17    /* File specified already exists    */
-#define SOL_EXDEV          18    /* Link request across diff devices */
-#define SOL_ENODEV         19    /* Device does not exist on system  */
-#define SOL_ENOTDIR        20    /* Dir operation on non-directory   */
-#define SOL_EISDIR         21    /* File was of directory type       */
-#define SOL_EINVAL         22    /* Argument passed was invalid      */
-#define SOL_ENFILE         23    /* No more room in file table       */
-#define SOL_EMFILE         24    /* Proc has too many files open     */
-#define SOL_ENOTTY         25    /* Ioctl was invalid for req device */
-#define SOL_ETXTBSY        26    /* Text file in busy state          */
-#define SOL_EFBIG          27    /* Too big of a file for operation  */
-#define SOL_ENOSPC         28    /* Disk is full                     */
-#define SOL_ESPIPE         29    /* Seek attempted on non-seeking dev*/
-#define SOL_EROFS          30    /* Write attempted on read-only fs  */
-#define SOL_EMLINK         31    /* Too many links in file search    */
-#define SOL_EPIPE          32    /* Call a plumber                   */
-#define SOL_EDOM           33    /* Argument was out of fct domain   */
-#define SOL_ERANGE         34    /* Could not represent math result  */
-#define SOL_ENOMSG         35    /* Message of req type doesn't exist */
-#define SOL_EIDRM          36    /* Identifier has been removed      */
-#define SOL_ECHRNG         37    /* Req channel number out of range  */
-#define SOL_EL2NSYNC       38    /* Could not sync at run level 2    */
-#define SOL_EL3HLT         39    /* Halted at run level 3            */
-#define SOL_EL3RST         40    /* Reset at run level 3             */
-#define SOL_ELNRNG         41    /* Out of range link number         */
-#define SOL_EUNATCH        42    /* Driver for protocol not attached */
-#define SOL_ENOCSI         43    /* CSI structure not around         */
-#define SOL_EL2HLT         44    /* Halted at run level 2            */
-#define SOL_EDEADLK        45    /* Deadlock condition detected      */
-#define SOL_ENOLCK         46    /* Record locks unavailable         */
-#define SOL_ECANCELED      47    /* Cancellation of oper. happened   */
-#define SOL_ENOTSUP        48    /* Attempt of unsupported operation */
-#define SOL_EDQUOT         49    /* Users disk quota exceeded        */
-#define SOL_EBADE          50    /* Invalid exchange                 */
-#define SOL_EBADR          51    /* Request descriptor was invalid   */
-#define SOL_EXFULL         52    /* Full exchange                    */
-#define SOL_ENOANO         53    /* ano does not exist               */
-#define SOL_EBADRQC        54    /* Req code was invalid             */
-#define SOL_EBADSLT        55    /* Bad slot number                  */
-#define SOL_EDEADLOCK      56    /* Deadlock in fs error             */
-#define SOL_EBFONT         57    /* Font file format invalid         */
-/* YOW, I LOVE SYSV STREAMS!!!! */
-#define SOL_ENOSTR         60    /* Stream-op on non-stream dev      */
-#define SOL_ENODATA        61    /* No data avail at this time       */
-#define SOL_ETIME          62    /* Expiration of time occurred      */
-#define SOL_ENOSR          63    /* Streams resources exhausted      */
-#define SOL_ENONET         64    /* No network connected             */
-#define SOL_ENOPKG         65    /* Non-installed package            */
-#define SOL_EREMOTE        66    /* Object was on remote machine     */
-#define SOL_ENOLINK        67    /* Cut link                         */
-#define SOL_EADV           68    /* Error in advertise               */
-#define SOL_ESRMNT         69    /* Some magic srmount problem       */
-#define SOL_ECOMM          70    /* During send, comm error occurred */
-#define SOL_EPROTO         71    /* Protocol botch                   */
-#define SOL_EMULTIHOP      74    /* Multihop attempted               */
-#define SOL_EBADMSG        77    /* Message was unreadable           */
-#define SOL_ENAMETOOLONG   78    /* Too long of a path name          */
-#define SOL_EOVERFLOW      79    /* Data type too small for datum    */
-#define SOL_ENOTUNIQ       80    /* Logical name was not unique      */
-#define SOL_EBADFD         81    /* Op cannot be performed on fd     */
-#define SOL_EREMCHG        82    /* Remote address is now different  */
-#define SOL_ELIBACC        83    /* Shared lib could not be accessed */
-#define SOL_ELIBBAD        84    /* ShLib is corrupted in some way   */
-#define SOL_ELIBSCN        85    /* A.out ShLib problems             */
-#define SOL_ELIBMAX        86    /* Exceeded ShLib linkage limit     */
-#define SOL_ELIBEXEC       87    /* Execution of ShLib attempted     */
-#define SOL_EILSEQ         88    /* Bad byte sequence found          */
-#define SOL_ENOSYS         89    /* Invalid filesystem operation     */
-#define SOL_ELOOP          90    /* Detected loop in symbolic links  */
-#define SOL_ERESTART       91    /* System call is restartable       */
-#define SOL_ESTRPIPE       92    /* Do not sleep in head of stream   */
-#define SOL_ENOTEMPTY      93    /* Rmdir of non-empty directory     */
-#define SOL_EUSERS         94    /* Over abundance of users for ufs  */
-#define SOL_ENOTSOCK       95    /* Sock-op on non-sock              */
-#define SOL_EDESTADDRREQ   96    /* No dest addr given, but needed   */
-#define SOL_EMSGSIZE       97    /* Msg too big                      */
-#define SOL_EPROTOTYPE     98    /* Bad socket protocol              */
-#define SOL_ENOPROTOOPT    99    /* Unavailable protocol             */
-#define SOL_EPROTONOSUPPORT 120  /* Unsupported protocol             */
-#define SOL_ESOCKTNOSUPPORT 121  /* Unsupported socket type          */
-#define SOL_EOPNOTSUPP     122   /* Unsupported sock-op              */
-#define SOL_EPFNOSUPPORT   123   /* Unsupported protocol family      */
-#define SOL_EAFNOSUPPORT   124   /* Unsup addr family for protocol   */
-#define SOL_EADDRINUSE     125   /* Req addr is already in use       */
-#define SOL_EADDRNOTAVAIL  126   /* Req addr not available right now */
-#define SOL_ENETDOWN       127   /* Your subnet is on fire           */
-#define SOL_ENETUNREACH    128   /* Someone playing with gateway and */
-                                 /* did not tell you he was going to */
-#define SOL_ENETRESET      129   /* Buy less-buggy ethernet cards    */
-#define SOL_ECONNABORTED   130   /* Aborted connection due to sw     */
-#define SOL_ECONNRESET     131   /* Your peers reset your connection */
-#define SOL_ENOBUFS        132   /* No buffer space available        */
-#define SOL_EISCONN        133   /* Connect on already connected     */
-                                 /* socket attempted                 */
-#define SOL_ENOTCONN       134   /* Comm on non-connected socket     */
-#define SOL_ESHUTDOWN      143   /* Op attempted after sock-shutdown */
-#define SOL_ETOOMANYREFS   144   /* Reference limit exceeded         */
-#define SOL_ETIMEDOUT      145   /* Timed out connection             */
-#define SOL_ECONNREFUSED   146   /* Connection refused by remote host*/
-#define SOL_EHOSTDOWN      147   /* Remote host is up in flames      */
-#define SOL_EHOSTUNREACH   148   /* Make a left at Easton Ave.....   */
-#define SOL_EWOULDBLOCK    EAGAIN /* Just an alias */
-#define SOL_EALREADY       149   /* Operation is already occurring   */
-#define SOL_EINPROGRESS    150   /* Operation is happening now       */
-#define SOL_ESTALE         151   /* Fungus growth on NFS file handle */
-
-#endif /* !(_SPARC64_SOLERRNO_H) */
diff --git a/include/asm-sparc64/svr4.h b/include/asm-sparc64/svr4.h
deleted file mode 100644
index c96d5f116e1c..000000000000
--- a/include/asm-sparc64/svr4.h
+++ /dev/null
@@ -1,120 +0,0 @@
-/* Solaris/SPARC constants and definitions -- 
- * (C) 1996 Miguel de Icaza
- *
- * This file is not meant to be included by user level applications
- * but the solaris syscall emulator
- */
-
-#ifndef _SPARC64_SVR4_H
-#define _SPARC64_SVR4_H
-
-/* Signals as used by svr4 */
-typedef struct {                /* signal set type */
-        uint sigbits[4];
-} svr4_sigset_t;
-
-/* Values for siginfo.code */
-#define SVR4_SINOINFO 32767
-/* Siginfo, sucker expects bunch of information on those parameters */
-typedef union {
-        char total_size [128];
-        struct {
-                int signo;
-                int code;
-                int error;
-                union {
-                } data; 
-        } siginfo;
-} svr4_siginfo_t;
-
-/* Context definition */
-
-/* Location of the user stored registers into a greg_t */
-enum {
-        SVR4_PSR, SVR4_PC, SVR4_NPC, SVR4_Y,
-        SVR4_G1,  SVR4_G2, SVR4_G3,  SVR4_G4,
-        SVR4_G5,  SVR4_G6, SVR4_G7,  SVR4_O0,
-        SVR4_O1,  SVR4_O2, SVR4_O3,  SVR4_O4,
-        SVR4_O5,  SVR4_O6, SVR4_O7
-};
-
-/* sizeof (regs) / sizeof (greg_t), defined in the ABI */
-#define SVR4_NREGS  19
-#define SVR4_MAXWIN 31
-
-typedef struct {
-        u32 rwin_lo[8];
-        u32 rwin_in[8];
-} svr4_rwindow_t;
-
-typedef struct {
-        int            count;
-        u32            winptr [SVR4_MAXWIN]; /* pointer to the windows */
-
-        svr4_rwindow_t win[SVR4_MAXWIN];      /* the windows */
-} svr4_gwindows_t;
-
-typedef int svr4_gregset_t[SVR4_NREGS];
-
-typedef struct {
-        u64      fpu_regs[32];
-        u32      fp_q;
-        u32      fp_fsr;
-        u_char   fp_nqel;
-        u_char   fp_nqsize;
-        u_char   inuse;         /* if fpu is in use */
-} svr4_fregset_t;
-
-typedef struct {
-        u32    id;              /* if this holds "xrs" string => ptr is valid */
-        u32    ptr;
-} svr4_xrs_t;
-
-/* Machine dependent context */
-typedef struct {
-        svr4_gregset_t   greg;  /* registers 0..19 (see top) */
-        u32              gwin;  /* may point to register windows */
-        svr4_fregset_t   freg;  /* floating point registers */
-        svr4_xrs_t       xrs;   /* mhm? */
-        int              pad[19];
-} svr4_mcontext_t;
-
-/* flags for stack_t.flags */
-enum svr4_stack_flags {
-        SVR4_SS_ONSTACK,
-        SVR4_SS_DISABLE,
-};
-
-/* signal stack execution place, unsupported */
-typedef struct svr4_stack_t {
-        u32  sp;
-        int  size;
-        int  flags;
-} svr4_stack_t;
-
-/* Context used by getcontext and setcontext */
-typedef struct svr4_ucontext_t {
-        u32             flags; /* context flags, indicate what is loaded */
-        u32             link;
-        svr4_sigset_t   sigmask;
-        svr4_stack_t    stack;
-        svr4_mcontext_t mcontext;
-        int             pad[23];
-} svr4_ucontext_t;                          
-
-/* windows hold the windows as they were at signal time,
- * ucontext->mcontext holds a pointer to them.
- * addresses for uc and si are passed as parameters to svr4 signal
- * handler
- */
-
-/* This is the signal frame that is passed to the signal handler */
-typedef struct {
-        svr4_gwindows_t gw;     /* windows */
-        svr4_ucontext_t uc;     /* machine context */
-        svr4_siginfo_t  si;     /* siginfo */
-} svr4_signal_frame_t;
-
-#define SVR4_SF_ALIGNED (((sizeof (svr4_signal_frame_t) + 7) & (~7)))
-
-#endif /* include control */
diff --git a/include/asm-sparc64/termios.h b/include/asm-sparc64/termios.h
index ef527211f8a8..cacbea171ad7 100644
--- a/include/asm-sparc64/termios.h
+++ b/include/asm-sparc64/termios.h
@@ -33,11 +33,6 @@ struct ltchars {
 };
 #endif /* __KERNEL__ */
 
-struct sunos_ttysize {
-        int st_lines;   /* Lines on the terminal */
-        int st_columns; /* Columns on the terminal */
-};
-
 struct winsize {
         unsigned short ws_row;
         unsigned short ws_col;
diff --git a/include/asm-sparc64/ttable.h b/include/asm-sparc64/ttable.h
index bbb9c8f13d61..7208a777750e 100644
--- a/include/asm-sparc64/ttable.h
+++ b/include/asm-sparc64/ttable.h
@@ -99,14 +99,6 @@
          or     %l7, %lo(systbl), %l7;                  \
         nop; nop;
         
-#define INDIRECT_SOLARIS_SYSCALL(num)                   \
-        sethi   %hi(109f), %g7;                         \
-        ba,pt   %xcc, etrap;                            \
-109:     or     %g7, %lo(109b), %g7;                    \
-        ba,pt   %xcc, tl0_solaris + 0xc;                \
-         mov    num, %g1;                               \
-        nop;nop;nop;
-        
 #define TRAP_UTRAP(handler,lvl)                         \
         mov     handler, %g3;                           \
         ba,pt   %xcc, utrap_trap;                       \
@@ -117,11 +109,6 @@
         nop;                                            \
         nop;
 
-#ifdef CONFIG_SUNOS_EMUL
-#define SUNOS_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sunos_sys_table)
-#else
-#define SUNOS_SYSCALL_TRAP TRAP(sunos_syscall)
-#endif
 #ifdef CONFIG_COMPAT
 #define LINUX_32BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall32, sys_call_table32)
 #else
@@ -130,11 +117,6 @@
 #define LINUX_64BIT_SYSCALL_TRAP SYSCALL_TRAP(linux_sparc_syscall, sys_call_table64)
 #define GETCC_TRAP TRAP(getcc)
 #define SETCC_TRAP TRAP(setcc)
-#ifdef CONFIG_SOLARIS_EMUL
-#define SOLARIS_SYSCALL_TRAP TRAP(solaris_sparc_syscall)
-#else
-#define SOLARIS_SYSCALL_TRAP TRAP(solaris_syscall)
-#endif
 #define BREAKPOINT_TRAP TRAP(breakpoint_trap)
 
 #ifdef CONFIG_TRACE_IRQFLAGS
diff --git a/include/asm-sparc64/unistd.h b/include/asm-sparc64/unistd.h
index 77559da0ea3f..13be4453a1f0 100644
--- a/include/asm-sparc64/unistd.h
+++ b/include/asm-sparc64/unistd.h
@@ -338,16 +338,6 @@
 #define NR_SYSCALLS             317
 
 #ifdef __KERNEL__
-/* sysconf options, for SunOS compatibility */
-#define   _SC_ARG_MAX             1
-#define   _SC_CHILD_MAX           2
-#define   _SC_CLK_TCK             3
-#define   _SC_NGROUPS_MAX         4
-#define   _SC_OPEN_MAX            5
-#define   _SC_JOB_CONTROL         6
-#define   _SC_SAVED_IDS           7
-#define   _SC_VERSION             8
-
 #define __ARCH_WANT_IPC_PARSE_VERSION
 #define __ARCH_WANT_OLD_READDIR
 #define __ARCH_WANT_STAT64
diff --git a/include/asm-sparc64/user.h b/include/asm-sparc64/user.h
index 02b138943837..29fc6e906c29 100644
--- a/include/asm-sparc64/user.h
+++ b/include/asm-sparc64/user.h
@@ -1,60 +1 @@
-/* $Id: user.h,v 1.1 1996/12/26 14:22:44 davem Exp $
- * asm-sparc64/user.h: Core file definitions for the Sparc.
- *
- * Keep in sync with reg.h.  Actually, we could get rid of this
- * one, since we won't a.out core dump that much anyways - miguel.
- * Copyright (C) 1995 (davem@caip.rutgers.edu)
- */
-#ifndef _SPARC64_USER_H
-#define _SPARC64_USER_H
-
-#include <linux/a.out.h>
-struct sunos_regs {
-        unsigned int psr, pc, npc, y;
-        unsigned int regs[15];
-};
-
-struct sunos_fpqueue {
-        unsigned int *addr;
-        unsigned int inst;
-};
-
-struct sunos_fp {
-        union {
-                unsigned int regs[32];
-                double reg_dbls[16];
-        } fregs;
-        unsigned int fsr;
-        unsigned int flags;
-        unsigned int extra;
-        unsigned int fpq_count;
-        struct sunos_fpqueue fpq[16];
-};
-
-struct sunos_fpu {
-        struct sunos_fp fpstatus;
-};
-
-/* The SunOS core file header layout. */
-struct user {
-        unsigned int magic;
-        unsigned int len;
-        struct sunos_regs regs;
-        struct exec uexec;
-        int           signal;
-        size_t        u_tsize; /* all of these in bytes! */
-        size_t        u_dsize;
-        size_t        u_ssize;
-        char          u_comm[17];
-        struct sunos_fpu fpu;
-        unsigned int  sigcode;   /* Special sigcontext subcode, if any */
-};
-
-#define NBPG                   PAGE_SIZE /* XXX 4096 maybe? */
-#define UPAGES                 1
-#define HOST_TEXT_START_ADDR   (u.start_code)
-#define HOST_DATA_START_ADDR   (u.start_data)
-#define HOST_STACK_END_ADDR    (u.start_stack + u.u_ssize * NBPG)
-#define SUNOS_CORE_MAGIC       0x080456
-
-#endif /* !(_SPARC64_USER_H) */
+#include <asm-sparc/user.h>