diff options
| author | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
|---|---|---|
| committer | David Woodhouse <dwmw2@infradead.org> | 2006-12-01 04:56:43 -0500 |
| commit | bd3c97a7c718bfb9f1e4f31c16c383a5c6f815eb (patch) | |
| tree | 3f56594e813c6f35cbacbdb3e137ba5bfd0b3069 /arch/avr32/kernel/syscall-stubs.S | |
| parent | 6c33cafc794d07c9254c160789120a0e98c088c9 (diff) | |
| parent | 0215ffb08ce99e2bb59eca114a99499a4d06e704 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'arch/avr32/kernel/syscall-stubs.S')
| -rw-r--r-- | arch/avr32/kernel/syscall-stubs.S | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S index 7589a9b426cb..890286a1e62b 100644 --- a/arch/avr32/kernel/syscall-stubs.S +++ b/arch/avr32/kernel/syscall-stubs.S | |||
| @@ -100,3 +100,12 @@ __sys_splice: | |||
| 100 | rcall sys_splice | 100 | rcall sys_splice |
| 101 | sub sp, -4 | 101 | sub sp, -4 |
| 102 | popm pc | 102 | popm pc |
| 103 | |||
| 104 | .global __sys_epoll_pwait | ||
| 105 | .type __sys_epoll_pwait,@function | ||
| 106 | __sys_epoll_pwait: | ||
| 107 | pushm lr | ||
| 108 | st.w --sp, ARG6 | ||
| 109 | rcall sys_epoll_pwait | ||
| 110 | sub sp, -4 | ||
| 111 | popm pc | ||