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

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

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

* master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
  [SPARC64]: Add missing HPAGE_MASK masks on address parameters.
  [SPARC]: Hook up missing syscalls.
parents b174ec2c bb8236f2

arch/sparc/kernel/systbls.S

+5 −1
Original line number Original line Diff line number Diff line
@@ -78,7 +78,8 @@ sys_call_table: 
/*285*/	.long sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64

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

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

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

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

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

/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages

/*300*/	.long sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

/*305*/	.long sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait





#ifdef CONFIG_SUNOS_EMUL

#ifdef CONFIG_SUNOS_EMUL

	/* Now the SunOS syscall table. */

	/* Now the SunOS syscall table. */
@@ -192,5 +193,8 @@ sunos_sys_table: 
	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys, sunos_nosys, sunos_nosys

	.long sunos_nosys

	.long sunos_nosys

/*300*/	.long sunos_nosys, sunos_nosys, sunos_nosys

/*300*/	.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
 
#endif

arch/sparc64/kernel/systbls.S

+7 −2
Original line number Original line Diff line number Diff line
@@ -79,7 +79,8 @@ sys_call_table32: 
	.word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64

	.word sys_mkdirat, sys_mknodat, sys_fchownat, compat_sys_futimesat, compat_sys_fstatat64

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

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

	.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare

	.word sys_fchmodat, sys_faccessat, compat_sys_pselect6, compat_sys_ppoll, sys_unshare

/*300*/	.word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages

/*300*/	.word compat_sys_set_robust_list, compat_sys_get_robust_list, compat_sys_migrate_pages, compat_sys_mbind, compat_sys_get_mempolicy

	.word compat_sys_set_mempolicy, compat_sys_kexec_load, compat_sys_move_pages, sys_getcpu, compat_sys_epoll_pwait





#endif /* CONFIG_COMPAT */

#endif /* CONFIG_COMPAT */
@@ -149,7 +150,8 @@ sys_call_table: 
	.word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64

	.word sys_mkdirat, sys_mknodat, sys_fchownat, sys_futimesat, sys_fstatat64

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

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

	.word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare

	.word sys_fchmodat, sys_faccessat, sys_pselect6, sys_ppoll, sys_unshare

/*300*/	.word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages

/*300*/	.word sys_set_robust_list, sys_get_robust_list, sys_migrate_pages, sys_mbind, sys_get_mempolicy

	.word sys_set_mempolicy, sys_kexec_load, sys_move_pages, sys_getcpu, sys_epoll_pwait





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

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

    defined(CONFIG_SOLARIS_EMUL_MODULE)

    defined(CONFIG_SOLARIS_EMUL_MODULE)
@@ -264,5 +266,8 @@ sunos_sys_table: 
	.word sunos_nosys, sunos_nosys, sunos_nosys

	.word sunos_nosys, sunos_nosys, sunos_nosys

	.word sunos_nosys

	.word sunos_nosys

/*300*/	.word sunos_nosys, sunos_nosys, sunos_nosys

/*300*/	.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
 
#endif

arch/sparc64/mm/hugetlbpage.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -248,6 +248,7 @@ void set_huge_pte_at(struct mm_struct *mm, unsigned long addr, 
	if (!pte_present(*ptep) && pte_present(entry))

	if (!pte_present(*ptep) && pte_present(entry))

		mm->context.huge_pte_count++;

		mm->context.huge_pte_count++;





	addr &= HPAGE_MASK;

	for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {

	for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {

		set_pte_at(mm, addr, ptep, entry);

		set_pte_at(mm, addr, ptep, entry);

		ptep++;

		ptep++;
@@ -266,6 +267,8 @@ pte_t huge_ptep_get_and_clear(struct mm_struct *mm, unsigned long addr, 
	if (pte_present(entry))

	if (pte_present(entry))

		mm->context.huge_pte_count--;

		mm->context.huge_pte_count--;





	addr &= HPAGE_MASK;



	for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {

	for (i = 0; i < (1 << HUGETLB_PAGE_ORDER); i++) {

		pte_clear(mm, addr, ptep);

		pte_clear(mm, addr, ptep);

		addr += PAGE_SIZE;

		addr += PAGE_SIZE;

include/asm-sparc/unistd.h

+8 −7
Original line number Original line Diff line number Diff line
@@ -319,16 +319,17 @@ 
#define __NR_set_robust_list	300

#define __NR_set_robust_list	300

#define __NR_get_robust_list	301

#define __NR_get_robust_list	301

#define __NR_migrate_pages	302

#define __NR_migrate_pages	302

#define __NR_mbind		303

#define __NR_get_mempolicy	304

#define __NR_set_mempolicy	305

#define __NR_kexec_load		306

#define __NR_move_pages		307

#define __NR_getcpu		308

#define __NR_epoll_pwait	309





#define NR_SYSCALLS		303

#define NR_SYSCALLS		310





#ifdef __KERNEL__

#ifdef __KERNEL__

/* WARNING: You MAY NOT add syscall numbers larger than 302, since

 *          all of the syscall tables in the Sparc kernel are

 *          sized to have 302 entries (starting at zero).  Therefore

 *          find a free slot in the 0-302 range.

 */



#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_IPC_PARSE_VERSION

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_OLD_READDIR

#define __ARCH_WANT_STAT64

#define __ARCH_WANT_STAT64

include/asm-sparc64/unistd.h

+8 −8
Original line number Original line Diff line number Diff line
@@ -321,17 +321,17 @@ 
#define __NR_set_robust_list	300

#define __NR_set_robust_list	300

#define __NR_get_robust_list	301

#define __NR_get_robust_list	301

#define __NR_migrate_pages	302

#define __NR_migrate_pages	302

#define __NR_mbind		303

#define __NR_get_mempolicy	304

#define __NR_set_mempolicy	305

#define __NR_kexec_load		306

#define __NR_move_pages		307

#define __NR_getcpu		308

#define __NR_epoll_pwait	309





#define NR_SYSCALLS		303

#define NR_SYSCALLS		310





#ifdef __KERNEL__

#ifdef __KERNEL__



/* WARNING: You MAY NOT add syscall numbers larger than 302, since

 *          all of the syscall tables in the Sparc kernel are

 *          sized to have 302 entries (starting at zero).  Therefore

 *          find a free slot in the 0-302 range.

 */



/* sysconf options, for SunOS compatibility */

/* sysconf options, for SunOS compatibility */

#define   _SC_ARG_MAX             1

#define   _SC_ARG_MAX             1

#define   _SC_CHILD_MAX           2

#define   _SC_CHILD_MAX           2