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

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

4 files changed, 675 insertions, 653 deletions

diff --git a/arch/avr32/include/uapi/asm/unistd.h b/arch/avr32/include/uapi/asm/unistd.h
index 60c0f3afc1f9..2c8a0d2b6c30 100644
--- a/arch/avr32/include/uapi/asm/unistd.h
+++ b/arch/avr32/include/uapi/asm/unistd.h
@@ -12,331 +12,333 @@
  * This file contains the system call numbers.
  */
 
-#define __NR_restart_syscall      0
-#define __NR_exit                 1
-#define __NR_fork                 2
-#define __NR_read                 3
-#define __NR_write                4
-#define __NR_open                 5
-#define __NR_close                6
-#define __NR_umask                7
-#define __NR_creat                8
-#define __NR_link                 9
-#define __NR_unlink              10
-#define __NR_execve              11
-#define __NR_chdir               12
-#define __NR_time                13
-#define __NR_mknod               14
-#define __NR_chmod               15
-#define __NR_chown               16
-#define __NR_lchown              17
-#define __NR_lseek               18
-#define __NR__llseek             19
-#define __NR_getpid              20
-#define __NR_mount               21
-#define __NR_umount2             22
-#define __NR_setuid              23
-#define __NR_getuid              24
-#define __NR_stime               25
-#define __NR_ptrace              26
-#define __NR_alarm               27
-#define __NR_pause               28
-#define __NR_utime               29
-#define __NR_stat                30
-#define __NR_fstat               31
-#define __NR_lstat               32
-#define __NR_access              33
-#define __NR_chroot              34
-#define __NR_sync                35
-#define __NR_fsync               36
-#define __NR_kill                37
-#define __NR_rename              38
-#define __NR_mkdir               39
-#define __NR_rmdir               40
-#define __NR_dup                 41
-#define __NR_pipe                42
-#define __NR_times               43
-#define __NR_clone               44
-#define __NR_brk                 45
-#define __NR_setgid              46
-#define __NR_getgid              47
-#define __NR_getcwd              48
-#define __NR_geteuid             49
-#define __NR_getegid             50
-#define __NR_acct                51
-#define __NR_setfsuid            52
-#define __NR_setfsgid            53
-#define __NR_ioctl               54
-#define __NR_fcntl               55
-#define __NR_setpgid             56
-#define __NR_mremap              57
-#define __NR_setresuid           58
-#define __NR_getresuid           59
-#define __NR_setreuid            60
-#define __NR_setregid            61
-#define __NR_ustat               62
-#define __NR_dup2                63
-#define __NR_getppid             64
-#define __NR_getpgrp             65
-#define __NR_setsid              66
-#define __NR_rt_sigaction        67
-#define __NR_rt_sigreturn        68
-#define __NR_rt_sigprocmask      69
-#define __NR_rt_sigpending       70
-#define __NR_rt_sigtimedwait     71
-#define __NR_rt_sigqueueinfo     72
-#define __NR_rt_sigsuspend       73
-#define __NR_sethostname         74
-#define __NR_setrlimit           75
-#define __NR_getrlimit           76     /* SuS compliant getrlimit */
-#define __NR_getrusage           77
-#define __NR_gettimeofday        78
-#define __NR_settimeofday        79
-#define __NR_getgroups           80
-#define __NR_setgroups           81
-#define __NR_select              82
-#define __NR_symlink             83
-#define __NR_fchdir              84
-#define __NR_readlink            85
-#define __NR_pread               86
-#define __NR_pwrite              87
-#define __NR_swapon              88
-#define __NR_reboot              89
-#define __NR_mmap2               90
-#define __NR_munmap              91
-#define __NR_truncate            92
-#define __NR_ftruncate           93
-#define __NR_fchmod              94
-#define __NR_fchown              95
-#define __NR_getpriority         96
-#define __NR_setpriority         97
-#define __NR_wait4               98
-#define __NR_statfs              99
-#define __NR_fstatfs            100
-#define __NR_vhangup            101
-#define __NR_sigaltstack        102
-#define __NR_syslog             103
-#define __NR_setitimer          104
-#define __NR_getitimer          105
-#define __NR_swapoff            106
-#define __NR_sysinfo            107
+#define __NR_restart_syscall    0
+#define __NR_exit               1
+#define __NR_fork               2
+#define __NR_read               3
+#define __NR_write              4
+#define __NR_open               5
+#define __NR_close              6
+#define __NR_umask              7
+#define __NR_creat              8
+#define __NR_link               9
+#define __NR_unlink             10
+#define __NR_execve             11
+#define __NR_chdir              12
+#define __NR_time               13
+#define __NR_mknod              14
+#define __NR_chmod              15
+#define __NR_chown              16
+#define __NR_lchown             17
+#define __NR_lseek              18
+#define __NR__llseek            19
+#define __NR_getpid             20
+#define __NR_mount              21
+#define __NR_umount2            22
+#define __NR_setuid             23
+#define __NR_getuid             24
+#define __NR_stime              25
+#define __NR_ptrace             26
+#define __NR_alarm              27
+#define __NR_pause              28
+#define __NR_utime              29
+#define __NR_stat               30
+#define __NR_fstat              31
+#define __NR_lstat              32
+#define __NR_access             33
+#define __NR_chroot             34
+#define __NR_sync               35
+#define __NR_fsync              36
+#define __NR_kill               37
+#define __NR_rename             38
+#define __NR_mkdir              39
+#define __NR_rmdir              40
+#define __NR_dup                41
+#define __NR_pipe               42
+#define __NR_times              43
+#define __NR_clone              44
+#define __NR_brk                45
+#define __NR_setgid             46
+#define __NR_getgid             47
+#define __NR_getcwd             48
+#define __NR_geteuid            49
+#define __NR_getegid            50
+#define __NR_acct               51
+#define __NR_setfsuid           52
+#define __NR_setfsgid           53
+#define __NR_ioctl              54
+#define __NR_fcntl              55
+#define __NR_setpgid            56
+#define __NR_mremap             57
+#define __NR_setresuid          58
+#define __NR_getresuid          59
+#define __NR_setreuid           60
+#define __NR_setregid           61
+#define __NR_ustat              62
+#define __NR_dup2               63
+#define __NR_getppid            64
+#define __NR_getpgrp            65
+#define __NR_setsid             66
+#define __NR_rt_sigaction       67
+#define __NR_rt_sigreturn       68
+#define __NR_rt_sigprocmask     69
+#define __NR_rt_sigpending      70
+#define __NR_rt_sigtimedwait    71
+#define __NR_rt_sigqueueinfo    72
+#define __NR_rt_sigsuspend      73
+#define __NR_sethostname        74
+#define __NR_setrlimit          75
+#define __NR_getrlimit          76 /* SuS compliant getrlimit */
+#define __NR_getrusage          77
+#define __NR_gettimeofday       78
+#define __NR_settimeofday       79
+#define __NR_getgroups          80
+#define __NR_setgroups          81
+#define __NR_select             82
+#define __NR_symlink            83
+#define __NR_fchdir             84
+#define __NR_readlink           85
+#define __NR_pread              86
+#define __NR_pwrite             87
+#define __NR_swapon             88
+#define __NR_reboot             89
+#define __NR_mmap2              90
+#define __NR_munmap             91
+#define __NR_truncate           92
+#define __NR_ftruncate          93
+#define __NR_fchmod             94
+#define __NR_fchown             95
+#define __NR_getpriority        96
+#define __NR_setpriority        97
+#define __NR_wait4              98
+#define __NR_statfs             99
+#define __NR_fstatfs            100
+#define __NR_vhangup            101
+#define __NR_sigaltstack        102
+#define __NR_syslog             103
+#define __NR_setitimer          104
+#define __NR_getitimer          105
+#define __NR_swapoff            106
+#define __NR_sysinfo            107
 /* 108 was __NR_ipc for a little while */
