Commit 0be75179 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'driver-core-4.12-rc1' of... 

Merge tag 'driver-core-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

Pull driver core updates from Greg KH:
 "Very tiny pull request for 4.12-rc1 for the driver core this time
  around.

  There are some documentation fixes, an eventpoll.h fixup to make it
  easier for the libc developers to take our header files directly, and
  some very minor driver core fixes and changes.

  All have been in linux-next for a very long time with no reported
  issues"

* tag 'driver-core-4.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  Revert "kref: double kref_put() in my_data_handler()"
  driver core: don't initialize 'parent' in device_add()
  drivers: base: dma-mapping: use nth_page helper
  Documentation/ABI: add information about cpu_capacity
  debugfs: set no_llseek in DEFINE_DEBUGFS_ATTRIBUTE
  eventpoll.h: add missing epoll event masks
  eventpoll.h: fix epoll event masks
parents 8f28472a 523aa358

Documentation/ABI/testing/sysfs-devices-system-cpu

+7 −0
Original line number Diff line number Diff line
@@ -366,3 +366,10 @@ Contact: Linux ARM Kernel Mailing list <linux-arm-kernel@lists.infradead.org> 
Description:	AArch64 CPU registers

		'identification' directory exposes the CPU ID registers for

		 identifying model and revision of the CPU.



What:		/sys/devices/system/cpu/cpu#/cpu_capacity

Date:		December 2016

Contact:	Linux kernel mailing list <linux-kernel@vger.kernel.org>

Description:	information about CPUs heterogeneity.



		cpu_capacity: capacity of cpu#.

Documentation/kref.txt

+1 −0
Original line number Diff line number Diff line
@@ -84,6 +84,7 @@ int my_data_handler(void) 
	task = kthread_run(more_data_handling, data, "more_data_handling");

	if (task == ERR_PTR(-ENOMEM)) {

		rv = -ENOMEM;

	        kref_put(&data->refcount, data_release);

		goto out;

	}

drivers/base/core.c

+1 −1
Original line number Diff line number Diff line
@@ -1607,7 +1607,7 @@ int device_private_init(struct device *dev) 
 */

int device_add(struct device *dev)

{

	struct device *parent = NULL;

	struct device *parent;

	struct kobject *kobj;

	struct class_interface *class_intf;

	int error = -EINVAL;

drivers/base/dma-mapping.c

+2 −3
Original line number Diff line number Diff line
@@ -309,14 +309,13 @@ void *dma_common_contiguous_remap(struct page *page, size_t size, 
	int i;

	struct page **pages;

	void *ptr;

	unsigned long pfn;



	pages = kmalloc(sizeof(struct page *) << get_order(size), GFP_KERNEL);

	if (!pages)

		return NULL;



	for (i = 0, pfn = page_to_pfn(page); i < (size >> PAGE_SHIFT); i++)

		pages[i] = pfn_to_page(pfn + i);

	for (i = 0; i < (size >> PAGE_SHIFT); i++)

		pages[i] = nth_page(page, i);



	ptr = dma_common_pages_remap(pages, size, vm_flags, prot, caller);

include/linux/debugfs.h

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ static const struct file_operations __fops = { \ 
	.release = simple_attr_release,					\

	.read	 = debugfs_attr_read,					\

	.write	 = debugfs_attr_write,					\

	.llseek  = generic_file_llseek,					\

	.llseek  = no_llseek,						\

}



#if defined(CONFIG_DEBUG_FS)

CRA Git | Maintained and supported by SUSTech CRA and CCSE