Skip to content

Commit 623f6dc

Browse files
committed
Merge branch 'akpm' (patches from Andrew)
Merge some more updates from Andrew Morton: - various hotfixes and minor things - hch's use_mm/unuse_mm clearnups Subsystems affected by this patch series: mm/hugetlb, scripts, kcov, lib, nilfs, checkpatch, lib, mm/debug, ocfs2, lib, misc. * emailed patches from Andrew Morton <[email protected]>: kernel: set USER_DS in kthread_use_mm kernel: better document the use_mm/unuse_mm API contract kernel: move use_mm/unuse_mm to kthread.c kernel: move use_mm/unuse_mm to kthread.c stacktrace: cleanup inconsistent variable type lib: test get_count_order/long in test_bitops.c mm: add comments on pglist_data zones ocfs2: fix spelling mistake and grammar mm/debug_vm_pgtable: fix kernel crash by checking for THP support lib: fix bitmap_parse() on 64-bit big endian archs checkpatch: correct check for kernel parameters doc nilfs2: fix null pointer dereference at nilfs_segctor_do_construct() lib/lz4/lz4_decompress.c: document deliberate use of `&' kcov: check kcov_softirq in kcov_remote_stop() scripts/spelling: add a few more typos khugepaged: selftests: fix timeout condition in wait_for_scan()
2 parents 5cd221e + 37c54f9 commit 623f6dc

35 files changed

+215
-148
lines changed

arch/powerpc/platforms/powernv/vas-fault.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ static void update_csb(struct vas_window *window,
127127
return;
128128
}
129129

130-
use_mm(window->mm);
130+
kthread_use_mm(window->mm);
131131
rc = copy_to_user(csb_addr, &csb, sizeof(csb));
132132
/*
133133
* User space polls on csb.flags (first byte). So add barrier
@@ -139,7 +139,7 @@ static void update_csb(struct vas_window *window,
139139
smp_mb();
140140
rc = copy_to_user(csb_addr, &csb, sizeof(u8));
141141
}
142-
unuse_mm(window->mm);
142+
kthread_unuse_mm(window->mm);
143143
put_task_struct(tsk);
144144

145145
/* Success */

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727

2828
#include <linux/types.h>
2929
#include <linux/mm.h>
30+
#include <linux/kthread.h>
3031
#include <linux/workqueue.h>
3132
#include <kgd_kfd_interface.h>
3233
#include <drm/ttm/ttm_execbuf_util.h>
@@ -196,9 +197,9 @@ uint8_t amdgpu_amdkfd_get_xgmi_hops_count(struct kgd_dev *dst, struct kgd_dev *s
196197
if ((mmptr) == current->mm) { \
197198
valid = !get_user((dst), (wptr)); \
198199
} else if (current->mm == NULL) { \
199-
use_mm(mmptr); \
200+
kthread_use_mm(mmptr); \
200201
valid = !get_user((dst), (wptr)); \
201-
unuse_mm(mmptr); \
202+
kthread_unuse_mm(mmptr); \
202203
} \
203204
pagefault_enable(); \
204205
} \

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
#include <linux/module.h>
2323
#include <linux/fdtable.h>
2424
#include <linux/uaccess.h>
25-
#include <linux/mmu_context.h>
2625
#include <linux/firmware.h>
2726
#include "amdgpu.h"
2827
#include "amdgpu_amdkfd.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
22-
#include <linux/mmu_context.h>
2322
#include "amdgpu.h"
2423
#include "amdgpu_amdkfd.h"
2524
#include "gc/gc_10_1_0_offset.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v7.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
2222

23-
#include <linux/mmu_context.h>
24-
2523
#include "amdgpu.h"
2624
#include "amdgpu_amdkfd.h"
2725
#include "cikd.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v8.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,6 @@
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
2222

23-
#include <linux/mmu_context.h>
24-
2523
#include "amdgpu.h"
2624
#include "amdgpu_amdkfd.h"
2725
#include "gfx_v8_0.h"

drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
* ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
2020
* OTHER DEALINGS IN THE SOFTWARE.
2121
*/
22-
#include <linux/mmu_context.h>
23-
2422
#include "amdgpu.h"
2523
#include "amdgpu_amdkfd.h"
2624
#include "gc/gc_9_0_offset.h"

drivers/gpu/drm/i915/gvt/kvmgt.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
#include <linux/init.h>
3232
#include <linux/device.h>
3333
#include <linux/mm.h>
34-
#include <linux/mmu_context.h>
34+
#include <linux/kthread.h>
3535
#include <linux/sched/mm.h>
3636
#include <linux/types.h>
3737
#include <linux/list.h>

drivers/usb/gadget/function/f_fs.c

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
#include <linux/usb/functionfs.h>
3333

3434
#include <linux/aio.h>
35-
#include <linux/mmu_context.h>
35+
#include <linux/kthread.h>
3636
#include <linux/poll.h>
3737
#include <linux/eventfd.h>
3838

@@ -824,13 +824,9 @@ static void ffs_user_copy_worker(struct work_struct *work)
824824
bool kiocb_has_eventfd = io_data->kiocb->ki_flags & IOCB_EVENTFD;
825825

826826
if (io_data->read && ret > 0) {
827-
mm_segment_t oldfs = get_fs();
828-
829-
set_fs(USER_DS);
830-
use_mm(io_data->mm);
827+
kthread_use_mm(io_data->mm);
831828
ret = ffs_copy_to_iter(io_data->buf, ret, &io_data->data);
832-
unuse_mm(io_data->mm);
833-
set_fs(oldfs);
829+
kthread_unuse_mm(io_data->mm);
834830
}
835831

836832
io_data->kiocb->ki_complete(io_data->kiocb, ret, ret);

drivers/usb/gadget/legacy/inode.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
#include <linux/sched.h>
2222
#include <linux/slab.h>
2323
#include <linux/poll.h>
24-
#include <linux/mmu_context.h>
24+
#include <linux/kthread.h>
2525
#include <linux/aio.h>
2626
#include <linux/uio.h>
2727
#include <linux/refcount.h>
@@ -462,9 +462,9 @@ static void ep_user_copy_worker(struct work_struct *work)
462462
struct kiocb *iocb = priv->iocb;
463463
size_t ret;
464464

465-
use_mm(mm);
465+
kthread_use_mm(mm);
466466
ret = copy_to_iter(priv->buf, priv->actual, &priv->to);
467-
unuse_mm(mm);
467+
kthread_unuse_mm(mm);
468468
if (!ret)
469469
ret = -EFAULT;
470470

0 commit comments

Comments
 (0)