diff options
| author | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-09-10 01:27:33 -0400 |
| commit | e548833df83c3554229eff0672900bfe958b45fd (patch) | |
| tree | 85efc4a76dc356593d6d394776aeb845dc580fb6 /arch/sparc/kernel/sys32.S | |
| parent | cbd9da7be869f676afc204e1a664163778c770bd (diff) | |
| parent | 053d8f6622701f849fda2ca2c9ae596c13599ba9 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
Conflicts:
net/mac80211/main.c
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 |