GitHub-Mirror/linux-bl808
2
0
Fork 0
mirror of https://github.com/Fishwaldo/linux-bl808.git synced 2025-04-01 03:44:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Microblaze patches for 4.0-rc4

Browse source 
- Fix syscall error recovery
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.10 (GNU/Linux)
 
 iEYEABECAAYFAlUBReoACgkQykllyylKDCE2JQCdGkwwVSH7hoPHSUUAIcstxR1U
 JJYAoIElkFV8azSi1y4Cf6spNL76mYNs
 =JekW
 -----END PGP SIGNATURE-----

Merge tag 'microblaze-4.0-rc4' of git://git.monstr.eu/linux-2.6-microblaze

Pull arch/microblaze fixes from Michal Simek:
 "Fix syscall error recovery.

  Two patches - one is just preparation patch for the second which is
  fixing the problem with syscalls"

* tag 'microblaze-4.0-rc4' of git://git.monstr.eu/linux-2.6-microblaze:
  microblaze: Fix syscall error recovery for invalid syscall IDs
  microblaze: Coding style cleanup
This commit is contained in:
Linus Torvalds 2015-03-12 09:34:10 -07:00
commit d3dd73fc9e
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
arch/microblaze/kernel/entry.S
View file

@ -348,6 +348,7 @@ C_ENTRY(_user_exception):
* The LP register should point to the location where the called function * The LP register should point to the location where the called function
* should return. [note that MAKE_SYS_CALL uses label 1] */ * should return. [note that MAKE_SYS_CALL uses label 1] */
/* See if the system call number is valid */ /* See if the system call number is valid */
blti r12, 5f
addi r11, r12, -__NR_syscalls; addi r11, r12, -__NR_syscalls;
bgei r11, 5f; bgei r11, 5f;
/* Figure out which function to use for this system call. */ /* Figure out which function to use for this system call. */
@ -375,7 +376,7 @@ C_ENTRY(_user_exception):
/* The syscall number is invalid, return an error. */ /* The syscall number is invalid, return an error. */
5: 5:
rtsd r15, 8; /* looks like a normal subroutine return */ braid ret_from_trap
addi r3, r0, -ENOSYS; addi r3, r0, -ENOSYS;
/* Entry point used to return from a syscall/trap */ /* Entry point used to return from a syscall/trap */