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

Commit 2cd6c7f7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc:
  sparc32,sun4d: Change IPI IRQ level to prevent collision between IPI and timer interrupt
  sparc: Remove another reference to nfsservctl
parents 380dc200 38f7f8f0

arch/sparc/kernel/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -88,7 +88,7 @@ BTFIXUPDEF_CALL(void, set_irq_udt, int) 
#define set_irq_udt(cpu) BTFIXUP_CALL(set_irq_udt)(cpu)



/* All SUN4D IPIs are sent on this IRQ, may be shared with hard IRQs */

#define SUN4D_IPI_IRQ 14

#define SUN4D_IPI_IRQ 13



extern void sun4d_ipi_interrupt(void);

arch/sparc/kernel/systbls_64.S

+1 −1
Original line number Diff line number Diff line
@@ -68,7 +68,7 @@ sys_call_table32: 
	.word compat_sys_fstatfs64, sys_llseek, sys_mlock, sys_munlock, sys32_mlockall

/*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 sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys32_nfsservctl

/*250*/	.word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall

	.word sys32_sync_file_range, 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