Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit d94d0e273eecf3a348c2aab1cad79c2ac4b926be

Authored by Linus Torvalds
2 parents 3e382dd9d0 97b8b16bfc
Exists in master and in 16 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-01.00.00, processor-sdk-linux-02.00.01, smarc-ti-linux-3.14.y, smarc-ti-linux-3.15.y, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04, ti-linux-3.14.y, ti-linux-3.15.y, ti-lsk-linux-4.1.y

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

Showing 7 changed files Side-by-side Diff

arch/mips/alchemy/devboards/db1000.c
Diff comments   View file @ d94d0e2
... ... @@ -534,13 +534,10 @@
534 534 s0 = AU1100_GPIO1_INT;
535 535 s1 = AU1100_GPIO4_INT;
536 536  
  537 + gpio_request(19, "sd0_cd");
  538 + gpio_request(20, "sd1_cd");
537 539 gpio_direction_input(19); /* sd0 cd# */
538 540 gpio_direction_input(20); /* sd1 cd# */
539   - gpio_direction_input(21); /* touch pendown# */
540   - gpio_direction_input(207); /* SPI MISO */
541   - gpio_direction_output(208, 0); /* SPI MOSI */
542   - gpio_direction_output(209, 1); /* SPI SCK */
543   - gpio_direction_output(210, 1); /* SPI CS# */
544 541  
545 542 /* spi_gpio on SSI0 pins */
546 543 pfc = __raw_readl((void __iomem *)SYS_PINFUNC);
arch/mips/include/asm/fpu.h
Diff comments   View file @ d94d0e2
... ... @@ -74,6 +74,8 @@
74 74 default:
75 75 BUG();
76 76 }
  77 +
  78 + return SIGFPE;
77 79 }
78 80  
79 81 #define __disable_fpu() \
arch/mips/include/uapi/asm/unistd.h
Diff comments   View file @ d94d0e2
... ... @@ -369,16 +369,18 @@
369 369 #define __NR_process_vm_writev (__NR_Linux + 346)
370 370 #define __NR_kcmp (__NR_Linux + 347)
371 371 #define __NR_finit_module (__NR_Linux + 348)
  372 +#define __NR_sched_setattr (__NR_Linux + 349)
  373 +#define __NR_sched_getattr (__NR_Linux + 350)
372 374  
373 375 /*
374 376 * Offset of the last Linux o32 flavoured syscall
375 377 */
376   -#define __NR_Linux_syscalls 348
  378 +#define __NR_Linux_syscalls 350
377 379  
378 380 #endif /* _MIPS_SIM == _MIPS_SIM_ABI32 */
379 381  
380 382 #define __NR_O32_Linux 4000
381   -#define __NR_O32_Linux_syscalls 348
  383 +#define __NR_O32_Linux_syscalls 350
382 384  
383 385 #if _MIPS_SIM == _MIPS_SIM_ABI64
384 386  
385 387  
386 388  
... ... @@ -695,16 +697,18 @@
695 697 #define __NR_kcmp (__NR_Linux + 306)
696 698 #define __NR_finit_module (__NR_Linux + 307)
697 699 #define __NR_getdents64 (__NR_Linux + 308)
  700 +#define __NR_sched_setattr (__NR_Linux + 309)
  701 +#define __NR_sched_getattr (__NR_Linux + 310)
698 702  
699 703 /*
700 704 * Offset of the last Linux 64-bit flavoured syscall
701 705 */
702   -#define __NR_Linux_syscalls 308
  706 +#define __NR_Linux_syscalls 310
703 707  
704 708 #endif /* _MIPS_SIM == _MIPS_SIM_ABI64 */
705 709  
706 710 #define __NR_64_Linux 5000
707   -#define __NR_64_Linux_syscalls 308
  711 +#define __NR_64_Linux_syscalls 310
708 712  
709 713 #if _MIPS_SIM == _MIPS_SIM_NABI32
710 714  
711 715  
712 716  
... ... @@ -1025,16 +1029,18 @@
1025 1029 #define __NR_process_vm_writev (__NR_Linux + 310)
1026 1030 #define __NR_kcmp (__NR_Linux + 311)
1027 1031 #define __NR_finit_module (__NR_Linux + 312)
  1032 +#define __NR_sched_setattr (__NR_Linux + 313)
  1033 +#define __NR_sched_getattr (__NR_Linux + 314)
1028 1034  
1029 1035 /*
1030 1036 * Offset of the last N32 flavoured syscall
1031 1037 */
1032   -#define __NR_Linux_syscalls 312
  1038 +#define __NR_Linux_syscalls 314
1033 1039  
1034 1040 #endif /* _MIPS_SIM == _MIPS_SIM_NABI32 */
1035 1041  
1036 1042 #define __NR_N32_Linux 6000
1037   -#define __NR_N32_Linux_syscalls 312
  1043 +#define __NR_N32_Linux_syscalls 314
1038 1044  
1039 1045 #endif /* _UAPI_ASM_UNISTD_H */
arch/mips/kernel/scall32-o32.S
Diff comments   View file @ d94d0e2
... ... @@ -563,4 +563,6 @@
563 563 PTR sys_process_vm_writev
564 564 PTR sys_kcmp
565 565 PTR sys_finit_module
  566 + PTR sys_sched_setattr
  567 + PTR sys_sched_getattr /* 4350 */
arch/mips/kernel/scall64-64.S
Diff comments   View file @ d94d0e2
... ... @@ -425,5 +425,7 @@
425 425 PTR sys_kcmp
426 426 PTR sys_finit_module
427 427 PTR sys_getdents64
  428 + PTR sys_sched_setattr
  429 + PTR sys_sched_getattr /* 5310 */
428 430 .size sys_call_table,.-sys_call_table
arch/mips/kernel/scall64-n32.S
Diff comments   View file @ d94d0e2
... ... @@ -418,5 +418,7 @@
418 418 PTR compat_sys_process_vm_writev /* 6310 */
419 419 PTR sys_kcmp
420 420 PTR sys_finit_module
  421 + PTR sys_sched_setattr
  422 + PTR sys_sched_getattr
421 423 .size sysn32_call_table,.-sysn32_call_table
arch/mips/kernel/scall64-o32.S
Diff comments   View file @ d94d0e2
... ... @@ -541,5 +541,7 @@
541 541 PTR compat_sys_process_vm_writev
542 542 PTR sys_kcmp
543 543 PTR sys_finit_module
  544 + PTR sys_sched_setattr
  545 + PTR sys_sched_getattr /* 4350 */
544 546 .size sys32_call_table,.-sys32_call_table