-#define __NR_sendfile           109
-#define __NR_setdomainname      110
-#define __NR_uname              111
-#define __NR_adjtimex           112
-#define __NR_mprotect           113
-#define __NR_vfork              114
-#define __NR_init_module        115
-#define __NR_delete_module      116
-#define __NR_quotactl           117
-#define __NR_getpgid            118
-#define __NR_bdflush            119
-#define __NR_sysfs              120
-#define __NR_personality        121
-#define __NR_afs_syscall        122 /* Syscall for Andrew File System */
-#define __NR_getdents           123
-#define __NR_flock              124
-#define __NR_msync              125
-#define __NR_readv              126
-#define __NR_writev             127
-#define __NR_getsid             128
-#define __NR_fdatasync          129
-#define __NR__sysctl            130
-#define __NR_mlock              131
-#define __NR_munlock            132
-#define __NR_mlockall           133
-#define __NR_munlockall         134
-#define __NR_sched_setparam             135
-#define __NR_sched_getparam             136
-#define __NR_sched_setscheduler         137
-#define __NR_sched_getscheduler         138
-#define __NR_sched_yield                139
-#define __NR_sched_get_priority_max     140
-#define __NR_sched_get_priority_min     141
-#define __NR_sched_rr_get_interval      142
-#define __NR_nanosleep          143
-#define __NR_poll               144
-#define __NR_nfsservctl         145
-#define __NR_setresgid          146
-#define __NR_getresgid          147
+#define __NR_sendfile           109
+#define __NR_setdomainname      110
+#define __NR_uname              111
+#define __NR_adjtimex           112
+#define __NR_mprotect           113
+#define __NR_vfork              114
+#define __NR_init_module        115
+#define __NR_delete_module      116
+#define __NR_quotactl           117
+#define __NR_getpgid            118
+#define __NR_bdflush            119
+#define __NR_sysfs              120
+#define __NR_personality        121
+#define __NR_afs_syscall        122 /* Syscall for Andrew File System */
+#define __NR_getdents           123
+#define __NR_flock              124
+#define __NR_msync              125
+#define __NR_readv              126
+#define __NR_writev             127
+#define __NR_getsid             128
+#define __NR_fdatasync          129
+#define __NR__sysctl            130
+#define __NR_mlock              131
+#define __NR_munlock            132
+#define __NR_mlockall           133
+#define __NR_munlockall         134
+#define __NR_sched_setparam     135
+#define __NR_sched_getparam     136
+#define __NR_sched_setscheduler 137
+#define __NR_sched_getscheduler 138
+#define __NR_sched_yield        139
+#define __NR_sched_get_priority_max     140
+#define __NR_sched_get_priority_min     141
+#define __NR_sched_rr_get_interval      142
+#define __NR_nanosleep          143
+#define __NR_poll               144
+#define __NR_nfsservctl         145
+#define __NR_setresgid          146
+#define __NR_getresgid          147
 #define __NR_prctl              148
