korg/linux
0
0
Fork 0
mirror of https://mirrors.bfsu.edu.cn/git/linux.git synced 2025-01-18 20:04:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32

Browse Source 
Pull AVR32 updates from Hans-Christian Noren Egtvedt.

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/egtvedt/linux-avr32:
  avr32: off by one in at32_init_pio()
  avr32: fixup code style in unistd.h and syscall_table.S
  avr32: wire up preadv2 and pwritev2 syscalls
This commit is contained in:
Linus Torvalds 2016-07-29 13:09:55 -07:00
commit befff3bfb3
4 changed files with 675 additions and 653 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/avr32/include/uapi/asm/unistd.h
View File

@ -234,11 +234,10 @@
#define __NR_statfs64 219
#define __NR_fstatfs64 220
#define __NR_tgkill 221
/* 222 reserved for tux */
/* 222 reserved for tux */
#define __NR_utimes 223
#define __NR_fadvise64_64 224
#define __NR_cacheflush 225
#define __NR_vserver 226
#define __NR_mq_open 227
#define __NR_mq_unlink 228
@ -295,6 +294,7 @@
#define __NR_signalfd 279
/* 280 was __NR_timerfd */
#define __NR_eventfd 281
/* 282 was half-implemented __NR_recvmmsg */
#define __NR_setns 283
#define __NR_pread64 284
#define __NR_pwrite64 285
@ -338,5 +338,7 @@
#define __NR_membarrier 323
#define __NR_mlock2 324
#define __NR_copy_file_range 325
#define __NR_preadv2 326
#define __NR_pwritev2 327
#endif /* _UAPI__ASM_AVR32_UNISTD_H */

18
arch/avr32/kernel/syscall-stubs.S
View File

@ -133,3 +133,21 @@ __sys_copy_file_range:
call sys_copy_file_range
sub sp, -4
popm pc
.global __sys_preadv2
.type __sys_preadv2,@function
__sys_preadv2:
pushm lr
st.w --sp, ARG6
call sys_preadv2
sub sp, -4
popm pc
.global __sys_pwritev2
.type __sys_pwritev2,@function
__sys_pwritev2:
pushm lr
st.w --sp, ARG6
call sys_pwritev2
sub sp, -4
popm pc

68
arch/avr32/kernel/syscall_table.S
View File

