Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bfc1de0c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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: (24 commits)
  [SPARC]: Add solaris/sunos binary support to feature removal schedule.
  [SPARC]: Merge asm-sparc{,64}/a.out.h
  [SPARC]: Merge asm-sparc{,64}/fb.h
  [SPARC]: Merge asm-sparc{,64}/errno.h
  [SPARC]: Merge asm-sparc{,64}/emergency-restart.h
  [SPARC]: Merge asm-sparc{,64}/div64.h
  [SPARC]: Merge asm-sparc{,64}/device.h
  [SPARC]: Merge asm-sparc{,64}/current.h
  [SPARC]: Merge asm-sparc{,64}/cputime.h
  [SPARC]: Merge asm-sparc{,64}/cache.h
  [SPARC]: Merge asm-sparc{,64}/byteorder.h
  [SPARC]: Merge asm-sparc{,64}/bugs.h
  [SPARC]: Merge asm-sparc{,64}/bug.h
  [SPARC]: Kill BSD errno translation table and header files.
  [SPARC]: Merge asm-sparc{,64}/bpp.h
  [SPARC]: Merge include/asm-sparc{,64}/auxvec.h
  [SPARC]: Merge include/asm-sparc{,64}/of_device.h
  [SPARC]: Merge include/asm-sparc{,64}/prom.h
  [SPARC]: Remove of_platform_device_create
  [SPARC64]: Add kretprobe support.
  ...
parents 1712a699 e88bb415

Documentation/feature-removal-schedule.txt

+11 −0
Original line number Diff line number Diff line
@@ -304,3 +304,14 @@ Why: The support code for the old firmware hurts code readability/maintainabilit 
	and slightly hurts runtime performance. Bugfixes for the old firmware

	are not provided by Broadcom anymore.

Who:	Michael Buesch <mb@bu3sch.de>



---------------------------



What:	Solaris/SunOS syscall and binary support on Sparc

When:	2.6.26

Why:	Largely unmaintained and almost entirely unused.  File system

	layering used to divert library and dynamic linker searches to

	/usr/gnemul is extremely buggy and unfixable.  Making it work

	is largely pointless as without a lot of work only the most

	trivial of Solaris binaries can work with the emulation code.

Who:	David S. Miller <davem@davemloft.net>

arch/sparc/kernel/errtbls.c

+6 −138
Original line number Diff line number Diff line 
/* $Id: errtbls.c,v 1.2 1995/11/25 00:57:55 davem Exp $

 * errtbls.c: Error number conversion tables between various syscall

 *            OS semantics.

/* errtbls.c: Error number conversion tables.

 *

 * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)

 * Copyright (C) 1995, 2007 David S. Miller (davem@davemloft.net)

 *

 * Based upon preliminary work which is:

 *

 * Copyright (C) 1995 Adrian M. Rodriguez (adrian@remus.rutgers.edu)

 */



#include <asm/bsderrno.h>        /* NetBSD (bsd4.4) errnos */

#include <asm/solerrno.h>        /* Solaris errnos */



/* Here are tables which convert between Linux/SunOS error number

 * values to the equivalent in other OSs.  Note that since the Linux

 * ones have been set up to match exactly those of SunOS, no

 * translation table is needed for that OS.

/* Here is the table which converts between Linux error number values

 * to the equivalent under Solaris.  Note that since the Linux ones

 * have been set up to match exactly those of SunOS, no translation

 * table is needed for that OS.

 */