-#define __NR_socket             149
-#define __NR_bind               150
-#define __NR_connect            151
-#define __NR_listen             152
-#define __NR_accept             153
-#define __NR_getsockname        154
-#define __NR_getpeername        155
-#define __NR_socketpair         156
-#define __NR_send               157
-#define __NR_recv               158
-#define __NR_sendto             159
-#define __NR_recvfrom           160
-#define __NR_shutdown           161
-#define __NR_setsockopt         162
-#define __NR_getsockopt         163
-#define __NR_sendmsg            164
-#define __NR_recvmsg            165
-#define __NR_truncate64         166
-#define __NR_ftruncate64        167
-#define __NR_stat64             168
-#define __NR_lstat64            169
-#define __NR_fstat64            170
-#define __NR_pivot_root         171
-#define __NR_mincore            172
-#define __NR_madvise            173
-#define __NR_getdents64         174
-#define __NR_fcntl64            175
-#define __NR_gettid             176
-#define __NR_readahead          177
-#define __NR_setxattr           178
-#define __NR_lsetxattr          179
-#define __NR_fsetxattr          180
-#define __NR_getxattr           181
-#define __NR_lgetxattr          182
-#define __NR_fgetxattr          183
-#define __NR_listxattr          184
-#define __NR_llistxattr         185
-#define __NR_flistxattr         186
-#define __NR_removexattr        187
-#define __NR_lremovexattr       188
-#define __NR_fremovexattr       189
-#define __NR_tkill              190
-#define __NR_sendfile64         191
-#define __NR_futex              192
-#define __NR_sched_setaffinity  193
-#define __NR_sched_getaffinity  194
-#define __NR_capget             195
-#define __NR_capset             196
-#define __NR_io_setup           197
-#define __NR_io_destroy         198
-#define __NR_io_getevents       199
-#define __NR_io_submit          200
-#define __NR_io_cancel          201
-#define __NR_fadvise64          202
-#define __NR_exit_group         203
-#define __NR_lookup_dcookie     204
-#define __NR_epoll_create       205
-#define __NR_epoll_ctl          206
-#define __NR_epoll_wait         207
-#define __NR_remap_file_pages   208
-#define __NR_set_tid_address    209
-#define __NR_timer_create       210
-#define __NR_timer_settime      211
-#define __NR_timer_gettime      212
-#define __NR_timer_getoverrun   213
-#define __NR_timer_delete       214
-#define __NR_clock_settime      215
-#define __NR_clock_gettime      216
-#define __NR_clock_getres       217
-#define __NR_clock_nanosleep    218
-#define __NR_statfs64           219
-#define __NR_fstatfs64          220
-#define __NR_tgkill             221
-                                /* 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
-#define __NR_mq_timedsend       229
-#define __NR_mq_timedreceive    230
-#define __NR_mq_notify          231
-#define __NR_mq_getsetattr      232
-#define __NR_kexec_load         233
-#define __NR_waitid             234
-#define __NR_add_key            235
-#define __NR_request_key        236
-#define __NR_keyctl             237
-#define __NR_ioprio_set         238
-#define __NR_ioprio_get         239
-#define __NR_inotify_init       240
-#define __NR_inotify_add_watch  241
-#define __NR_inotify_rm_watch   242
-#define __NR_openat             243
-#define __NR_mkdirat            244
-#define __NR_mknodat            245
-#define __NR_fchownat           246
-#define __NR_futimesat          247
-#define __NR_fstatat64          248
-#define __NR_unlinkat           249
-#define __NR_renameat           250
-#define __NR_linkat             251
-#define __NR_symlinkat          252
-#define __NR_readlinkat         253
-#define __NR_fchmodat           254
-#define __NR_faccessat          255
-#define __NR_pselect6           256
-#define __NR_ppoll              257
-#define __NR_unshare            258
-#define __NR_set_robust_list    259
-#define __NR_get_robust_list    260
-#define __NR_splice             261
-#define __NR_sync_file_range    262
-#define __NR_tee                263
-#define __NR_vmsplice           264
-#define __NR_epoll_pwait        265
-#define __NR_msgget             266
-#define __NR_msgsnd             267
-#define __NR_msgrcv             268
-#define __NR_msgctl             269
-#define __NR_semget             270
-#define __NR_semop              271
-#define __NR_semctl             272
-#define __NR_semtimedop         273
-#define __NR_shmat              274
-#define __NR_shmget             275
-#define __NR_shmdt              276
-#define __NR_shmctl             277
-#define __NR_utimensat          278
-#define __NR_signalfd           279
+#define __NR_socket             149
+#define __NR_bind               150
+#define __NR_connect            151
+#define __NR_listen             152
+#define __NR_accept             153
+#define __NR_getsockname        154
+#define __NR_getpeername        155
+#define __NR_socketpair         156
+#define __NR_send               157
+#define __NR_recv               158
+#define __NR_sendto             159
+#define __NR_recvfrom           160
+#define __NR_shutdown           161
+#define __NR_setsockopt         162
+#define __NR_getsockopt         163
+#define __NR_sendmsg            164
+#define __NR_recvmsg            165
+#define __NR_truncate64         166
+#define __NR_ftruncate64        167
+#define __NR_stat64             168
+#define __NR_lstat64            169
+#define __NR_fstat64            170
+#define __NR_pivot_root         171
+#define __NR_mincore            172
+#define __NR_madvise            173
+#define __NR_getdents64         174
+#define __NR_fcntl64            175
+#define __NR_gettid             176
+#define __NR_readahead          177
+#define __NR_setxattr           178
+#define __NR_lsetxattr          179
+#define __NR_fsetxattr          180
+#define __NR_getxattr           181
+#define __NR_lgetxattr          182
+#define __NR_fgetxattr          183
+#define __NR_listxattr          184
+#define __NR_llistxattr         185
+#define __NR_flistxattr         186
+#define __NR_removexattr        187
+#define __NR_lremovexattr       188
+#define __NR_fremovexattr       189
+#define __NR_tkill              190
+#define __NR_sendfile64         191
+#define __NR_futex              192
+#define __NR_sched_setaffinity  193
+#define __NR_sched_getaffinity  194
+#define __NR_capget             195
+#define __NR_capset             196
+#define __NR_io_setup           197
+#define __NR_io_destroy         198
+#define __NR_io_getevents       199
+#define __NR_io_submit          200
+#define __NR_io_cancel          201
+#define __NR_fadvise64          202
+#define __NR_exit_group         203
+#define __NR_lookup_dcookie     204
+#define __NR_epoll_create       205
+#define __NR_epoll_ctl          206
+#define __NR_epoll_wait         207
+#define __NR_remap_file_pages   208
+#define __NR_set_tid_address    209
+#define __NR_timer_create       210
+#define __NR_timer_settime      211
+#define __NR_timer_gettime      212
+#define __NR_timer_getoverrun   213
+#define __NR_timer_delete       214
+#define __NR_clock_settime      215
+#define __NR_clock_gettime      216
+#define __NR_clock_getres       217
+#define __NR_clock_nanosleep    218
+#define __NR_statfs64           219
+#define __NR_fstatfs64          220
+#define __NR_tgkill             221
+/* 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
+#define __NR_mq_timedsend       229
+#define __NR_mq_timedreceive    230
+#define __NR_mq_notify          231
+#define __NR_mq_getsetattr      232
+#define __NR_kexec_load         233
+#define __NR_waitid             234
+#define __NR_add_key            235
+#define __NR_request_key        236
+#define __NR_keyctl             237
+#define __NR_ioprio_set         238
+#define __NR_ioprio_get         239
+#define __NR_inotify_init       240
+#define __NR_inotify_add_watch  241
+#define __NR_inotify_rm_watch   242
+#define __NR_openat             243
+#define __NR_mkdirat            244
+#define __NR_mknodat            245
+#define __NR_fchownat           246
+#define __NR_futimesat          247
+#define __NR_fstatat64          248
+#define __NR_unlinkat           249
+#define __NR_renameat           250
+#define __NR_linkat             251
+#define __NR_symlinkat          252
+#define __NR_readlinkat         253
+#define __NR_fchmodat           254
+#define __NR_faccessat          255
+#define __NR_pselect6           256
+#define __NR_ppoll              257
+#define __NR_unshare            258
+#define __NR_set_robust_list    259
+#define __NR_get_robust_list    260
+#define __NR_splice             261
+#define __NR_sync_file_range    262
+#define __NR_tee                263
+#define __NR_vmsplice           264
+#define __NR_epoll_pwait        265
+#define __NR_msgget             266
+#define __NR_msgsnd             267
+#define __NR_msgrcv             268
+#define __NR_msgctl             269
+#define __NR_semget             270
+#define __NR_semop              271
+#define __NR_semctl             272
+#define __NR_semtimedop         273
+#define __NR_shmat              274
+#define __NR_shmget             275
+#define __NR_shmdt              276
+#define __NR_shmctl             277
+#define __NR_utimensat          278
+#define __NR_signalfd           279
 /* 280 was __NR_timerfd */
