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

Commit 746f956b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

parents 367636e8 0fc9b556

arch/sparc/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ 


#define curptr      g6



#define NR_SYSCALLS 299      /* Each OS is different... */

#define NR_SYSCALLS 300      /* Each OS is different... */



/* These are just handy. */

#define _SV	save	%sp, -STACKFRAME_SZ, %sp

arch/sparc/kernel/systbls.S

+2 −1
Original line number Diff line number Diff line
@@ -78,7 +78,7 @@ sys_call_table: 
/*280*/	.long sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat

/*285*/	.long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_newfstatat

/*290*/	.long sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat

/*295*/	.long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll

/*295*/	.long sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare



#ifdef CONFIG_SUNOS_EMUL

	/* Now the SunOS syscall table. */
@@ -190,5 +190,6 @@ sunos_sys_table: 
/*290*/	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys



#endif

arch/sparc64/defconfig

+3 −2
Original line number Diff line number Diff line 
#

# Automatically generated make config: don't edit

# Linux kernel version: 2.6.16-rc2

# Sat Feb  4 02:31:38 2006

# Tue Feb  7 17:47:18 2006

#

CONFIG_SPARC=y

CONFIG_SPARC64=y
@@ -30,7 +30,7 @@ CONFIG_INIT_ENV_ARG_LIMIT=32 
# General setup

#

CONFIG_LOCALVERSION=""

CONFIG_LOCALVERSION_AUTO=y

# CONFIG_LOCALVERSION_AUTO is not set

CONFIG_SWAP=y

CONFIG_SYSVIPC=y

CONFIG_POSIX_MQUEUE=y
@@ -766,6 +766,7 @@ CONFIG_HWMON=y 
# CONFIG_SENSORS_ASB100 is not set

# CONFIG_SENSORS_ATXP1 is not set

# CONFIG_SENSORS_DS1621 is not set

# CONFIG_SENSORS_F71805F is not set

# CONFIG_SENSORS_FSCHER is not set

# CONFIG_SENSORS_FSCPOS is not set

# CONFIG_SENSORS_GL518SM is not set

arch/sparc64/kernel/entry.S

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ 


#define curptr      g6



#define NR_SYSCALLS 299      /* Each OS is different... */

#define NR_SYSCALLS 300      /* Each OS is different... */



	.text

	.align		32

arch/sparc64/kernel/systbls.S

+3 −2
Original line number Diff line number Diff line
@@ -79,7 +79,7 @@ sys_call_table32: 
/*280*/	.word sys_ni_syscall, sys_add_key, sys_request_key, sys_keyctl, compat_sys_openat

	.word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_newfstatat

/*285*/	.word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat

	.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll

	.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare



#endif /* CONFIG_COMPAT */
@@ -148,7 +148,7 @@ sys_call_table: 
/*280*/	.word sys_nis_syscall, sys_add_key, sys_request_key, sys_keyctl, sys_openat

	.word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, compat_sys_newfstatat

/*285*/	.word sys_unlinkat, sys_renameat, sys_linkat, sys_symlinkat, sys_readlinkat

	.word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll

	.word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare



#if defined(CONFIG_SUNOS_EMUL) || defined(CONFIG_SOLARIS_EMUL) || \

    defined(CONFIG_SOLARIS_EMUL_MODULE)
@@ -261,4 +261,5 @@ sunos_sys_table: 
/*290*/	.word sunos_nosys, sunos_nosys, sunos_nosys

	.word sunos_nosys, sunos_nosys, sunos_nosys

	.word sunos_nosys, sunos_nosys, sunos_nosys

	.word sunos_nosys

#endif