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

Commit 8f43d8e1 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 7b3dad3d 597d1f06

arch/sparc/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -55,6 +55,10 @@ config NR_CPUS 
	depends on SMP

	default "32"



config SPARC

	bool

	default y



# Identify this as a Sparc32 build

config SPARC32

	bool

arch/sparc/kernel/sys_sunos.c

+1 −1
Original line number Diff line number Diff line
@@ -894,7 +894,7 @@ asmlinkage long sunos_sysconf (int name) 
		ret = ARG_MAX;

		break;

	case _SC_CHILD_MAX:

		ret = CHILD_MAX;

		ret = -1; /* no limit */

		break;

	case _SC_CLK_TCK:

		ret = HZ;

arch/sparc64/Kconfig

+4 −0
Original line number Diff line number Diff line
@@ -5,6 +5,10 @@ 


mainmenu "Linux/UltraSPARC Kernel Configuration"



config SPARC

	bool

	default y



config SPARC64

	bool

	default y

arch/sparc64/kernel/sys_sunos32.c

+1 −1
Original line number Diff line number Diff line
@@ -854,7 +854,7 @@ asmlinkage s32 sunos_sysconf (int name) 
		ret = ARG_MAX;

		break;

	case _SC_CHILD_MAX:

		ret = CHILD_MAX;

		ret = -1; /* no limit */

		break;

	case _SC_CLK_TCK:

		ret = HZ;

arch/sparc64/solaris/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -353,7 +353,7 @@ asmlinkage int solaris_sysconf(int id) 
{

	switch (id) {

	case SOLARIS_CONFIG_NGROUPS:	return NGROUPS_MAX;

	case SOLARIS_CONFIG_CHILD_MAX:	return CHILD_MAX;

	case SOLARIS_CONFIG_CHILD_MAX:	return -1; /* no limit */

	case SOLARIS_CONFIG_OPEN_FILES:	return OPEN_MAX;

	case SOLARIS_CONFIG_POSIX_VER:	return 199309;

	case SOLARIS_CONFIG_PAGESIZE:	return PAGE_SIZE;