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

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

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

parents 951069e3 22f01da3

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 284      /* Each OS is different... */

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



/* These are just handy. */

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

arch/sparc/math-emu/math.c

+0 −10
Original line number Diff line number Diff line
@@ -323,11 +323,6 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs) 
		case FMOVS:

		case FABSS:

		case FNEGS: TYPE(2,1,0,1,0,0,0); break;

		default:

#ifdef DEBUG_MATHEMU

			printk("unknown FPop1: %03lx\n",(insn>>5)&0x1ff);

#endif

			break;

		}

	} else if ((insn & 0xc1f80000) == 0x81a80000)	/* FPOP2 */ {

		switch ((insn >> 5) & 0x1ff) {
@@ -337,11 +332,6 @@ static int do_one_mathemu(u32 insn, unsigned long *pfsr, unsigned long *fregs) 
		case FCMPED: TYPE(3,0,0,2,1,2,1); break;

		case FCMPQ: TYPE(3,0,0,3,1,3,1); break;

		case FCMPEQ: TYPE(3,0,0,3,1,3,1); break;

		default:

#ifdef DEBUG_MATHEMU

			printk("unknown FPop2: %03lx\n",(insn>>5)&0x1ff);

#endif

			break;

		}

	}

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 284      /* Each OS is different... */

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



	.text

	.align		32

arch/sparc64/kernel/sys32.S

+0 −1
Original line number Diff line number Diff line
@@ -84,7 +84,6 @@ SIGN2(sys32_fadvise64_64, compat_sys_fadvise64_64, %o0, %o5) 
SIGN2(sys32_bdflush, sys_bdflush, %o0, %o1)

SIGN1(sys32_mlockall, sys_mlockall, %o0)

SIGN1(sys32_nfsservctl, compat_sys_nfsservctl, %o0)

SIGN1(sys32_clock_settime, compat_sys_clock_settime, %o1)

SIGN1(sys32_clock_nanosleep, compat_sys_clock_nanosleep, %o1)

SIGN1(sys32_timer_settime, compat_sys_timer_settime, %o1)

SIGN1(sys32_io_submit, compat_sys_io_submit, %o1)

arch/sparc64/kernel/systbls.S

+1 −1
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ sys_call_table32: 
/*240*/	.word sys_munlockall, sys32_sched_setparam, sys32_sched_getparam, sys32_sched_setscheduler, sys32_sched_getscheduler

	.word sys_sched_yield, sys32_sched_get_priority_max, sys32_sched_get_priority_min, sys32_sched_rr_get_interval, compat_sys_nanosleep

/*250*/	.word sys32_mremap, sys32_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl

	.word sys_ni_syscall, sys32_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep

	.word sys_ni_syscall, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep

/*260*/	.word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun

	.word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy

/*270*/	.word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink