Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-3
+4
-3
arch/microblaze/kernel/entry.S
+4
-3
arch/microblaze/kernel/entry.S
···
348
348
* The LP register should point to the location where the called function
349
349
* should return. [note that MAKE_SYS_CALL uses label 1] */
350
350
/* See if the system call number is valid */
351
+
blti r12, 5f
351
352
addi r11, r12, -__NR_syscalls;
352
-
bgei r11,5f;
353
+
bgei r11, 5f;
353
354
/* Figure out which function to use for this system call. */
354
355
/* Note Microblaze barrel shift is optional, so don't rely on it */
355
356
add r12, r12, r12; /* convert num -> ptr */
···
376
375
377
376
/* The syscall number is invalid, return an error. */
378
377
5:
379
-
rtsd r15, 8; /* looks like a normal subroutine return */
378
+
braid ret_from_trap
380
379
addi r3, r0, -ENOSYS;
381
380
382
381
/* Entry point used to return from a syscall/trap */
···
412
411
bri 1b
413
412
414
413
/* Maybe handle a signal */
415
-
5:
414
+
5:
416
415
andi r11, r19, _TIF_SIGPENDING | _TIF_NOTIFY_RESUME;
417
416
beqi r11, 4f; /* Signals to handle, handle them */
418
417