@ -18,7 +18,7 @@ sys_call_table:
.long sys_fork
.long sys_read
.long sys_write
.long sys_open /* 5 */
.long sys_open
.long sys_close
.long sys_umask
.long sys_creat
@ -28,7 +28,7 @@ sys_call_table:
.long sys_chdir
.long sys_time
.long sys_mknod
.long sys_chmod /* 15 */
.long sys_chmod
.long sys_chown
.long sys_lchown
.long sys_lseek
@ -38,7 +38,7 @@ sys_call_table:
.long sys_umount
.long sys_setuid
.long sys_getuid
.long sys_stime /* 25 */
.long sys_stime
.long sys_ptrace
.long sys_alarm
.long sys_pause
@ -48,7 +48,7 @@ sys_call_table:
.long sys_newlstat
.long sys_access
.long sys_chroot
.long sys_sync /* 35 */
.long sys_sync
.long sys_fsync
.long sys_kill
.long sys_rename
@ -58,7 +58,7 @@ sys_call_table:
.long sys_pipe
.long sys_times
.long sys_clone
.long sys_brk /* 45 */
.long sys_brk
.long sys_setgid
.long sys_getgid
.long sys_getcwd
@ -68,7 +68,7 @@ sys_call_table:
.long sys_setfsuid
.long sys_setfsgid
.long sys_ioctl
.long sys_fcntl /* 55 */
.long sys_fcntl
.long sys_setpgid
.long sys_mremap
.long sys_setresuid
@ -78,7 +78,7 @@ sys_call_table:
.long sys_ustat
.long sys_dup2
.long sys_getppid
.long sys_getpgrp /* 65 */
.long sys_getpgrp
.long sys_setsid
.long sys_rt_sigaction
.long __sys_rt_sigreturn
@ -88,7 +88,7 @@ sys_call_table:
.long sys_rt_sigqueueinfo
.long __sys_rt_sigsuspend
.long sys_sethostname
.long sys_setrlimit /* 75 */
.long sys_setrlimit
.long sys_getrlimit
.long sys_getrusage
.long sys_gettimeofday
@ -98,7 +98,7 @@ sys_call_table:
.long sys_select
.long sys_symlink
.long sys_fchdir
.long sys_readlink /* 85 */
.long sys_readlink
.long sys_pread64
.long sys_pwrite64
.long sys_swapon
@ -108,7 +108,7 @@ sys_call_table:
.long sys_truncate
.long sys_ftruncate
.long sys_fchmod
.long sys_fchown /* 95 */
.long sys_fchown
.long sys_getpriority
.long sys_setpriority
.long sys_wait4
@ -118,7 +118,7 @@ sys_call_table:
.long sys_sigaltstack
.long sys_syslog
.long sys_setitimer
.long sys_getitimer /* 105 */
.long sys_getitimer
.long sys_swapoff
.long sys_sysinfo
.long sys_ni_syscall /* was sys_ipc briefly */
@ -128,7 +128,7 @@ sys_call_table:
.long sys_adjtimex
.long sys_mprotect
.long sys_vfork
.long sys_init_module /* 115 */
.long sys_init_module
.long sys_delete_module
.long sys_quotactl
.long sys_getpgid
@ -138,7 +138,7 @@ sys_call_table:
.long sys_ni_syscall /* reserved for afs_syscall */
.long sys_getdents
.long sys_flock
.long sys_msync /* 125 */
.long sys_msync
.long sys_readv
.long sys_writev
.long sys_getsid
@ -148,7 +148,7 @@ sys_call_table:
.long sys_munlock
.long sys_mlockall
.long sys_munlockall
.long sys_sched_setparam /* 135 */
.long sys_sched_setparam
.long sys_sched_getparam
.long sys_sched_setscheduler
.long sys_sched_getscheduler
@ -168,7 +168,7 @@ sys_call_table:
.long sys_listen
.long sys_accept
.long sys_getsockname
.long sys_getpeername /* 155 */
.long sys_getpeername
.long sys_socketpair
.long sys_send
.long sys_recv
@ -178,7 +178,7 @@ sys_call_table:
.long sys_setsockopt
.long sys_getsockopt
.long sys_sendmsg
.long sys_recvmsg /* 165 */
.long sys_recvmsg
.long sys_truncate64
.long sys_ftruncate64
.long sys_stat64
@ -188,7 +188,7 @@ sys_call_table:
.long sys_mincore
.long sys_madvise
.long sys_getdents64
.long sys_fcntl64 /* 175 */
.long sys_fcntl64
.long sys_gettid
.long sys_readahead
.long sys_setxattr
@ -198,7 +198,7 @@ sys_call_table:
.long sys_lgetxattr
.long sys_fgetxattr
.long sys_listxattr
.long sys_llistxattr /* 185 */
.long sys_llistxattr
.long sys_flistxattr
.long sys_removexattr
.long sys_lremovexattr
@ -208,7 +208,7 @@ sys_call_table:
.long sys_futex
.long sys_sched_setaffinity
.long sys_sched_getaffinity
.long sys_capget /* 195 */
.long sys_capget
.long sys_capset
.long sys_io_setup
.long sys_io_destroy
@ -218,7 +218,7 @@ sys_call_table:
.long sys_fadvise64
.long sys_exit_group
.long sys_lookup_dcookie
.long sys_epoll_create /* 205 */
.long sys_epoll_create
.long sys_epoll_ctl
.long sys_epoll_wait
.long sys_remap_file_pages
@ -228,7 +228,7 @@ sys_call_table:
.long sys_timer_gettime
.long sys_timer_getoverrun
.long sys_timer_delete
.long sys_clock_settime /* 215 */
.long sys_clock_settime
.long sys_clock_gettime
.long sys_clock_getres
.long sys_clock_nanosleep
@ -238,7 +238,7 @@ sys_call_table:
.long sys_ni_syscall /* reserved for TUX */
.long sys_utimes
.long sys_fadvise64_64
.long sys_cacheflush /* 225 */
.long sys_cacheflush
.long sys_ni_syscall /* sys_vserver */
.long sys_mq_open
.long sys_mq_unlink
@ -248,7 +248,7 @@ sys_call_table:
.long sys_mq_getsetattr
.long sys_kexec_load
.long sys_waitid
.long sys_add_key /* 235 */
.long sys_add_key
.long sys_request_key
.long sys_keyctl
.long sys_ioprio_set
@ -258,7 +258,7 @@ sys_call_table:
.long sys_inotify_rm_watch
.long sys_openat
.long sys_mkdirat
.long sys_mknodat /* 245 */
.long sys_mknodat
.long sys_fchownat
.long sys_futimesat
.long sys_fstatat64
@ -268,7 +268,7 @@ sys_call_table:
.long sys_symlinkat
.long sys_readlinkat
.long sys_fchmodat
.long sys_faccessat /* 255 */
.long sys_faccessat
.long __sys_pselect6
.long sys_ppoll
.long sys_unshare
@ -278,7 +278,7 @@ sys_call_table:
.long __sys_sync_file_range
.long sys_tee
.long sys_vmsplice
.long __sys_epoll_pwait /* 265 */
.long __sys_epoll_pwait
.long sys_msgget
.long sys_msgsnd
.long sys_msgrcv
@ -288,17 +288,17 @@ sys_call_table:
.long sys_semctl
.long sys_semtimedop
.long sys_shmat
.long sys_shmget /* 275 */
.long sys_shmget
.long sys_shmdt
.long sys_shmctl
.long sys_utimensat
.long sys_signalfd
.long sys_ni_syscall /* 280, was sys_timerfd */
.long sys_eventfd
.long sys_recvmmsg
.long sys_ni_syscall /* 282, was half-implemented recvmmsg */
.long sys_setns
.long sys_pread64
.long sys_pwrite64 /* 285 */
.long sys_pwrite64
.long sys_timerfd_create
.long __sys_fallocate
.long sys_timerfd_settime
@ -308,7 +308,7 @@ sys_call_table:
.long sys_epoll_create1
.long sys_dup3
.long sys_pipe2
.long sys_inotify_init1 /* 295 */
.long sys_inotify_init1
.long sys_preadv
.long sys_pwritev
.long sys_rt_tgsigqueueinfo
@ -318,7 +318,7 @@ sys_call_table:
.long __sys_fanotify_mark
.long sys_prlimit64
.long sys_name_to_handle_at
.long sys_open_by_handle_at /* 305 */
.long sys_open_by_handle_at
.long sys_clock_adjtime
.long sys_syncfs
.long sys_sendmmsg
@ -328,7 +328,7 @@ sys_call_table:
.long sys_finit_module
.long sys_sched_setattr
.long sys_sched_getattr
.long sys_renameat2 /* 315 */
.long sys_renameat2
.long sys_seccomp
.long sys_getrandom
.long sys_memfd_create
@ -338,5 +338,7 @@ sys_call_table:
.long sys_userfaultfd
.long sys_membarrier
.long sys_mlock2
.long __sys_copy_file_range /* 325 */
.long __sys_copy_file_range
.long __sys_preadv2
.long __sys_pwritev2
.long sys_ni_syscall /* r8 is saturated at nr_syscalls */

2
arch/avr32/mach-at32ap/pio.c
View File

@ -435,7 +435,7 @@ void __init at32_init_pio(struct platform_device *pdev)
struct resource *regs;
struct pio_device *pio;
if (pdev->id > MAX_NR_PIO_DEVICES) {
if (pdev->id >= MAX_NR_PIO_DEVICES) {
dev_err(&pdev->dev, "only %d PIO devices supported\n",
MAX_NR_PIO_DEVICES);
return;