1. 18 Jul, 2008 31 commits
    • Sam Ravnborg's avatar
      sparc: copy sparc64 specific files to asm-sparc · a00736e9
      Sam Ravnborg authored
      Used the following script to copy the files:
      cd include
      set -e
      SPARC64=`ls asm-sparc64`
      for FILE in ${SPARC64}; do
      	if [ -f asm-sparc/$FILE ]; then
      		echo $FILE exist in asm-sparc
      	else
      		git mv asm-sparc64/$FILE asm-sparc/$FILE
      		printf "#include <asm-sparc/$FILE>\n" > asm-sparc64/$FILE
      		git add asm-sparc64/$FILE
      	fi
      done
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      a00736e9
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/asi.h · bdc3135a
      Sam Ravnborg authored
      Joined the two files as they contain distinct definitions.
      Inspired by patch from: Adrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      Cc: Adrian Bunk <bunk@kernel.org>
      bdc3135a
    • Sam Ravnborg's avatar
      sparc: export openprom.h to userspace · b1a8bf92
      Sam Ravnborg authored
      sparc64 exports openprom.h to userspace so let sparc follow
      the example.
      As openprom.h pulled in another not-for-export vaddrs.h header
      file it required a few changes to fix the build.
      
      The definition af VMALLOC_* were moved to pgtable as this is
      where sparc64 has them.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      b1a8bf92
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/types.h · b444b9a5
      Sam Ravnborg authored
      Copy content of sparc64 file to sparc file.
      There is only minimal possibilities for further unification.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      b444b9a5
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/termios.h · c6d1b0e3
      Sam Ravnborg authored
      Bring the commit e55c57e0
      ("[SPARC64]: Report any user access faults in termios accessors")
      over to sparc when unifying the two files.
      The diff was manually inspected to contain no
      other relevant changes.
      
      This unification therefore changes functionality of sparc.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      c6d1b0e3
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/termbits.h · 943d0e86
      Sam Ravnborg authored
      The type of tcflag_t differs from 32 and 64 bit.
      For 32 bit it is long
      For 64 bit it is int
      
      Altough these have same size then I was not sure that
      it was OK to change the 64 bit version to long as this
      is part of the ABI so it was made conditional.
      
      :$ diff -u include/asm-sparc/termbits.h include/asm-sparc64/termbits.h
      :-- include/asm-sparc/termbits.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/termbits.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,11 +1,11 @@
      :-#ifndef _SPARC_TERMBITS_H
      :-#define _SPARC_TERMBITS_H
      :+#ifndef _SPARC64_TERMBITS_H
      :+#define _SPARC64_TERMBITS_H
      :
      : #include <linux/posix_types.h>
      :
      : typedef unsigned char   cc_t;
      : typedef unsigned int    speed_t;
      :-typedef unsigned long   tcflag_t;
      :+typedef unsigned int    tcflag_t;
      :
      : #define NCC 8
      : struct termio {
      :@@ -102,7 +102,7 @@
      : #define IXANY	0x00000800
      : #define IXOFF	0x00001000
      : #define IMAXBEL	0x00002000
      :-#define IUTF8   0x00004000
      :+#define IUTF8	0x00004000
      :
      : /* c_oflag bits */
      : #define OPOST	0x00000001
      :@@ -171,7 +171,6 @@
      : #define HUPCL	  0x00000400
      : #define CLOCAL	  0x00000800
      : #define CBAUDEX   0x00001000
      :-/* We'll never see these speeds with the Zilogs, but for completeness... */
      : #define  BOTHER   0x00001000
      : #define  B57600   0x00001001
      : #define  B115200  0x00001002
      :@@ -199,7 +198,7 @@
      : #define B3500000  0x00001012
      : #define B4000000  0x00001013  */
      : #define CIBAUD	  0x100f0000  /* input baud rate (not used) */
      :-#define CMSPAR	  0x40000000  /* mark or space (stick) parity */
      :+#define CMSPAR    0x40000000  /* mark or space (stick) parity */
      : #define CRTSCTS	  0x80000000  /* flow control */
      :
      : #define IBSHIFT	  16		/* Shift from CBAUD to CIBAUD */
      :@@ -258,4 +257,4 @@
      : #define	TCSADRAIN	1
      : #define	TCSAFLUSH	2
      :
      :-#endif /* !(_SPARC_TERMBITS_H) */
      :+#endif /* !(_SPARC64_TERMBITS_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      943d0e86
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/setup.h · 7c4285d8
      Sam Ravnborg authored
      COMMAND_LINE_SIZE differ for 32 and 64 bit.
      256 versus 2048
      
      :$ diff -u include/asm-sparc/setup.h include/asm-sparc64/setup.h
      :-- include/asm-sparc/setup.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/setup.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -2,9 +2,9 @@
      :  *	Just a place holder.
      :  */
      :
      :-#ifndef _SPARC_SETUP_H
      :-#define _SPARC_SETUP_H
      :+#ifndef _SPARC64_SETUP_H
      :+#define _SPARC64_SETUP_H
      :
      :-#define COMMAND_LINE_SIZE	256
      :+#define COMMAND_LINE_SIZE	2048
      :
      :-#endif /* _SPARC_SETUP_H */
      :+#endif /* _SPARC64_SETUP_H */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      7c4285d8
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/resource.h · 68a61c8d
      Sam Ravnborg authored
      RLIM_INFINITY differ from 32 and 64 bit.
      The rest is equal.
      
      :$ diff -u include/asm-sparc/resource.h include/asm-sparc64/resource.h
      :-- include/asm-sparc/resource.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/resource.h	2008-06-13 06:46:39.000000000 +0200
      :@@ -1,11 +1,11 @@
      : /*
      :  * resource.h: Resource definitions.
      :  *
      :- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
      :+ * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
      :  */
      :
      :-#ifndef _SPARC_RESOURCE_H
      :-#define _SPARC_RESOURCE_H
      :+#ifndef _SPARC64_RESOURCE_H
      :+#define _SPARC64_RESOURCE_H
      :
      : /*
      :  * These two resource limit IDs have a Sparc/Linux-specific ordering,
      :@@ -14,13 +14,6 @@
      : #define RLIMIT_NOFILE		6	/* max number of open files */
      : #define RLIMIT_NPROC		7	/* max number of processes */
      :
      :-/*
      :- * SuS says limits have to be unsigned.
      :- * We make this unsigned, but keep the
      :- * old value for compatibility:
      :- */
      :-#define RLIM_INFINITY		0x7fffffff
      :-
      : #include <asm-generic/resource.h>
      :
      :-#endif /* !(_SPARC_RESOURCE_H) */
      :+#endif /* !(_SPARC64_RESOURCE_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      68a61c8d
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/fbio.h · 7acc483d
      Sam Ravnborg authored
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      7acc483d
    • Sam Ravnborg's avatar
      sparc: copy asm-sparc64/fbio.h to asm-sparc · fc860299
      Sam Ravnborg authored
      There were only a few trivial changes and a few additions
      in the sparc64 variant of this file.
      This patch copies the sparc64 specific bits to the sparc version
      of fbio.h so they are equal. A later patch will merge the two.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      fc860299
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/mman.h · f92ffa12
      Sam Ravnborg authored
      Renaming the function sparc64_mmap_check() to
      sparc_mmap_check() was enough to make the two
      header files identical.
      
      :$ diff -u include/asm-sparc/mman.h include/asm-sparc64/mman.h
      :-- include/asm-sparc/mman.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/mman.h	2008-06-13 06:46:39.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef __SPARC_MMAN_H__
      :-#define __SPARC_MMAN_H__
      :+#ifndef __SPARC64_MMAN_H__
      :+#define __SPARC64_MMAN_H__
      :
      : #include <asm-generic/mman.h>
      :
      :@@ -23,9 +23,9 @@
      :
      : #ifdef __KERNEL__
      : #ifndef __ASSEMBLY__
      :-#define arch_mmap_check(addr,len,flags)	sparc_mmap_check(addr,len)
      :-int sparc_mmap_check(unsigned long addr, unsigned long len);
      :+#define arch_mmap_check(addr,len,flags)	sparc64_mmap_check(addr,len)
      :+int sparc64_mmap_check(unsigned long addr, unsigned long len);
      : #endif
      : #endif
      :
      :-#endif /* __SPARC_MMAN_H__ */
      :+#endif /* __SPARC64_MMAN_H__ */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      f92ffa12
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/shmbuf.h · 2d141962
      Sam Ravnborg authored
      Padding in the shmbuf structure made conditional
      as only 32 bit sparc did so.
      
      :$ diff -u include/asm-sparc/shmbuf.h include/asm-sparc64/shmbuf.h
      :-- include/asm-sparc/shmbuf.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/shmbuf.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,23 +1,19 @@
      :-#ifndef _SPARC_SHMBUF_H
      :-#define _SPARC_SHMBUF_H
      :+#ifndef _SPARC64_SHMBUF_H
      :+#define _SPARC64_SHMBUF_H
      :
      : /*
      :- * The shmid64_ds structure for sparc architecture.
      :+ * The shmid64_ds structure for sparc64 architecture.
      :  * Note extra padding because this structure is passed back and forth
      :  * between kernel and user space.
      :  *
      :  * Pad space is left for:
      :- * - 64-bit time_t to solve y2038 problem
      :- * - 2 miscellaneous 32-bit values
      :+ * - 2 miscellaneous 64-bit values
      :  */
      :
      : struct shmid64_ds {
      : 	struct ipc64_perm	shm_perm;	/* operation perms */
      :-	unsigned int		__pad1;
      : 	__kernel_time_t		shm_atime;	/* last attach time */
      :-	unsigned int		__pad2;
      : 	__kernel_time_t		shm_dtime;	/* last detach time */
      :-	unsigned int		__pad3;
      : 	__kernel_time_t		shm_ctime;	/* last change time */
      : 	size_t			shm_segsz;	/* size of segment (bytes) */
      : 	__kernel_pid_t		shm_cpid;	/* pid of creator */
      :@@ -39,4 +35,4 @@
      : 	unsigned long	__unused4;
      : };
      :
      :-#endif /* _SPARC_SHMBUF_H */
      :+#endif /* _SPARC64_SHMBUF_H */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      2d141962
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/sembuf.h · fcb07081
      Sam Ravnborg authored
      Padding in the sembuf structure made conditional
      as only 32 bit sparc did so.
      
      :$ diff -u include/asm-sparc/sembuf.h include/asm-sparc64/sembuf.h
      :-- include/asm-sparc/sembuf.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/sembuf.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,21 +1,18 @@
      :-#ifndef _SPARC_SEMBUF_H
      :-#define _SPARC_SEMBUF_H
      :+#ifndef _SPARC64_SEMBUF_H
      :+#define _SPARC64_SEMBUF_H
      :
      : /*
      :- * The semid64_ds structure for sparc architecture.
      :+ * The semid64_ds structure for sparc64 architecture.
      :  * Note extra padding because this structure is passed back and forth
      :  * between kernel and user space.
      :  *
      :  * Pad space is left for:
      :- * - 64-bit time_t to solve y2038 problem
      :- * - 2 miscellaneous 32-bit values
      :+ * - 2 miscellaneous 64-bit values
      :  */
      :
      : struct semid64_ds {
      : 	struct ipc64_perm sem_perm;		/* permissions .. see ipc.h */
      :-	unsigned int	__pad1;
      : 	__kernel_time_t	sem_otime;		/* last semop time */
      :-	unsigned int	__pad2;
      : 	__kernel_time_t	sem_ctime;		/* last change time */
      : 	unsigned long	sem_nsems;		/* no. of semaphores in array */
      : 	unsigned long	__unused1;
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      fcb07081
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/msgbuf.h · 100b10d7
      Sam Ravnborg authored
      Padding from 32 bit sparc kept using preprocessor magic
      
      :$ diff -u include/asm-sparc/msgbuf.h include/asm-sparc64/msgbuf.h
      :-- include/asm-sparc/msgbuf.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/msgbuf.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -7,17 +7,13 @@
      :  * between kernel and user space.
      :  *
      :  * Pad space is left for:
      :- * - 64-bit time_t to solve y2038 problem
      :- * - 2 miscellaneous 32-bit values
      :+ * - 2 miscellaneous 64-bit values
      :  */
      :
      : struct msqid64_ds {
      : 	struct ipc64_perm msg_perm;
      :-	unsigned int   __pad1;
      : 	__kernel_time_t msg_stime;	/* last msgsnd time */
      :-	unsigned int   __pad2;
      : 	__kernel_time_t msg_rtime;	/* last msgrcv time */
      :-	unsigned int   __pad3;
      : 	__kernel_time_t msg_ctime;	/* last change time */
      : 	unsigned long  msg_cbytes;	/* current number of bytes on queue */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      100b10d7
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/fcntl.h · 6d1f4b88
      Sam Ravnborg authored
      The definition of O_NDELAY differed - the rest was equal
      
      :$ diff -u include/asm-sparc/fcntl.h include/asm-sparc64/fcntl.h
      :-- include/asm-sparc/fcntl.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/fcntl.h	2008-06-13 06:46:39.000000000 +0200
      :@@ -1,8 +1,9 @@
      :-#ifndef _SPARC_FCNTL_H
      :-#define _SPARC_FCNTL_H
      :+#ifndef _SPARC64_FCNTL_H
      :+#define _SPARC64_FCNTL_H
      :
      : /* open/fcntl - O_SYNC is only implemented on blocks devices and on files
      :    located on an ext2 file system */
      :+#define O_NDELAY	0x0004
      : #define O_APPEND	0x0008
      : #define FASYNC		0x0040	/* fcntl, for BSD compatibility */
      : #define O_CREAT		0x0200	/* not fcntl */
      :@@ -10,7 +11,6 @@
      : #define O_EXCL		0x0800	/* not fcntl */
      : #define O_SYNC		0x2000
      : #define O_NONBLOCK	0x4000
      :-#define O_NDELAY	(0x0004 | O_NONBLOCK)
      : #define O_NOCTTY	0x8000	/* not fcntl */
      : #define O_LARGEFILE	0x40000
      : #define O_DIRECT        0x100000 /* direct disk access hint */
      :@@ -29,8 +29,7 @@
      : #define F_UNLCK		3
      :
      : #define __ARCH_FLOCK_PAD	short __unused;
      :-#define __ARCH_FLOCK64_PAD	short __unused;
      :
      : #include <asm-generic/fcntl.h>
      :
      :-#endif
      :+#endif /* !(_SPARC64_FCNTL_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      6d1f4b88
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/sockios.h · e880e870
      Sam Ravnborg authored
      :$ diff -u include/asm-sparc/sockios.h include/asm-sparc64/sockios.h
      :-- include/asm-sparc/sockios.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/sockios.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef _ASM_SPARC_SOCKIOS_H
      :-#define _ASM_SPARC_SOCKIOS_H
      :+#ifndef _ASM_SPARC64_SOCKIOS_H
      :+#define _ASM_SPARC64_SOCKIOS_H
      :
      : /* Socket-level I/O control calls. */
      : #define FIOSETOWN 	0x8901
      :@@ -10,5 +10,5 @@
      : #define SIOCGSTAMP	0x8906		/* Get stamp (timeval) */
      : #define SIOCGSTAMPNS	0x8907		/* Get stamp (timespec) */
      :
      :-#endif /* !(_ASM_SPARC_SOCKIOS_H) */
      :+#endif /* !(_ASM_SPARC64_SOCKIOS_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      e880e870
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/socket.h · c8b8be54
      Sam Ravnborg authored
      :$ diff -u include/asm-sparc/socket.h include/asm-sparc64/socket.h
      :-- include/asm-sparc/socket.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/socket.h	2008-06-13 06:46:39.000000000 +0200
      :@@ -48,11 +48,10 @@
      : #define SO_TIMESTAMPNS		0x0021
      : #define SCM_TIMESTAMPNS		SO_TIMESTAMPNS
      :
      :-#define SO_MARK			0x0022
      :-
      : /* Security levels - as per NRL IPv6 - don't actually do anything */
      : #define SO_SECURITY_AUTHENTICATION		0x5001
      : #define SO_SECURITY_ENCRYPTION_TRANSPORT	0x5002
      : #define SO_SECURITY_ENCRYPTION_NETWORK		0x5004
      :
      :+#define SO_MARK			0x0022
      : #endif /* _ASM_SOCKET_H */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      c8b8be54
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/poll.h · 62e612f0
      Sam Ravnborg authored
      :$ diff -u include/asm-sparc/poll.h include/asm-sparc64/poll.h
      :-- include/asm-sparc/poll.h	2008-06-13 06:42:07.000000000 +0200
      :++ include/asm-sparc64/poll.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef __SPARC_POLL_H
      :-#define __SPARC_POLL_H
      :+#ifndef __SPARC64_POLL_H
      :+#define __SPARC64_POLL_H
      :
      : #define POLLWRNORM	POLLOUT
      : #define POLLWRBAND	256
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      62e612f0
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/param.h · 4835bd98
      Sam Ravnborg authored
      :$ diff -u include/asm-sparc/param.h include/asm-sparc64/param.h
      :-- include/asm-sparc/param.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/param.h	2008-06-13 06:42:07.000000000 +0200
      :@@ -1,5 +1,6 @@
      :-#ifndef _ASMSPARC_PARAM_H
      :-#define _ASMSPARC_PARAM_H
      :+#ifndef _ASMSPARC64_PARAM_H
      :+#define _ASMSPARC64_PARAM_H
      :+
      :
      : #ifdef __KERNEL__
      : # define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
      :@@ -19,4 +20,4 @@
      :
      : #define MAXHOSTNAMELEN	64	/* max length of hostname */
      :
      :-#endif
      :+#endif /* _ASMSPARC64_PARAM_H */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      4835bd98
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/ioctls.h · f1ba03ca
      Sam Ravnborg authored
      Trivial differenses in comments - used the version from sparc64
      
      :$ diff -u include/asm-sparc/ioctls.h include/asm-sparc64/ioctls.h
      :-- include/asm-sparc/ioctls.h	2008-06-13 08:46:29.000000000 +0200
      :++ include/asm-sparc64/ioctls.h	2008-06-13 08:46:29.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef _ASM_SPARC_IOCTLS_H
      :-#define _ASM_SPARC_IOCTLS_H
      :+#ifndef _ASM_SPARC64_IOCTLS_H
      :+#define _ASM_SPARC64_IOCTLS_H
      :
      : #include <asm/ioctl.h>
      :
      :@@ -22,7 +22,7 @@
      :
      : /* Note that all the ioctls that are not available in Linux have a
      :  * double underscore on the front to: a) avoid some programs to
      :- * thing we support some ioctls under Linux (autoconfiguration stuff)
      :+ * think we support some ioctls under Linux (autoconfiguration stuff)
      :  */
      : /* Little t */
      : #define TIOCGETD	_IOR('t', 0, int)
      :@@ -110,7 +110,7 @@
      : #define TIOCSERGETLSR   0x5459 /* Get line status register */
      : #define TIOCSERGETMULTI 0x545A /* Get multiport config  */
      : #define TIOCSERSETMULTI 0x545B /* Set multiport config */
      :-#define TIOCMIWAIT	0x545C /* Wait input */
      :+#define TIOCMIWAIT	0x545C /* Wait for change on serial input line(s) */
      : #define TIOCGICOUNT	0x545D /* Read serial port inline interrupt counts */
      :
      : /* Kernel definitions */
      :@@ -133,4 +133,4 @@
      : #define TIOCPKT_NOSTOP		16
      : #define TIOCPKT_DOSTOP		32
      :
      :-#endif /* !(_ASM_SPARC_IOCTLS_H) */
      :+#endif /* !(_ASM_SPARC64_IOCTLS_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      f1ba03ca
    • Sam Ravnborg's avatar
      sparc: Merge asm-sparc{,64}/ioctl.h · 278864fa
      Sam Ravnborg authored
      :$ diff -u include/asm-sparc/ioctl.h include/asm-sparc64/ioctl.h
      :-- include/asm-sparc/ioctl.h	2008-06-13 06:46:39.000000000 +0200
      :++ include/asm-sparc64/ioctl.h	2008-06-13 08:46:29.000000000 +0200
      :@@ -1,5 +1,5 @@
      :-#ifndef _SPARC_IOCTL_H
      :-#define _SPARC_IOCTL_H
      :+#ifndef _SPARC64_IOCTL_H
      :+#define _SPARC64_IOCTL_H
      :
      :/*
      :* Our DIR and SIZE overlap in order to simulteneously provide
      :@@ -64,4 +64,4 @@
      :#define IOCSIZE_MASK    (_IOC_XSIZEMASK << _IOC_SIZESHIFT)
      :#define IOCSIZE_SHIFT   (_IOC_SIZESHIFT)
      :
      :-#endif /* !(_SPARC_IOCTL_H) */
      :+#endif /* !(_SPARC64_IOCTL_H) */
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      278864fa
    • Sam Ravnborg's avatar
      sparc: copy exported sparc64 specific header files to asm-sparc · 09d3e1ba
      Sam Ravnborg authored
      Copy was done using the following simple script:
      
      set -e
      SPARC64="h display7seg.h envctrl.h psrcompat.h pstate.h uctx.h utrap.h watchdog.h"
      for FILE in ${SPARC64}; do
      	if [ -f asm-sparc/$FILE ]; then
      		echo $FILE exist in asm-sparc
      	fi
      	cat asm-sparc64/$FILE > asm-sparc/$FILE
      	printf "#include <asm-sparc/$FILE>\n" > asm-sparc64/$FILE
      done
      
      The name of the copied files are added to asm-sparc/Kbuild
      to keep "make headers_check" functional.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      09d3e1ba
    • Sam Ravnborg's avatar
      sparc: add -m64 when building vmlinux.lds · 9ae95bce
      Sam Ravnborg authored
      David Miller noticed that the build of vmlinux.lds
      failed to use the -m64 specifier.
      This caused the build to break with a bi-arch gcc with
      unified headers.
      
      Add the -m64 option to CPPFLAGS_vmlinux.lds so we
      have the correct defines available when building
      vmliux.lds.
      Signed-off-by: default avatarSam Ravnborg <sam@ravnborg.org>
      9ae95bce
    • David S. Miller's avatar
    • Sam Ravnborg's avatar
      3f261e82
    • Sam Ravnborg's avatar
      fc491d7d
    • Adrian Bunk's avatar
      sparc: remove PROM_AP1000 · d6eaadfb
      Adrian Bunk authored
      This seems to be left from the long gone AP1000 support.
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      d6eaadfb
    • Adrian Bunk's avatar
      drivers/sbus/: cleanups · 96068145
      Adrian Bunk authored
      This patch contains the following cleanups:
      - make the following needlessly global code static:
        - char/uctrl.c: uctrl_get_event_status()
        - char/uctrl.c: uctrl_get_external_status()
        - char/vfc_dev.c: struct vfc_dev_lst
        - char/vfc_dev.c: vfc_lock_device()
        - char/vfc_dev.c: vfc_unlock_device()
        - char/vfc_dev.c: vfc_captstat_reset()
        - char/vfc_dev.c: vfc_memptr_reset()
        - char/vfc_dev.c: vfc_csr_init()
        - char/vfc_dev.c: vfc_saa9051_init()
        - char/vfc_dev.c: init_vfc_hw()
        - char/vfc_dev.c: init_vfc_devstruct()
        - char/vfc_dev.c: init_vfc_device()
        - char/vfc_dev.c: vfc_get_dev_ptr()
        - char/vfc_dev.c: vfc_capture_start()
        - char/vfc_dev.c: vfc_capture_poll()
        - char/vfc_dev.c: vfc_port_change_ioctl()
        - char/vfc_dev.c: vfc_set_video_ioctl()
        - char/vfc_dev.c: vfc_get_video_ioctl()
        - char/vfc_i2c.c: vfc_i2c_wait_for_bus()
        - char/vfc_i2c.c: vfc_i2c_wait_for_pin()
        - char/vfc_i2c.c: vfc_i2c_xmit_addr()
        - char/vfc_i2c.c: vfc_i2c_xmit_byte()
        - char/vfc_i2c.c: vfc_i2c_recv_byte()
        - dvma.c: init_one_dvma()
      - remove an unused variable from a function:
        - char/uctrl.c: ts102_uctrl_init()
      - remove the following unused and empty function:
        - char/uctrl.c: uctrl_set_video()
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      96068145
    • Adrian Bunk's avatar
      sparc64/kernel/: make code static · 908f5162
      Adrian Bunk authored
      This patch makes the following needlessly global code static:
      - central.c: struct central_bus
      - central.c: struct fhc_list
      - central.c: apply_fhc_ranges()
      - central.c: apply_central_ranges()
      - ds.c: struct ds_states_template[]
      - pci_msi.c: sparc64_setup_msi_irq()
      - pci_msi.c: sparc64_teardown_msi_irq()
      - pci_sun4v.c: struct sun4v_dma_ops
      - sys_sparc32.c: cp_compat_stat64()
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      908f5162
    • Adrian Bunk's avatar
      sparc/mm/: possible cleanups · 50215d65
      Adrian Bunk authored
      This patch contains the following possible cleanups:
      - make the following needlessly global code static:
        - fault.c: force_user_fault()
        - init.c: calc_max_low_pfn()
        - init.c: pgt_cache_water[]
        - init.c: map_high_region()
        - srmmu.c: hwbug_bitmask
        - srmmu.c: srmmu_swapper_pg_dir
        - srmmu.c: srmmu_context_table
        - srmmu.c: is_hypersparc
        - srmmu.c: srmmu_cache_pagetables
        - srmmu.c: srmmu_nocache_size
        - srmmu.c: srmmu_nocache_end
        - srmmu.c: srmmu_get_nocache()
        - srmmu.c: srmmu_free_nocache()
        - srmmu.c: srmmu_early_allocate_ptable_skeleton()
        - srmmu.c: srmmu_nocache_calcsize()
        - srmmu.c: srmmu_nocache_init()
        - srmmu.c: srmmu_alloc_thread_info()
        - srmmu.c: early_pgtable_allocfail()
        - srmmu.c: srmmu_early_allocate_ptable_skeleton()
        - srmmu.c: srmmu_allocate_ptable_skeleton()
        - srmmu.c: srmmu_inherit_prom_mappings()
        - sunami.S: tsunami_copy_1page
      - remove the following unused code:
        - init.c: struct sparc_aliases
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      50215d65
    • Adrian Bunk's avatar
      sparc/kernel/: possible cleanups · c61c65cd
      Adrian Bunk authored
      This patch contains the following possible cleanups:
      - make the following needlessly global code static:
        - apc.c: apc_swift_idle()
        - ebus.c: ebus_blacklist_irq()
        - ebus.c: fill_ebus_child()
        - ebus.c: fill_ebus_device()
        - entry.S: syscall_is_too_hard
        - etra: tsetup_sun4c_stackchk
        - head.S: cputyp
        - head.S: prom_vector_p
        - idprom.c: Sun_Machines[]
        - ioport.c: _sparc_find_resource()
        - ioport.c: create_proc_read_entry()
        - irq.c: struct sparc_irq[]
        - rtrap.S: sun4c_rett_stackchk
        - setup.c: prom_sync_me()
        - setup.c: boot_flags
        - sun4c_irq.c: sun4c_sbint_to_irq()
        - sun4d_irq.c: sbus_tid[]
        - sun4d_irq.c: struct sbus_actions
        - sun4d_irq.c: sun4d_sbint_to_irq()
        - sun4m_irq.c: sun4m_sbint_to_irq()
        - sun4m_irq.c: sun4m_get_irqmask()
        - sun4m_irq.c: sun4m_timers
        - sun4m_smp.c: smp4m_cross_call()
        - sun4m_smp.c: smp4m_blackbox_id()
        - sun4m_smp.c: smp4m_blackbox_current()
        - time.c: sp_clock_typ
        - time.c: sbus_time_init()
        - traps.c: instruction_dump()
        - wof.S: spwin_sun4c_stackchk
        - wuf.S: sun4c_fwin_stackchk
      - #if 0 the following unused code:
        - process.c: sparc_backtrace_lock
        - process.c: __show_backtrace()
        - process.c: show_backtrace()
        - process.c: smp_show_backtrace_all_cpus()
      - remove the following unused code:
        - entry.S: __handle_exception
        - smp.c: smp_num_cpus
        - smp.c: smp_activated
        - smp.c: __cpu_number_map[]
        - smp.c: __cpu_logical_map[]
        - smp.c: bitops_spinlock
        - traps.c: trap_curbuf
        - traps.c: trapbuf[]
        - traps.c: linux_smp_still_initting
        - traps.c: thiscpus_tbr
        - traps.c: thiscpus_mid
      Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
      Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
      c61c65cd
  2. 17 Jul, 2008 9 commits