diff options
| author | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@sirena.org.uk> | 2013-06-14 12:08:29 +0100 |
| commit | bdc04bac744054924dd5017e17fbcfdd87fda292 (patch) | |
| tree | fd5d39b85a037790fd0dc9451cd5e46b064bb422 /Documentation | |
| parent | b068b1e7d514d8806623ece2fc76aacf523f487d (diff) | |
| parent | e695239d5f0a553e28a1ff5f346fcc3fafab2b2f (diff) | |
Merge branch 'tracking-big-LITTLE-MP-upstream' into merge-manifest
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/arm/pmu.txt | 3 | ||||
| -rw-r--r-- | Documentation/kernel-parameters.txt | 9 |
2 files changed, 12 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/pmu.txt b/Documentation/devicetree/bindings/arm/pmu.txt index 343781b9f246..4ce82d045a6b 100644 --- a/Documentation/devicetree/bindings/arm/pmu.txt +++ b/Documentation/devicetree/bindings/arm/pmu.txt @@ -16,6 +16,9 @@ Required properties: "arm,arm1176-pmu" "arm,arm1136-pmu" - interrupts : 1 combined interrupt or 1 per core. +- cluster : a phandle to the cluster to which it belongs + If there are more than one cluster with same CPU type + then there should be separate PMU nodes per cluster. Example: diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 8ccbf27aead4..69e11cfa94e7 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1212,6 +1212,15 @@ bytes respectively. Such letter suffixes can also be entirely omitted. See comment before ip2_setup() in drivers/char/ip2/ip2base.c. + irqaffinity= [SMP] Set the default irq affinity mask + Format: + <cpu number>,...,<cpu number> + or + <cpu number>-<cpu number> + (must be a positive range in ascending order) + or a mixture + <cpu number>,...,<cpu number>-<cpu number> + irqfixup [HW] When an interrupt is not handled search all handlers for it. Intended to get systems with badly broken |