diff options
| author | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2010-09-03 16:38:52 -0400 |
| commit | 68885a3ff38ed51fa02f241feb405c9922a90ee0 (patch) | |
| tree | 2fc626df39d5e0e1f6b065238141f7d49187c737 /arch/sparc/kernel/sys32.S | |
| parent | 7b28079b3284ccb15ad4f003fb7073890600d0c1 (diff) | |
| parent | a2acad8298a42b7be684a32fafaf83332bba9c2b (diff) | |
Merge branch 'fix/misc' into topic/misc
Diffstat (limited to 'arch/sparc/kernel/sys32.S')
| -rw-r--r-- | arch/sparc/kernel/sys32.S | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/sparc/kernel/sys32.S b/arch/sparc/kernel/sys32.S index 46a76ba3fb4b..44e5faf1ad5f 100644 --- a/arch/sparc/kernel/sys32.S +++ b/arch/sparc/kernel/sys32.S | |||
| @@ -330,6 +330,15 @@ do_sys_accept4: /* sys_accept4(int, struct sockaddr *, int *, int) */ | |||
| 330 | nop | 330 | nop |
| 331 | nop | 331 | nop |
| 332 | 332 | ||
| 333 | .globl sys32_fanotify_mark | ||
| 334 | sys32_fanotify_mark: | ||
| 335 | sethi %hi(sys_fanotify_mark), %g1 | ||
| 336 | sllx %o2, 32, %o2 | ||
| 337 | or %o2, %o3, %o2 | ||
| 338 | mov %o4, %o3 | ||
| 339 | jmpl %g1 + %lo(sys_fanotify_mark), %g0 | ||
| 340 | mov %o5, %o4 | ||
| 341 | |||
| 333 | .section __ex_table,"a" | 342 | .section __ex_table,"a" |
| 334 | .align 4 | 343 | .align 4 |
| 335 | .word 1b, __retl_efault, 2b, __retl_efault | 344 | .word 1b, __retl_efault, 2b, __retl_efault |