Commit 623f6dc5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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 <akpm@linux-foundation.org>:
  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()
parents 5cd221e8 37c54f9b

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

+2 −2
Original line number Diff line number Diff line
@@ -127,7 +127,7 @@ static void update_csb(struct vas_window *window, 
		return;

	}



	use_mm(window->mm);

	kthread_use_mm(window->mm);

	rc = copy_to_user(csb_addr, &csb, sizeof(csb));

	/*

	 * User space polls on csb.flags (first byte). So add barrier
@@ -139,7 +139,7 @@ static void update_csb(struct vas_window *window, 
		smp_mb();

		rc = copy_to_user(csb_addr, &csb, sizeof(u8));

	}

	unuse_mm(window->mm);

	kthread_unuse_mm(window->mm);

	put_task_struct(tsk);



	/* Success */

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

+3 −2
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ 


#include <linux/types.h>

#include <linux/mm.h>

#include <linux/kthread.h>

#include <linux/workqueue.h>

#include <kgd_kfd_interface.h>

#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 
			if ((mmptr) == current->mm) {			\

				valid = !get_user((dst), (wptr));	\

			} else if (current->mm == NULL) {		\

				use_mm(mmptr);				\

				kthread_use_mm(mmptr);			\

				valid = !get_user((dst), (wptr));	\

				unuse_mm(mmptr);			\

				kthread_unuse_mm(mmptr);		\

			}						\

			pagefault_enable();				\

		}							\

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

+0 −1
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ 
#include <linux/module.h>

#include <linux/fdtable.h>

#include <linux/uaccess.h>

#include <linux/mmu_context.h>

#include <linux/firmware.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

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

+0 −1
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
 * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR

 * OTHER DEALINGS IN THE SOFTWARE.

 */

#include <linux/mmu_context.h>

#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "gc/gc_10_1_0_offset.h"

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

+0 −2
Original line number Diff line number Diff line
@@ -20,8 +20,6 @@ 
 * OTHER DEALINGS IN THE SOFTWARE.

 */



#include <linux/mmu_context.h>



#include "amdgpu.h"

#include "amdgpu_amdkfd.h"

#include "cikd.h"

CRA Git | Maintained and supported by SUSTech CRA and CCSE