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

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

Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus 

Pull MIPS updates from Ralf Baechle:
 "hree minor patches.  All have sat in -next for a few days"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus:
  MIPS: fpu.h: Fix build when CONFIG_BUG is not set
  MIPS: Wire up sched_setattr/sched_getattr syscalls
  MIPS: Alchemy: Fix DB1100 GPIO registration
parents 3e382dd9 97b8b16b

arch/mips/alchemy/devboards/db1000.c

+2 −5
Original line number Diff line number Diff line
@@ -534,13 +534,10 @@ static int __init db1000_dev_init(void) 
		s0 = AU1100_GPIO1_INT;

		s1 = AU1100_GPIO4_INT;



		gpio_request(19, "sd0_cd");

		gpio_request(20, "sd1_cd");

		gpio_direction_input(19);	/* sd0 cd# */

		gpio_direction_input(20);	/* sd1 cd# */

		gpio_direction_input(21);	/* touch pendown# */

		gpio_direction_input(207);	/* SPI MISO */

		gpio_direction_output(208, 0);	/* SPI MOSI */

		gpio_direction_output(209, 1);	/* SPI SCK */

		gpio_direction_output(210, 1);	/* SPI CS# */



		/* spi_gpio on SSI0 pins */

		pfc = __raw_readl((void __iomem *)SYS_PINFUNC);

arch/mips/include/asm/fpu.h

+2 −0
Original line number Diff line number Diff line
@@ -74,6 +74,8 @@ static inline int __enable_fpu(enum fpu_mode mode) 
	default:

		BUG();

	}



	return SIGFPE;

}



#define __disable_fpu()							\

arch/mips/include/uapi/asm/unistd.h

+12 −6
Original line number Diff line number Diff line
@@ -369,16 +369,18 @@ 
#define __NR_process_vm_writev		(__NR_Linux + 346)

#define __NR_kcmp			(__NR_Linux + 347)

#define __NR_finit_module		(__NR_Linux + 348)

#define __NR_sched_setattr		(__NR_Linux + 349)

#define __NR_sched_getattr		(__NR_Linux + 350)



/*

 * Offset of the last Linux o32 flavoured syscall

 */

#define __NR_Linux_syscalls		348

#define __NR_Linux_syscalls		350



#endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */



#define __NR_O32_Linux			4000

#define __NR_O32_Linux_syscalls		348

#define __NR_O32_Linux_syscalls		350



#if _MIPS_SIM == _MIPS_SIM_ABI64
@@ -695,16 +697,18 @@ 
#define __NR_kcmp			(__NR_Linux + 306)

#define __NR_finit_module		(__NR_Linux + 307)

#define __NR_getdents64			(__NR_Linux + 308)

#define __NR_sched_setattr		(__NR_Linux + 309)

#define __NR_sched_getattr		(__NR_Linux + 310)



/*

 * Offset of the last Linux 64-bit flavoured syscall

 */

#define __NR_Linux_syscalls		308

#define __NR_Linux_syscalls		310



#endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */



#define __NR_64_Linux			5000

#define __NR_64_Linux_syscalls		308

#define __NR_64_Linux_syscalls		310



#if _MIPS_SIM == _MIPS_SIM_NABI32
@@ -1025,15 +1029,17 @@ 
#define __NR_process_vm_writev		(__NR_Linux + 310)

#define __NR_kcmp			(__NR_Linux + 311)

#define __NR_finit_module		(__NR_Linux + 312)

#define __NR_sched_setattr		(__NR_Linux + 313)

#define __NR_sched_getattr		(__NR_Linux + 314)



/*

 * Offset of the last N32 flavoured syscall

 */

#define __NR_Linux_syscalls		312

#define __NR_Linux_syscalls		314



#endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */



#define __NR_N32_Linux			6000

#define __NR_N32_Linux_syscalls		312

#define __NR_N32_Linux_syscalls		314



#endif /* _UAPI_ASM_UNISTD_H */

arch/mips/kernel/scall32-o32.S

+2 −0
Original line number Diff line number Diff line
@@ -563,3 +563,5 @@ EXPORT(sys_call_table) 
	PTR	sys_process_vm_writev

	PTR	sys_kcmp

	PTR	sys_finit_module

	PTR	sys_sched_setattr

	PTR	sys_sched_getattr		/* 4350 */

arch/mips/kernel/scall64-64.S

+2 −0
Original line number Diff line number Diff line
@@ -425,4 +425,6 @@ EXPORT(sys_call_table) 
	PTR	sys_kcmp

	PTR	sys_finit_module

	PTR	sys_getdents64

	PTR	sys_sched_setattr

	PTR	sys_sched_getattr		/* 5310 */

	.size	sys_call_table,.-sys_call_table