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

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

Merge branch 'driver-core-linus' of... 

Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core

* 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
  drivers/base/node.c: fix compilation error with older versions of gcc
  uio: documentation fixups
  device.h: Fix struct member documentation
parents b0d81664 91a13c28

Documentation/DocBook/uio-howto.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -520,6 +520,11 @@ Here's a description of the fields of <varname>struct uio_mem</varname>: 
</para>



<itemizedlist>

<listitem><para>

<varname>const char *name</varname>: Optional. Set this to help identify

the memory region, it will show up in the corresponding sysfs node.

</para></listitem>



<listitem><para>

<varname>int memtype</varname>: Required if the mapping is used. Set this to

<varname>UIO_MEM_PHYS</varname> if you you have physical memory on your
@@ -553,7 +558,7 @@ instead to remember such an address. 
</itemizedlist>



<para>

Please do not touch the <varname>kobj</varname> element of

Please do not touch the <varname>map</varname> element of

<varname>struct uio_mem</varname>! It is used by the UIO framework

to set up sysfs files for this mapping. Simply leave it alone.

</para>

drivers/base/node.c

+8 −6
Original line number Diff line number Diff line
@@ -127,12 +127,13 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(node_page_state(nid, NR_WRITEBACK)),

		       nid, K(node_page_state(nid, NR_FILE_PAGES)),

		       nid, K(node_page_state(nid, NR_FILE_MAPPED)),

		       nid, K(node_page_state(nid, NR_ANON_PAGES)

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       nid, K(node_page_state(nid, NR_ANON_PAGES)

			+ node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *

			HPAGE_PMD_NR

			HPAGE_PMD_NR),

#else

		       nid, K(node_page_state(nid, NR_ANON_PAGES)),

#endif

		       ),

		       nid, K(node_page_state(nid, NR_SHMEM)),

		       nid, node_page_state(nid, NR_KERNEL_STACK) *

				THREAD_SIZE / 1024,
@@ -143,13 +144,14 @@ static ssize_t node_read_meminfo(struct sys_device * dev, 
		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE) +

				node_page_state(nid, NR_SLAB_UNRECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_RECLAIMABLE)),

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))

#ifdef CONFIG_TRANSPARENT_HUGEPAGE

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE))

			, nid,

			K(node_page_state(nid, NR_ANON_TRANSPARENT_HUGEPAGES) *

			HPAGE_PMD_NR)

			HPAGE_PMD_NR));

#else

		       nid, K(node_page_state(nid, NR_SLAB_UNRECLAIMABLE)));

#endif

		       );

	n += hugetlb_report_node_meminfo(nid, buf + n);

	return n;

}

include/linux/device.h

+1 −1
Original line number Diff line number Diff line
@@ -69,7 +69,7 @@ extern void bus_remove_file(struct bus_type *, struct bus_attribute *); 
 * @resume:	Called to bring a device on this bus out of sleep mode.

 * @pm:		Power management operations of this bus, callback the specific

 *		device driver's pm-ops.

 * @iommu_ops   IOMMU specific operations for this bus, used to attach IOMMU

 * @iommu_ops:  IOMMU specific operations for this bus, used to attach IOMMU

 *              driver implementations to a bus and allow the driver to do

 *              bus-specific setup

 * @p:		The private data of the driver core, only the driver core can