Skip to content

Commit a3fa7a1

Browse files
committed
Merge branches 'akpm' and 'akpm-hotfixes' (patches from Andrew)
Merge yet more updates and hotfixes from Andrew Morton: "Post-linux-next material, based upon latest upstream to catch the now-merged dependencies: - 10 patches. Subsystems affected by this patch series: mm (vmstat and migration) and compat. And bunch of hotfixes, mostly cc:stable: - 8 patches. Subsystems affected by this patch series: mm (hmm, hugetlb, vmscan, pagealloc, pagemap, kmemleak, mempolicy, and memblock)" * emailed patches from Andrew Morton <akpm@linux-foundation.org>: arch: remove compat_alloc_user_space compat: remove some compat entry points mm: simplify compat numa syscalls mm: simplify compat_sys_move_pages kexec: avoid compat_alloc_user_space kexec: move locking into do_kexec_load mm: migrate: change to use bool type for 'page_was_mapped' mm: migrate: fix the incorrect function name in comments mm: migrate: introduce a local variable to get the number of pages mm/vmstat: protect per cpu variables with preempt disable on RT * emailed hotfixes from Andrew Morton <akpm@linux-foundation.org>: nds32/setup: remove unused memblock_region variable in setup_memory() mm/mempolicy: fix a race between offset_il_node and mpol_rebind_task mm/kmemleak: allow __GFP_NOLOCKDEP passed to kmemleak's gfp mmap_lock: change trace and locking order mm/page_alloc.c: avoid accessing uninitialized pcp page migratetype mm,vmscan: fix divide by zero in get_scan_count mm/hugetlb: initialize hugetlb_usage in mm_init mm/hmm: bypass devmap pte when all pfn requested flags are fulfilled
3 parents 730bf31 + a7a08b2 + ddb1312 commit a3fa7a1

File tree

47 files changed

+267
-663
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+267
-663
lines changed

