projects
/
openwrt
/
staging
/
stintel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
kernel: update 3.14 to 3.14.18
[openwrt/staging/stintel.git]
/
target
/
linux
/
ipq806x
/
patches
/
0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
diff --git
a/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
b/target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
index 8ff56329e0bd588746afa566fde50e1ab02a1047..7e90e2d88ac0a3fde13b8fb6fd317e74704e260a 100644
(file)
--- a/
target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
+++ b/
target/linux/ipq806x/patches/0052-arm-add-support-for-reserved-memory-defined-by-devic.patch
@@
-13,11
+13,9
@@
Signed-off-by: Grant Likely <grant.likely@linaro.org>
arch/arm/mm/init.c | 2 ++
2 files changed, 3 insertions(+)
arch/arm/mm/init.c | 2 ++
2 files changed, 3 insertions(+)
-diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
-index d02ce70..4332e8d 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
-@@ -192
2,6 +1922
,7 @@ config USE_OF
+@@ -192
3,6 +1923
,7 @@ config USE_OF
select IRQ_DOMAIN
select OF
select OF_EARLY_FLATTREE
select IRQ_DOMAIN
select OF
select OF_EARLY_FLATTREE
@@
-25,11
+23,9
@@
index d02ce70..4332e8d 100644
help
Include support for flattened device tree machine descriptions.
help
Include support for flattened device tree machine descriptions.
-diff --git a/arch/arm/mm/init.c b/arch/arm/mm/init.c
-index 804d615..2a77ba8 100644
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
--- a/arch/arm/mm/init.c
+++ b/arch/arm/mm/init.c
-@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct mem
info *mi,
+@@ -323,6 +323,8 @@ void __init arm_memblock_init(struct mem
if (mdesc->reserve)
mdesc->reserve();
if (mdesc->reserve)
mdesc->reserve();
@@
-38,6
+34,3
@@
index 804d615..2a77ba8 100644
/*
* reserve memory for DMA contigouos allocations,
* must come from DMA area inside low memory
/*
* reserve memory for DMA contigouos allocations,
* must come from DMA area inside low memory
---
-1.7.10.4
-