-#define __NR_eventfd            281
-#define __NR_setns              283
-#define __NR_pread64            284
-#define __NR_pwrite64           285
-#define __NR_timerfd_create     286
-#define __NR_fallocate          287
-#define __NR_timerfd_settime    288
-#define __NR_timerfd_gettime    289
-#define __NR_signalfd4          290
-#define __NR_eventfd2           291
-#define __NR_epoll_create1      292
-#define __NR_dup3               293
-#define __NR_pipe2              294
-#define __NR_inotify_init1      295
-#define __NR_preadv             296
-#define __NR_pwritev            297
-#define __NR_rt_tgsigqueueinfo  298
-#define __NR_perf_event_open    299
-#define __NR_recvmmsg           300
-#define __NR_fanotify_init      301
-#define __NR_fanotify_mark      302
-#define __NR_prlimit64          303
-#define __NR_name_to_handle_at  304
-#define __NR_open_by_handle_at  305
-#define __NR_clock_adjtime      306
-#define __NR_syncfs             307
-#define __NR_sendmmsg           308
-#define __NR_process_vm_readv   309
-#define __NR_process_vm_writev  310
-#define __NR_kcmp               311
-#define __NR_finit_module       312
-#define __NR_sched_setattr      313
-#define __NR_sched_getattr      314
-#define __NR_renameat2          315
-#define __NR_seccomp            316
-#define __NR_getrandom          317
-#define __NR_memfd_create       318
-#define __NR_bpf                319
-#define __NR_execveat           320
-#define __NR_accept4            321
-#define __NR_userfaultfd        322
-#define __NR_membarrier         323
-#define __NR_mlock2             324
+#define __NR_eventfd            281
+/* 282 was half-implemented __NR_recvmmsg */
+#define __NR_setns              283
+#define __NR_pread64            284
+#define __NR_pwrite64           285
+#define __NR_timerfd_create     286
+#define __NR_fallocate          287
+#define __NR_timerfd_settime    288
+#define __NR_timerfd_gettime    289
+#define __NR_signalfd4          290
+#define __NR_eventfd2           291
+#define __NR_epoll_create1      292
+#define __NR_dup3               293
+#define __NR_pipe2              294
+#define __NR_inotify_init1      295
+#define __NR_preadv             296
+#define __NR_pwritev            297
+#define __NR_rt_tgsigqueueinfo  298
+#define __NR_perf_event_open    299
+#define __NR_recvmmsg           300
+#define __NR_fanotify_init      301
+#define __NR_fanotify_mark      302
+#define __NR_prlimit64          303
+#define __NR_name_to_handle_at  304
+#define __NR_open_by_handle_at  305
+#define __NR_clock_adjtime      306
+#define __NR_syncfs             307
+#define __NR_sendmmsg           308
+#define __NR_process_vm_readv   309
+#define __NR_process_vm_writev  310
+#define __NR_kcmp               311
+#define __NR_finit_module       312
+#define __NR_sched_setattr      313
+#define __NR_sched_getattr      314
+#define __NR_renameat2          315
+#define __NR_seccomp            316
+#define __NR_getrandom          317
+#define __NR_memfd_create       318
+#define __NR_bpf                319
+#define __NR_execveat           320
+#define __NR_accept4            321
+#define __NR_userfaultfd        322
+#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 */
diff --git a/arch/avr32/kernel/syscall-stubs.S b/arch/avr32/kernel/syscall-stubs.S
index cb3991552f14..cb256534ed92 100644
--- a/arch/avr32/kernel/syscall-stubs.S
+++ b/arch/avr32/kernel/syscall-stubs.S
@@ -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
diff --git a/arch/avr32/kernel/syscall_table.S b/arch/avr32/kernel/syscall_table.S
index 64d71a781fa8..7b348ba70e41 100644
--- a/arch/avr32/kernel/syscall_table.S
+++ b/arch/avr32/kernel/syscall_table.S
@@ -9,334 +9,336 @@
  */
 
         .section .rodata,"a",@progbits
