Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f2937e45 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'akpm' (fixes from Andrew Morton) 

Merge leftovers from Andrew Morton:
 "A few leftovers.

  I have a bunch of OCFS2 patches which are still out for review and
  which I might sneak along after -rc1.  Partly my fault - I should send
  my review pokes out earlier"

* emailed patches from Andrew Morton <akpm@linux-foundation.org>:
  mm: fix CROSS_MEMORY_ATTACH help text grammar
  drivers/mfd/rtsx_usb.c: export device table
  mm, hugetlb_cgroup: align hugetlb cgroup limit to hugepage size
parents 1d508f8a a2a368d9

drivers/mfd/rtsx_usb.c

+1 −0
Original line number Diff line number Diff line
@@ -744,6 +744,7 @@ static struct usb_device_id rtsx_usb_usb_ids[] = { 
	{ USB_DEVICE(0x0BDA, 0x0140) },

	{ }

};

MODULE_DEVICE_TABLE(usb, rtsx_usb_usb_ids);



static struct usb_driver rtsx_usb_driver = {

	.name			= "rtsx_usb",

init/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -268,7 +268,7 @@ config CROSS_MEMORY_ATTACH 
	help

	  Enabling this option adds the system calls process_vm_readv and

	  process_vm_writev which allow a process with the correct privileges

	  to directly read from or write to to another process's address space.

	  to directly read from or write to another process' address space.

	  See the man page for more details.



config FHANDLE

mm/hugetlb_cgroup.c

+1 −0
Original line number Diff line number Diff line
@@ -275,6 +275,7 @@ static ssize_t hugetlb_cgroup_write(struct kernfs_open_file *of, 
		ret = res_counter_memparse_write_strategy(buf, &val);

		if (ret)

			break;

		val = ALIGN(val, 1ULL << huge_page_shift(&hstates[idx]));

		ret = res_counter_set_limit(&h_cg->hugepage[idx], val);

		break;

	default: