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

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

Merge core/lib: pick up memparse() change.

Merge branch 'core/lib' into x86/xen
parents a05d2eba d974ae37
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -298,10 +298,10 @@ recommended that you never use these unless you really know what the
cache width is.

int
dma_mapping_error(dma_addr_t dma_addr)
dma_mapping_error(struct device *dev, dma_addr_t dma_addr)

int
pci_dma_mapping_error(dma_addr_t dma_addr)
pci_dma_mapping_error(struct pci_dev *hwdev, dma_addr_t dma_addr)

In some circumstances dma_map_single and dma_map_page will fail to create
a mapping. A driver can check for these errors by testing the returned
+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ IOVA generation is pretty generic. We used the same technique as vmalloc()
but these are not global address spaces, but separate for each domain.
Different DMA engines may support different number of domains.

We also allocate gaurd pages with each mapping, so we can attempt to catch
We also allocate guard pages with each mapping, so we can attempt to catch
any overflow that might happen.


@@ -112,4 +112,4 @@ TBD

- For compatibility testing, could use unity map domain for all devices, just
  provide a 1-1 for all useful memory under a single domain for all devices.
- API for paravirt ops for abstracting functionlity for VMM folks.
- API for paravirt ops for abstracting functionality for VMM folks.
+1 −1
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ This document contains an explanation of the struct taskstats fields.
There are three different groups of fields in the struct taskstats:

1) Common and basic accounting fields
    If CONFIG_TASKSTATS is set, the taskstats inteface is enabled and
    If CONFIG_TASKSTATS is set, the taskstats interface is enabled and
    the common fields and basic accounting fields are collected for
    delivery at do_exit() of a task.
2) Delay accounting fields
+2 −8
Original line number Diff line number Diff line
@@ -138,14 +138,8 @@ So, what's changed?

                Set active the IRQ edge(s)/level.  This replaces the
                SA1111 INTPOL manipulation, and the set_GPIO_IRQ_edge()
                function.  Type should be one of the following:

                #define IRQT_NOEDGE     (0)
                #define IRQT_RISING     (__IRQT_RISEDGE)
                #define IRQT_FALLING    (__IRQT_FALEDGE)
                #define IRQT_BOTHEDGE   (__IRQT_RISEDGE|__IRQT_FALEDGE)
                #define IRQT_LOW        (__IRQT_LOWLVL)
                #define IRQT_HIGH       (__IRQT_HIGHLVL)
                function.  Type should be one of IRQ_TYPE_xxx defined in
		<linux/irq.h>

3. set_GPIO_IRQ_edge() is obsolete, and should be replaced by set_irq_type.

+1 −1
Original line number Diff line number Diff line
@@ -122,7 +122,7 @@ around '10000' or more.
show_sampling_rate_(min|max): the minimum and maximum sampling rates
available that you may set 'sampling_rate' to.

up_threshold: defines what the average CPU usaged between the samplings
up_threshold: defines what the average CPU usage between the samplings
of 'sampling_rate' needs to be for the kernel to make a decision on
whether it should increase the frequency.  For example when it is set
to its default value of '80' it means that between the checking
Loading