-        .type   sys_call_table,@object
-        .global sys_call_table
-        .align  2
+        .type sys_call_table,@object
+        .global sys_call_table
+        .align 2
 sys_call_table:
-        .long   sys_restart_syscall
-        .long   sys_exit
-        .long   sys_fork
-        .long   sys_read
-        .long   sys_write
-        .long   sys_open                /* 5 */
-        .long   sys_close
-        .long   sys_umask
-        .long   sys_creat
-        .long   sys_link
-        .long   sys_unlink              /* 10 */
-        .long   sys_execve
-        .long   sys_chdir
-        .long   sys_time
-        .long   sys_mknod
-        .long   sys_chmod               /* 15 */
-        .long   sys_chown
-        .long   sys_lchown
-        .long   sys_lseek
-        .long   sys_llseek
-        .long   sys_getpid              /* 20 */
-        .long   sys_mount
-        .long   sys_umount
-        .long   sys_setuid
-        .long   sys_getuid
-        .long   sys_stime               /* 25 */
-        .long   sys_ptrace
-        .long   sys_alarm
-        .long   sys_pause
-        .long   sys_utime
-        .long   sys_newstat             /* 30 */
-        .long   sys_newfstat
-        .long   sys_newlstat
-        .long   sys_access
-        .long   sys_chroot
-        .long   sys_sync                /* 35 */
-        .long   sys_fsync
-        .long   sys_kill
-        .long   sys_rename
-        .long   sys_mkdir
-        .long   sys_rmdir               /* 40 */
-        .long   sys_dup
-        .long   sys_pipe
-        .long   sys_times
-        .long   sys_clone
-        .long   sys_brk                 /* 45 */
-        .long   sys_setgid
-        .long   sys_getgid
-        .long   sys_getcwd
-        .long   sys_geteuid
-        .long   sys_getegid             /* 50 */
-        .long   sys_acct
-        .long   sys_setfsuid
-        .long   sys_setfsgid
-        .long   sys_ioctl
-        .long   sys_fcntl               /* 55 */
-        .long   sys_setpgid
-        .long   sys_mremap
-        .long   sys_setresuid
-        .long   sys_getresuid
-        .long   sys_setreuid            /* 60 */
-        .long   sys_setregid
-        .long   sys_ustat
-        .long   sys_dup2
-        .long   sys_getppid
-        .long   sys_getpgrp             /* 65 */
-        .long   sys_setsid
-        .long   sys_rt_sigaction
-        .long   __sys_rt_sigreturn
-        .long   sys_rt_sigprocmask
-        .long   sys_rt_sigpending       /* 70 */
-        .long   sys_rt_sigtimedwait
-        .long   sys_rt_sigqueueinfo
-        .long   __sys_rt_sigsuspend
-        .long   sys_sethostname
-        .long   sys_setrlimit           /* 75 */
-        .long   sys_getrlimit
-        .long   sys_getrusage
-        .long   sys_gettimeofday
-        .long   sys_settimeofday
-        .long   sys_getgroups           /* 80 */
-        .long   sys_setgroups
-        .long   sys_select
-        .long   sys_symlink
-        .long   sys_fchdir
-        .long   sys_readlink            /* 85 */
-        .long   sys_pread64
-        .long   sys_pwrite64
-        .long   sys_swapon
-        .long   sys_reboot
-        .long   __sys_mmap2             /* 90 */
-        .long   sys_munmap
-        .long   sys_truncate
-        .long   sys_ftruncate
-        .long   sys_fchmod
-        .long   sys_fchown              /* 95 */
-        .long   sys_getpriority
-        .long   sys_setpriority
-        .long   sys_wait4
-        .long   sys_statfs
-        .long   sys_fstatfs             /* 100 */
-        .long   sys_vhangup
-        .long   sys_sigaltstack
-        .long   sys_syslog
-        .long   sys_setitimer
-        .long   sys_getitimer           /* 105 */
-        .long   sys_swapoff
-        .long   sys_sysinfo
-        .long   sys_ni_syscall          /* was sys_ipc briefly */
-        .long   sys_sendfile
-        .long   sys_setdomainname       /* 110 */
-        .long   sys_newuname
-        .long   sys_adjtimex
-        .long   sys_mprotect
-        .long   sys_vfork
-        .long   sys_init_module         /* 115 */
-        .long   sys_delete_module
-        .long   sys_quotactl
-        .long   sys_getpgid
-        .long   sys_bdflush
-        .long   sys_sysfs               /* 120 */
-        .long   sys_personality
-        .long   sys_ni_syscall          /* reserved for afs_syscall */
-        .long   sys_getdents
-        .long   sys_flock
-        .long   sys_msync               /* 125 */
-        .long   sys_readv
-        .long   sys_writev
-        .long   sys_getsid
-        .long   sys_fdatasync
-        .long   sys_sysctl              /* 130 */
-        .long   sys_mlock
-        .long   sys_munlock
-        .long   sys_mlockall
-        .long   sys_munlockall
-        .long   sys_sched_setparam              /* 135 */
-        .long   sys_sched_getparam
-        .long   sys_sched_setscheduler
-        .long   sys_sched_getscheduler
-        .long   sys_sched_yield
-        .long   sys_sched_get_priority_max      /* 140 */
-        .long   sys_sched_get_priority_min
-        .long   sys_sched_rr_get_interval
-        .long   sys_nanosleep
-        .long   sys_poll
-        .long   sys_ni_syscall          /* 145 was nfsservctl */
-        .long   sys_setresgid
-        .long   sys_getresgid
-        .long   sys_prctl
-        .long   sys_socket
-        .long   sys_bind                /* 150 */
-        .long   sys_connect
-        .long   sys_listen
-        .long   sys_accept
-        .long   sys_getsockname
-        .long   sys_getpeername         /* 155 */
-        .long   sys_socketpair
-        .long   sys_send
-        .long   sys_recv
-        .long   __sys_sendto
-        .long   __sys_recvfrom          /* 160 */
-        .long   sys_shutdown
-        .long   sys_setsockopt
-        .long   sys_getsockopt
-        .long   sys_sendmsg
-        .long   sys_recvmsg             /* 165 */
-        .long   sys_truncate64
-        .long   sys_ftruncate64
-        .long   sys_stat64
-        .long   sys_lstat64
-        .long   sys_fstat64             /* 170 */
-        .long   sys_pivot_root
-        .long   sys_mincore
-        .long   sys_madvise
-        .long   sys_getdents64
-        .long   sys_fcntl64             /* 175 */
-        .long   sys_gettid
-        .long   sys_readahead
-        .long   sys_setxattr
-        .long   sys_lsetxattr
-        .long   sys_fsetxattr           /* 180 */
-        .long   sys_getxattr
-        .long   sys_lgetxattr
-        .long   sys_fgetxattr
-        .long   sys_listxattr
-        .long   sys_llistxattr          /* 185 */
-        .long   sys_flistxattr
-        .long   sys_removexattr
-        .long   sys_lremovexattr
-        .long   sys_fremovexattr
-        .long   sys_tkill               /* 190 */
-        .long   sys_sendfile64
-        .long   sys_futex
-        .long   sys_sched_setaffinity
-        .long   sys_sched_getaffinity
-        .long   sys_capget              /* 195 */
-        .long   sys_capset
-        .long   sys_io_setup
-        .long   sys_io_destroy
-        .long   sys_io_getevents
-        .long   sys_io_submit           /* 200 */
-        .long   sys_io_cancel
-        .long   sys_fadvise64
-        .long   sys_exit_group
-        .long   sys_lookup_dcookie
-        .long   sys_epoll_create        /* 205 */
-        .long   sys_epoll_ctl
-        .long   sys_epoll_wait
-        .long   sys_remap_file_pages
-        .long   sys_set_tid_address
-        .long   sys_timer_create        /* 210 */
-        .long   sys_timer_settime
-        .long   sys_timer_gettime
-        .long   sys_timer_getoverrun
-        .long   sys_timer_delete
-        .long   sys_clock_settime       /* 215 */
-        .long   sys_clock_gettime
-        .long   sys_clock_getres
-        .long   sys_clock_nanosleep
-        .long   sys_statfs64
-        .long   sys_fstatfs64           /* 220 */
-        .long   sys_tgkill
-        .long   sys_ni_syscall          /* reserved for TUX */
-        .long   sys_utimes
-        .long   sys_fadvise64_64
-        .long   sys_cacheflush          /* 225 */
-        .long   sys_ni_syscall          /* sys_vserver */
-        .long   sys_mq_open
-        .long   sys_mq_unlink
-        .long   sys_mq_timedsend
-        .long   sys_mq_timedreceive     /* 230 */
-        .long   sys_mq_notify
-        .long   sys_mq_getsetattr
-        .long   sys_kexec_load
-        .long   sys_waitid
-        .long   sys_add_key             /* 235 */
-        .long   sys_request_key
-        .long   sys_keyctl
-        .long   sys_ioprio_set
-        .long   sys_ioprio_get
-        .long   sys_inotify_init        /* 240 */
-        .long   sys_inotify_add_watch
-        .long   sys_inotify_rm_watch
-        .long   sys_openat
-        .long   sys_mkdirat
-        .long   sys_mknodat             /* 245 */
-        .long   sys_fchownat
-        .long   sys_futimesat
-        .long   sys_fstatat64
-        .long   sys_unlinkat
-        .long   sys_renameat            /* 250 */
-        .long   sys_linkat
-        .long   sys_symlinkat
-        .long   sys_readlinkat
-        .long   sys_fchmodat
-        .long   sys_faccessat           /* 255 */
-        .long   __sys_pselect6
-        .long   sys_ppoll
-        .long   sys_unshare
-        .long   sys_set_robust_list
-        .long   sys_get_robust_list     /* 260 */
-        .long   __sys_splice
-        .long   __sys_sync_file_range
-        .long   sys_tee
-        .long   sys_vmsplice
-        .long   __sys_epoll_pwait       /* 265 */
-        .long   sys_msgget
-        .long   sys_msgsnd
-        .long   sys_msgrcv
-        .long   sys_msgctl
-        .long   sys_semget              /* 270 */
-        .long   sys_semop
-        .long   sys_semctl
-        .long   sys_semtimedop
-        .long   sys_shmat
-        .long   sys_shmget              /* 275 */
-        .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_setns
-        .long   sys_pread64
-        .long   sys_pwrite64            /* 285 */
-        .long   sys_timerfd_create
-        .long   __sys_fallocate
-        .long   sys_timerfd_settime
-        .long   sys_timerfd_gettime
-        .long   sys_signalfd4           /* 290 */
-        .long   sys_eventfd2
-        .long   sys_epoll_create1
-        .long   sys_dup3
-        .long   sys_pipe2
-        .long   sys_inotify_init1       /* 295 */
-        .long   sys_preadv
-        .long   sys_pwritev
-        .long   sys_rt_tgsigqueueinfo
-        .long   sys_perf_event_open
-        .long   sys_recvmmsg            /* 300 */
-        .long   sys_fanotify_init
-        .long   __sys_fanotify_mark
-        .long   sys_prlimit64
-        .long   sys_name_to_handle_at
-        .long   sys_open_by_handle_at   /* 305 */
-        .long   sys_clock_adjtime
-        .long   sys_syncfs
-        .long   sys_sendmmsg
-        .long   __sys_process_vm_readv
-        .long   __sys_process_vm_writev /* 310 */
-        .long   sys_kcmp
-        .long   sys_finit_module
-        .long   sys_sched_setattr
-        .long   sys_sched_getattr
-        .long   sys_renameat2           /* 315 */
-        .long   sys_seccomp
-        .long   sys_getrandom
-        .long   sys_memfd_create
-        .long   sys_bpf
-        .long   sys_execveat            /* 320 */
-        .long   sys_accept4
-        .long   sys_userfaultfd
-        .long   sys_membarrier
-        .long   sys_mlock2
-        .long   __sys_copy_file_range   /* 325 */
-        .long   sys_ni_syscall          /* r8 is saturated at nr_syscalls */
+        .long sys_restart_syscall
+        .long sys_exit
+        .long sys_fork
+        .long sys_read
+        .long sys_write
+        .long sys_open
+        .long sys_close
+        .long sys_umask
+        .long sys_creat
+        .long sys_link
+        .long sys_unlink /* 10 */
+        .long sys_execve
+        .long sys_chdir
+        .long sys_time
+        .long sys_mknod
+        .long sys_chmod
+        .long sys_chown
+        .long sys_lchown
+        .long sys_lseek
+        .long sys_llseek
+        .long sys_getpid /* 20 */
+        .long sys_mount
+        .long sys_umount
+        .long sys_setuid
+        .long sys_getuid
+        .long sys_stime
+        .long sys_ptrace
+        .long sys_alarm
+        .long sys_pause
+        .long sys_utime
+        .long sys_newstat /* 30 */
+        .long sys_newfstat
+        .long sys_newlstat
+        .long sys_access
+        .long sys_chroot
+        .long sys_sync
+        .long sys_fsync
+        .long sys_kill
+        .long sys_rename
+        .long sys_mkdir
+        .long sys_rmdir /* 40 */
+        .long sys_dup
+        .long sys_pipe
+        .long sys_times
+        .long sys_clone
+        .long sys_brk
+        .long sys_setgid
+        .long sys_getgid
+        .long sys_getcwd
+        .long sys_geteuid
+        .long sys_getegid /* 50 */
+        .long sys_acct
+        .long sys_setfsuid
+        .long sys_setfsgid
+        .long sys_ioctl
+        .long sys_fcntl
+        .long sys_setpgid
+        .long sys_mremap
+        .long sys_setresuid
+        .long sys_getresuid
+        .long sys_setreuid /* 60 */
+        .long sys_setregid
+        .long sys_ustat
+        .long sys_dup2
+        .long sys_getppid
+        .long sys_getpgrp
+        .long sys_setsid
+        .long sys_rt_sigaction
+        .long __sys_rt_sigreturn
+        .long sys_rt_sigprocmask
+        .long sys_rt_sigpending /* 70 */
+        .long sys_rt_sigtimedwait
+        .long sys_rt_sigqueueinfo
+        .long __sys_rt_sigsuspend
+        .long sys_sethostname
+        .long sys_setrlimit
+        .long sys_getrlimit
+        .long sys_getrusage
+        .long sys_gettimeofday
+        .long sys_settimeofday
+        .long sys_getgroups /* 80 */
+        .long sys_setgroups
+        .long sys_select
+        .long sys_symlink
+        .long sys_fchdir
+        .long sys_readlink
+        .long sys_pread64
+        .long sys_pwrite64
+        .long sys_swapon
+        .long sys_reboot
+        .long __sys_mmap2 /* 90 */
+        .long sys_munmap
+        .long sys_truncate
+        .long sys_ftruncate
+        .long sys_fchmod
+        .long sys_fchown
+        .long sys_getpriority
+        .long sys_setpriority
+        .long sys_wait4
+        .long sys_statfs
+        .long sys_fstatfs /* 100 */
+        .long sys_vhangup
+        .long sys_sigaltstack
+        .long sys_syslog
+        .long sys_setitimer
+        .long sys_getitimer
+        .long sys_swapoff
+        .long sys_sysinfo
+        .long sys_ni_syscall /* was sys_ipc briefly */
+        .long sys_sendfile
+        .long sys_setdomainname /* 110 */
+        .long sys_newuname
+        .long sys_adjtimex
+        .long sys_mprotect
+        .long sys_vfork
+        .long sys_init_module
+        .long sys_delete_module
+        .long sys_quotactl
+        .long sys_getpgid
+        .long sys_bdflush
+        .long sys_sysfs /* 120 */
+        .long sys_personality
+        .long sys_ni_syscall /* reserved for afs_syscall */
+        .long sys_getdents
+        .long sys_flock
+        .long sys_msync
+        .long sys_readv
+        .long sys_writev
+        .long sys_getsid
+        .long sys_fdatasync
+        .long sys_sysctl /* 130 */
+        .long sys_mlock
+        .long sys_munlock
+        .long sys_mlockall
+        .long sys_munlockall
+        .long sys_sched_setparam
+        .long sys_sched_getparam
+        .long sys_sched_setscheduler
+        .long sys_sched_getscheduler
+        .long sys_sched_yield
+        .long sys_sched_get_priority_max  /* 140 */
+        .long sys_sched_get_priority_min
+        .long sys_sched_rr_get_interval
+        .long sys_nanosleep
+        .long sys_poll
+        .long sys_ni_syscall /* 145 was nfsservctl */
+        .long sys_setresgid
+        .long sys_getresgid
+        .long sys_prctl
+        .long sys_socket
+        .long sys_bind /* 150 */
+        .long sys_connect
+        .long sys_listen
+        .long sys_accept
+        .long sys_getsockname
+        .long sys_getpeername
+        .long sys_socketpair
+        .long sys_send
+        .long sys_recv
+        .long __sys_sendto
+        .long __sys_recvfrom /* 160 */
+        .long sys_shutdown
+        .long sys_setsockopt
+        .long sys_getsockopt
+        .long sys_sendmsg
+        .long sys_recvmsg
+        .long sys_truncate64
+        .long sys_ftruncate64
+        .long sys_stat64
+        .long sys_lstat64
+        .long sys_fstat64 /* 170 */
+        .long sys_pivot_root
+        .long sys_mincore
+        .long sys_madvise
+        .long sys_getdents64
+        .long sys_fcntl64
+        .long sys_gettid
+        .long sys_readahead
+        .long sys_setxattr
+        .long sys_lsetxattr
+        .long sys_fsetxattr /* 180 */
+        .long sys_getxattr
+        .long sys_lgetxattr
+        .long sys_fgetxattr
+        .long sys_listxattr
+        .long sys_llistxattr
+        .long sys_flistxattr
+        .long sys_removexattr
+        .long sys_lremovexattr
+        .long sys_fremovexattr
+        .long sys_tkill /* 190 */
+        .long sys_sendfile64
+        .long sys_futex
+        .long sys_sched_setaffinity
+        .long sys_sched_getaffinity
+        .long sys_capget
+        .long sys_capset
+        .long sys_io_setup
+        .long sys_io_destroy
+        .long sys_io_getevents
+        .long sys_io_submit /* 200 */
+        .long sys_io_cancel
+        .long sys_fadvise64
+        .long sys_exit_group
+        .long sys_lookup_dcookie
+        .long sys_epoll_create
+        .long sys_epoll_ctl
+        .long sys_epoll_wait
+        .long sys_remap_file_pages
+        .long sys_set_tid_address
+        .long sys_timer_create /* 210 */
+        .long sys_timer_settime
+        .long sys_timer_gettime
+        .long sys_timer_getoverrun
+        .long sys_timer_delete
+        .long sys_clock_settime
+        .long sys_clock_gettime
+        .long sys_clock_getres
+        .long sys_clock_nanosleep
+        .long sys_statfs64
+        .long sys_fstatfs64 /* 220 */
+        .long sys_tgkill
+        .long sys_ni_syscall /* reserved for TUX */
+        .long sys_utimes
+        .long sys_fadvise64_64
+        .long sys_cacheflush
+        .long sys_ni_syscall /* sys_vserver */
+        .long sys_mq_open
+        .long sys_mq_unlink
+        .long sys_mq_timedsend
+        .long sys_mq_timedreceive /* 230 */
+        .long sys_mq_notify
+        .long sys_mq_getsetattr
+        .long sys_kexec_load
+        .long sys_waitid
+        .long sys_add_key
+        .long sys_request_key
+        .long sys_keyctl
+        .long sys_ioprio_set
+        .long sys_ioprio_get
+        .long sys_inotify_init /* 240 */
+        .long sys_inotify_add_watch
+        .long sys_inotify_rm_watch
+        .long sys_openat
+        .long sys_mkdirat
+        .long sys_mknodat
+        .long sys_fchownat
+        .long sys_futimesat
+        .long sys_fstatat64
+        .long sys_unlinkat
+        .long sys_renameat /* 250 */
+        .long sys_linkat
+        .long sys_symlinkat
+        .long sys_readlinkat
+        .long sys_fchmodat
+        .long sys_faccessat
+        .long __sys_pselect6
+        .long sys_ppoll
+        .long sys_unshare
+        .long sys_set_robust_list
+        .long sys_get_robust_list /* 260 */
+        .long __sys_splice
+        .long __sys_sync_file_range
+        .long sys_tee
+        .long sys_vmsplice
+        .long __sys_epoll_pwait
+        .long sys_msgget
+        .long sys_msgsnd
+        .long sys_msgrcv
+        .long sys_msgctl
+        .long sys_semget /* 270 */
+        .long sys_semop
+        .long sys_semctl
+        .long sys_semtimedop
+        .long sys_shmat
+        .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_ni_syscall /* 282, was half-implemented recvmmsg */
+        .long sys_setns
+        .long sys_pread64
+        .long sys_pwrite64
+        .long sys_timerfd_create
+        .long __sys_fallocate
+        .long sys_timerfd_settime
+        .long sys_timerfd_gettime
+        .long sys_signalfd4 /* 290 */
+        .long sys_eventfd2
+        .long sys_epoll_create1
+        .long sys_dup3
+        .long sys_pipe2
+        .long sys_inotify_init1
+        .long sys_preadv
+        .long sys_pwritev
+        .long sys_rt_tgsigqueueinfo
+        .long sys_perf_event_open
+        .long sys_recvmmsg /* 300 */
+        .long sys_fanotify_init
+        .long __sys_fanotify_mark
+        .long sys_prlimit64
+        .long sys_name_to_handle_at
+        .long sys_open_by_handle_at
+        .long sys_clock_adjtime
+        .long sys_syncfs
+        .long sys_sendmmsg
+        .long __sys_process_vm_readv
+        .long __sys_process_vm_writev /* 310 */
+        .long sys_kcmp
+        .long sys_finit_module
+        .long sys_sched_setattr
+        .long sys_sched_getattr
+        .long sys_renameat2
+        .long sys_seccomp
+        .long sys_getrandom
+        .long sys_memfd_create
+        .long sys_bpf
+        .long sys_execveat /* 320 */
+        .long sys_accept4
+        .long sys_userfaultfd
+        .long sys_membarrier
+        .long sys_mlock2
+        .long __sys_copy_file_range
+        .long __sys_preadv2
+        .long __sys_pwritev2
+        .long sys_ni_syscall /* r8 is saturated at nr_syscalls */
diff --git a/arch/avr32/mach-at32ap/pio.c b/arch/avr32/mach-at32ap/pio.c
index 83c2a0021b56..13d3fc4270b7 100644
--- a/arch/avr32/mach-at32ap/pio.c
+++ b/arch/avr32/mach-at32ap/pio.c
@@ -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;