int solaris_errno[] = {
@@ -145,132 +142,3 @@ int solaris_errno[] = { 
	SOL_ELIBMAX,

	SOL_ELIBSCN,

};
 


int netbsd_errno[] = {

	0,

	BSD_EPERM,

	BSD_ENOENT,

	BSD_ESRCH,

	BSD_EINTR,

	BSD_EIO,

	BSD_ENXIO,

	BSD_E2BIG,

	BSD_ENOEXEC,

	BSD_EBADF,

	BSD_ECHILD,

	BSD_EAGAIN,

	BSD_ENOMEM,

	BSD_EACCES,

	BSD_EFAULT,

	BSD_NOTBLK,

	BSD_EBUSY,

	BSD_EEXIST,

	BSD_EXDEV,

	BSD_ENODEV,

	BSD_ENOTDIR,

	BSD_EISDIR,

	BSD_EINVAL,

	BSD_ENFILE,

	BSD_EMFILE,

	BSD_ENOTTY,

	BSD_ETXTBSY,

	BSD_EFBIG,

	BSD_ENOSPC,

	BSD_ESPIPE,

	BSD_EROFS,

	BSD_EMLINK,

	BSD_EPIPE,

	BSD_EDOM,

	BSD_ERANGE,

	BSD_EWOULDBLOCK,

	BSD_EINPROGRESS,

	BSD_EALREADY,

	BSD_ENOTSOCK,

	BSD_EDESTADDRREQ,

	BSD_EMSGSIZE,

	BSD_EPROTOTYPE,

	BSD_ENOPROTOOPT,

	BSD_EPROTONOSUPPORT,

	BSD_ESOCKTNOSUPPORT,

	BSD_EOPNOTSUPP,

	BSD_EPFNOSUPPORT,

	BSD_EAFNOSUPPORT,

	BSD_EADDRINUSE,

	BSD_EADDRNOTAVAIL,

	BSD_ENETDOWN,

	BSD_ENETUNREACH,

	BSD_ENETRESET,

	BSD_ECONNABORTED,

	BSD_ECONNRESET,

	BSD_ENOBUFS,

	BSD_EISCONN,

	BSD_ENOTONN,

	BSD_ESHUTDOWN,

	BSD_ETOOMANYREFS,

	BSD_ETIMEDOUT,

	BSD_ECONNREFUSED,

	BSD_ELOOP,

	BSD_ENAMETOOLONG,

	BSD_EHOSTDOWN,

	BSD_EHOSTUNREACH,

	BSD_ENOTEMPTY,

	BSD_EPROCLIM,

	BSD_EUSERS,

	BSD_EDQUOT,

	BSD_ESTALE,

	BSD_EREMOTE,

	BSD_ENOSTR,

	BSD_ETIME,

	BSD_ENOSR,

	BSD_ENOMSG,

	BSD_EBADMSG,

	BSD_IDRM,

	BSD_EDEADLK,

	BSD_ENOLCK,

	BSD_ENONET,

	BSD_ERREMOTE,

	BSD_ENOLINK,

	BSD_EADV,

	BSD_ESRMNT,

	BSD_ECOMM,

	BSD_EPROTO,

	BSD_EMULTIHOP,

	BSD_EINVAL,    /* EDOTDOT XXX??? */

	BSD_REMCHG,

	BSD_NOSYS,

	BSD_STRPIPE,

	BSD_EOVERFLOW,

	BSD_EBADFD,

	BSD_ECHRNG,

	BSD_EL2NSYNC,

	BSD_EL3HLT,

	BSD_EL3RST,

	BSD_NRNG,

	BSD_EUNATCH,

	BSD_ENOCSI,

	BSD_EL2HLT,

	BSD_EBADE,

	BSD_EBADR,

	BSD_EXFULL,

	BSD_ENOANO,

	BSD_EBADRQC,

	BSD_EBADSLT,

	BSD_EDEADLOCK,

	BSD_EBFONT,

	BSD_ELIBEXEC,

	BSD_ENODATA,

	BSD_ELIBBAD,

	BSD_ENOPKG,

	BSD_ELIBACC,

	BSD_ENOTUNIQ,

	BSD_ERESTART,

	BSD_EUCLEAN,

	BSD_ENOTNAM,

	BSD_ENAVAIL,

	BSD_EISNAM,

	BSD_EREMOTEIO,

	BSD_EILSEQ,

	BSD_ELIBMAX,

	BSD_ELIBSCN,

};

arch/sparc/kernel/of_device.c

+0 −27
Original line number Diff line number Diff line
@@ -584,30 +584,3 @@ static int __init of_debug(char *str) 
}



__setup("of_debug=", of_debug);
 


struct of_device* of_platform_device_create(struct device_node *np,

					    const char *bus_id,

					    struct device *parent,

					    struct bus_type *bus)

{

	struct of_device *dev;



	dev = kzalloc(sizeof(*dev), GFP_KERNEL);

	if (!dev)

		return NULL;



	dev->dev.parent = parent;

	dev->dev.bus = bus;

	dev->dev.release = of_release_dev;



	strlcpy(dev->dev.bus_id, bus_id, BUS_ID_SIZE);



	if (of_device_register(dev) != 0) {

		kfree(dev);

		return NULL;

	}



	return dev;

}



EXPORT_SYMBOL(of_platform_device_create);

arch/sparc/kernel/vmlinux.lds.S

+4 −0
Original line number Diff line number Diff line
@@ -89,6 +89,10 @@ SECTIONS 
	.data.cacheline_aligned : {

		*(.data.cacheline_aligned)

	}

	. = ALIGN(32);

	.data.read_mostly : {

		*(.data.read_mostly)

	}



	__bss_start = .;

	.sbss : {

arch/sparc64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -41,6 +41,10 @@ config MMU 
	bool

	default y



config IOMMU_HELPER

	bool

	default y



config QUICKLIST

	bool

	default y