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

Commit ec000109 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'perf/urgent' into perf/core, to resolve conflict and to prepare for new patches 



Conflicts:
	arch/x86/kernel/traps.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 8c6e549a e041e328

Documentation/ABI/testing/sysfs-bus-pci

+1 −1
Original line number Original line Diff line number Diff line
@@ -117,7 +117,7 @@ Description: 




What:		/sys/bus/pci/devices/.../vpd

What:		/sys/bus/pci/devices/.../vpd

Date:		February 2008

Date:		February 2008

Contact:	Ben Hutchings <bhutchings@solarflare.com>

Contact:	Ben Hutchings <bwh@kernel.org>

Description:

Description:

		A file named vpd in a device directory will be a

		A file named vpd in a device directory will be a

		binary file containing the Vital Product Data for the

		binary file containing the Vital Product Data for the

Documentation/DocBook/drm.tmpl

+6 −6
Original line number Original line Diff line number Diff line
@@ -79,7 +79,7 @@ 
  <partintro>

  <partintro>

    <para>

    <para>

      This first part of the DRM Developer's Guide documents core DRM code,

      This first part of the DRM Developer's Guide documents core DRM code,

      helper libraries for writting drivers and generic userspace interfaces

      helper libraries for writing drivers and generic userspace interfaces

      exposed by DRM drivers.

      exposed by DRM drivers.

    </para>

    </para>

  </partintro>

  </partintro>
@@ -459,7 +459,7 @@ char *date;</synopsis> 
      providing a solution to every graphics memory-related problems, GEM

      providing a solution to every graphics memory-related problems, GEM

      identified common code between drivers and created a support library to

      identified common code between drivers and created a support library to

      share it. GEM has simpler initialization and execution requirements than

      share it. GEM has simpler initialization and execution requirements than

      TTM, but has no video RAM management capabitilies and is thus limited to

      TTM, but has no video RAM management capabilities and is thus limited to

      UMA devices.

      UMA devices.

    </para>

    </para>

    <sect2>

    <sect2>
@@ -889,7 +889,7 @@ int (*prime_fd_to_handle)(struct drm_device *dev, 
	    vice versa. Drivers must use the kernel dma-buf buffer sharing framework

	    vice versa. Drivers must use the kernel dma-buf buffer sharing framework

	    to manage the PRIME file descriptors. Similar to the mode setting

	    to manage the PRIME file descriptors. Similar to the mode setting

	    API PRIME is agnostic to the underlying buffer object manager, as

	    API PRIME is agnostic to the underlying buffer object manager, as

	    long as handles are 32bit unsinged integers.

	    long as handles are 32bit unsigned integers.

	  </para>

	  </para>

	  <para>

	  <para>

	    While non-GEM drivers must implement the operations themselves, GEM

	    While non-GEM drivers must implement the operations themselves, GEM
@@ -2356,7 +2356,7 @@ void intel_crt_init(struct drm_device *dev) 
      first create properties and then create and associate individual instances

      first create properties and then create and associate individual instances

      of those properties to objects. A property can be instantiated multiple

      of those properties to objects. A property can be instantiated multiple

      times and associated with different objects. Values are stored in property

      times and associated with different objects. Values are stored in property

      instances, and all other property information are stored in the propery

      instances, and all other property information are stored in the property

      and shared between all instances of the property.

      and shared between all instances of the property.

    </para>

    </para>

    <para>

    <para>
@@ -2697,10 +2697,10 @@ int num_ioctls;</synopsis> 
  <sect1>

  <sect1>

    <title>Legacy Support Code</title>

    <title>Legacy Support Code</title>

    <para>

    <para>

      The section very brievely covers some of the old legacy support code which

      The section very briefly covers some of the old legacy support code which

      is only used by old DRM drivers which have done a so-called shadow-attach

      is only used by old DRM drivers which have done a so-called shadow-attach

      to the underlying device instead of registering as a real driver. This

      to the underlying device instead of registering as a real driver. This

      also includes some of the old generic buffer mangement and command

      also includes some of the old generic buffer management and command

      submission code. Do not use any of this in new and modern drivers.

      submission code. Do not use any of this in new and modern drivers.

    </para>

    </para>

Documentation/DocBook/media/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -195,7 +195,7 @@ DVB_DOCUMENTED = \ 
#

#





install_media_images = \

install_media_images = \

	$(Q)cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api

	$(Q)-cp $(OBJIMGFILES) $(MEDIA_SRC_DIR)/v4l/*.svg $(MEDIA_OBJ_DIR)/media_api





$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

$(MEDIA_OBJ_DIR)/%: $(MEDIA_SRC_DIR)/%.b64

	$(Q)base64 -d $< >$@

	$(Q)base64 -d $< >$@

Documentation/debugging-via-ohci1394.txt

+8 −5
Original line number Original line Diff line number Diff line
@@ -25,9 +25,11 @@ using data transfer rates in the order of 10MB/s or more. 
With most FireWire controllers, memory access is limited to the low 4 GB

With most FireWire controllers, memory access is limited to the low 4 GB

of physical address space.  This can be a problem on IA64 machines where

of physical address space.  This can be a problem on IA64 machines where

memory is located mostly above that limit, but it is rarely a problem on

memory is located mostly above that limit, but it is rarely a problem on

more common hardware such as x86, x86-64 and PowerPC.  However, at least

more common hardware such as x86, x86-64 and PowerPC.

Agere/LSI FW643e and FW643e2 controllers are known to support access to



physical addresses above 4 GB.

At least LSI FW643e and FW643e2 controllers are known to support access to

physical addresses above 4 GB, but this feature is currently not enabled by

Linux.





Together with a early initialization of the OHCI-1394 controller for debugging,

Together with a early initialization of the OHCI-1394 controller for debugging,

this facility proved most useful for examining long debugs logs in the printk

this facility proved most useful for examining long debugs logs in the printk
@@ -101,8 +103,9 @@ Step-by-step instructions for using firescope with early OHCI initialization: 
   compliant, they are based on TI PCILynx chips and require drivers for Win-

   compliant, they are based on TI PCILynx chips and require drivers for Win-

   dows operating systems.

   dows operating systems.





   The mentioned kernel log message contains ">4 GB phys DMA" in case of

   The mentioned kernel log message contains the string "physUB" if the

   OHCI-1394 controllers which support accesses above this limit.

   controller implements a writable Physical Upper Bound register.  This is

   required for physical DMA above 4 GB (but not utilized by Linux yet).





2) Establish a working FireWire cable connection:

2) Establish a working FireWire cable connection:

Documentation/device-mapper/thin-provisioning.txt

+4 −1
Original line number Original line Diff line number Diff line
@@ -309,7 +309,10 @@ ii) Status 
    error_if_no_space|queue_if_no_space

    error_if_no_space|queue_if_no_space

	If the pool runs out of data or metadata space, the pool will

	If the pool runs out of data or metadata space, the pool will

	either queue or error the IO destined to the data device.  The

	either queue or error the IO destined to the data device.  The

	default is to queue the IO until more space is added.

	default is to queue the IO until more space is added or the

	'no_space_timeout' expires.  The 'no_space_timeout' dm-thin-pool

	module parameter can be used to change this timeout -- it

	defaults to 60 seconds but may be disabled using a value of 0.





iii) Messages

iii) Messages