arch/arm64/include/asm/compat.h

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,11 +107,6 @@ struct compat_statfs {
107107
#define compat_user_stack_pointer() (user_stack_pointer(task_pt_regs(current)))
108108
#define COMPAT_MINSIGSTKSZ 2048
109109

110-
static inline void __user *arch_compat_alloc_user_space(long len)
111-
{
112-
return (void __user *)compat_user_stack_pointer() - len;
113-
}
114-
115110
struct compat_ipc64_perm {
116111
compat_key_t key;
117112
__compat_uid32_t uid;

arch/arm64/include/asm/uaccess.h

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -430,17 +430,6 @@ extern unsigned long __must_check __arch_copy_to_user(void __user *to, const voi
430430
__actu_ret; \
431431
})
432432

433-
extern unsigned long __must_check __arch_copy_in_user(void __user *to, const void __user *from, unsigned long n);
434-
#define raw_copy_in_user(to, from, n) \
435-
({ \
436-
unsigned long __aciu_ret; \
437-
uaccess_ttbr0_enable(); \
438-
__aciu_ret = __arch_copy_in_user(__uaccess_mask_ptr(to), \
439-
__uaccess_mask_ptr(from), (n)); \
440-
uaccess_ttbr0_disable(); \
441-
__aciu_ret; \
442-
})
443-
444433
#define INLINE_COPY_TO_USER
445434
#define INLINE_COPY_FROM_USER
446435

arch/arm64/include/asm/unistd32.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -649,11 +649,11 @@ __SYSCALL(__NR_inotify_add_watch, sys_inotify_add_watch)
649649
#define __NR_inotify_rm_watch 318
650650
__SYSCALL(__NR_inotify_rm_watch, sys_inotify_rm_watch)
651651
#define __NR_mbind 319
652-
__SYSCALL(__NR_mbind, compat_sys_mbind)
652+
__SYSCALL(__NR_mbind, sys_mbind)
653653
#define __NR_get_mempolicy 320
654-
__SYSCALL(__NR_get_mempolicy, compat_sys_get_mempolicy)
654+
__SYSCALL(__NR_get_mempolicy, sys_get_mempolicy)
655655
#define __NR_set_mempolicy 321
656-
__SYSCALL(__NR_set_mempolicy, compat_sys_set_mempolicy)
656+
__SYSCALL(__NR_set_mempolicy, sys_set_mempolicy)
657657
#define __NR_openat 322
658658
__SYSCALL(__NR_openat, compat_sys_openat)
659659
#define __NR_mkdirat 323
@@ -699,7 +699,7 @@ __SYSCALL(__NR_tee, sys_tee)
699699
#define __NR_vmsplice 343
700700
__SYSCALL(__NR_vmsplice, sys_vmsplice)
701701
#define __NR_move_pages 344
702-
__SYSCALL(__NR_move_pages, compat_sys_move_pages)
702+
__SYSCALL(__NR_move_pages, sys_move_pages)
703703
#define __NR_getcpu 345
704704
__SYSCALL(__NR_getcpu, sys_getcpu)
705705
#define __NR_epoll_pwait 346
@@ -811,7 +811,7 @@ __SYSCALL(__NR_rseq, sys_rseq)
811811
#define __NR_io_pgetevents 399
812812
__SYSCALL(__NR_io_pgetevents, compat_sys_io_pgetevents)
813813
#define __NR_migrate_pages 400
814-
__SYSCALL(__NR_migrate_pages, compat_sys_migrate_pages)
814+
__SYSCALL(__NR_migrate_pages, sys_migrate_pages)
815815
#define __NR_kexec_file_load 401
816816
__SYSCALL(__NR_kexec_file_load, sys_kexec_file_load)
817817
/* 402 is unused */

arch/arm64/lib/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# SPDX-License-Identifier: GPL-2.0
22
lib-y := clear_user.o delay.o copy_from_user.o \
3-
copy_to_user.o copy_in_user.o copy_page.o \
3+
copy_to_user.o copy_page.o \
44
clear_page.o csum.o insn.o memchr.o memcpy.o \
55
memset.o memcmp.o strcmp.o strncmp.o strlen.o \
66
strnlen.o strchr.o strrchr.o tishift.o

arch/arm64/lib/copy_in_user.S

Lines changed: 0 additions & 77 deletions
This file was deleted.

arch/mips/cavium-octeon/octeon-memcpy.S

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,6 @@ FEXPORT(__raw_copy_from_user)
154154
EXPORT_SYMBOL(__raw_copy_from_user)
155155
FEXPORT(__raw_copy_to_user)
156156
EXPORT_SYMBOL(__raw_copy_to_user)
157-
FEXPORT(__raw_copy_in_user)
158-
EXPORT_SYMBOL(__raw_copy_in_user)
159157
/*
160158
* Note: dst & src may be unaligned, len may be 0
161159
* Temps

arch/mips/include/asm/compat.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -96,14 +96,6 @@ struct compat_statfs {
9696

9797
#define COMPAT_OFF_T_MAX 0x7fffffff
9898

99-
static inline void __user *arch_compat_alloc_user_space(long len)
100-
{
101-
struct pt_regs *regs = (struct pt_regs *)
102-
((unsigned long) current_thread_info() + THREAD_SIZE - 32) - 1;
103-
104-
return (void __user *) (regs->regs[29] - len);
105-
}
106-
10799
struct compat_ipc64_perm {
108100
compat_key_t key;
109101
__compat_uid32_t uid;

arch/mips/include/asm/uaccess.h

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -428,7 +428,6 @@ do { \
428428

429429
extern size_t __raw_copy_from_user(void *__to, const void *__from, size_t __n);
430430
extern size_t __raw_copy_to_user(void *__to, const void *__from, size_t __n);
431-
extern size_t __raw_copy_in_user(void *__to, const void *__from, size_t __n);
432431

433432
static inline unsigned long
434433
raw_copy_from_user(void *to, const void __user *from, unsigned long n)
@@ -480,31 +479,6 @@ raw_copy_to_user(void __user *to, const void *from, unsigned long n)
480479
#define INLINE_COPY_FROM_USER
481480
#define INLINE_COPY_TO_USER
482481

483-
static inline unsigned long
484-
raw_copy_in_user(void __user *to, const void __user *from, unsigned long n)
485-
{
486-
register void __user *__cu_to_r __asm__("$4");
487-
register const void __user *__cu_from_r __asm__("$5");
488-
register long __cu_len_r __asm__("$6");
489-
490-
__cu_to_r = to;
491-
__cu_from_r = from;
492-
__cu_len_r = n;
493-
494-
__asm__ __volatile__(
495-
".set\tnoreorder\n\t"
496-
__MODULE_JAL(__raw_copy_in_user)
497-
".set\tnoat\n\t"
498-
__UA_ADDU "\t$1, %1, %2\n\t"
499-
".set\tat\n\t"
500-
".set\treorder"
501-
: "+r" (__cu_to_r), "+r" (__cu_from_r), "+r" (__cu_len_r)
502-
:
503-
: "$8", "$9", "$10", "$11", "$12", "$14", "$15", "$24", "$31",
504-
DADDI_SCRATCH, "memory");
505-
return __cu_len_r;
506-
}
507-
508482
extern __kernel_size_t __bzero(void __user *addr, __kernel_size_t size);
509483

510484
/*

arch/mips/kernel/syscalls/syscall_n32.tbl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -239,9 +239,9 @@
239239
228 n32 clock_nanosleep sys_clock_nanosleep_time32
240240
229 n32 tgkill sys_tgkill
241241
230 n32 utimes sys_utimes_time32
242-
231 n32 mbind compat_sys_mbind
243-
232 n32 get_mempolicy compat_sys_get_mempolicy
244-
233 n32 set_mempolicy compat_sys_set_mempolicy
242+
231 n32 mbind sys_mbind
243+
232 n32 get_mempolicy sys_get_mempolicy
244+
233 n32 set_mempolicy sys_set_mempolicy
245245
234 n32 mq_open compat_sys_mq_open
246246
235 n32 mq_unlink sys_mq_unlink
247247
236 n32 mq_timedsend sys_mq_timedsend_time32
@@ -258,7 +258,7 @@
258258
247 n32 inotify_init sys_inotify_init
259259
248 n32 inotify_add_watch sys_inotify_add_watch
260260
249 n32 inotify_rm_watch sys_inotify_rm_watch
261-
250 n32 migrate_pages compat_sys_migrate_pages
261+
250 n32 migrate_pages sys_migrate_pages
262262
251 n32 openat sys_openat
263263
252 n32 mkdirat sys_mkdirat
264264
253 n32 mknodat sys_mknodat
@@ -279,7 +279,7 @@
279279
268 n32 sync_file_range sys_sync_file_range
280280
269 n32 tee sys_tee
281281
270 n32 vmsplice sys_vmsplice
282-
271 n32 move_pages compat_sys_move_pages
282+
271 n32 move_pages sys_move_pages
283283
272 n32 set_robust_list compat_sys_set_robust_list
284284
273 n32 get_robust_list compat_sys_get_robust_list
285285
274 n32 kexec_load compat_sys_kexec_load

arch/mips/kernel/syscalls/syscall_o32.tbl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -279,9 +279,9 @@
279279
265 o32 clock_nanosleep sys_clock_nanosleep_time32
280280
266 o32 tgkill sys_tgkill
281281
267 o32 utimes sys_utimes_time32
282-
268 o32 mbind sys_mbind compat_sys_mbind
283-
269 o32 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy
284-
270 o32 set_mempolicy sys_set_mempolicy compat_sys_set_mempolicy
282+
268 o32 mbind sys_mbind
283+
269 o32 get_mempolicy sys_get_mempolicy
284+
270 o32 set_mempolicy sys_set_mempolicy
285285
271 o32 mq_open sys_mq_open compat_sys_mq_open
286286
272 o32 mq_unlink sys_mq_unlink
287287
273 o32 mq_timedsend sys_mq_timedsend_time32
@@ -298,7 +298,7 @@
298298
284 o32 inotify_init sys_inotify_init
299299
285 o32 inotify_add_watch sys_inotify_add_watch
300300
286 o32 inotify_rm_watch sys_inotify_rm_watch
301-
287 o32 migrate_pages sys_migrate_pages compat_sys_migrate_pages
301+
287 o32 migrate_pages sys_migrate_pages
302302
288 o32 openat sys_openat compat_sys_openat
303303
289 o32 mkdirat sys_mkdirat
304304
290 o32 mknodat sys_mknodat
@@ -319,7 +319,7 @@
319319
305 o32 sync_file_range sys_sync_file_range sys32_sync_file_range
320320
306 o32 tee sys_tee
321321
307 o32 vmsplice sys_vmsplice
322-
308 o32 move_pages sys_move_pages compat_sys_move_pages
322+
308 o32 move_pages sys_move_pages
323323
309 o32 set_robust_list sys_set_robust_list compat_sys_set_robust_list
324324
310 o32 get_robust_list sys_get_robust_list compat_sys_get_robust_list
325325
311 o32 kexec_load sys_kexec_load compat_sys_kexec_load

0 commit comments

Comments
 (0)