diff options
| author | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2014-09-10 21:40:19 +0000 |
| commit | 02629d8f87303a03e3ac36f48c508242d9b8cb09 (patch) | |
| tree | 250a83e0d0e2cf5c7fe49e0a2087f3739f4509c2 /target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch | |
| parent | 7be0ed78e7cf578aa89996d408703ea2ab79a1e8 (diff) | |
| download | upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.gz upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.tar.bz2 upstream-02629d8f87303a03e3ac36f48c508242d9b8cb09.zip | |
kernel: update 3.14 to 3.14.18
Targets were build tested and patches are refreshed.
Signed-off-by: Luka Perkov <luka@openwrt.org>
SVN-Revision: 42463
Diffstat (limited to 'target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch')
| -rw-r--r-- | target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch b/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch index f520e6cc7a..1e304dddb0 100644 --- a/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch +++ b/target/linux/ipq806x/patches/0049-drivers-of-add-initialization-code-for-static-reserv.patch @@ -25,8 +25,6 @@ Signed-off-by: Grant Likely <grant.likely@linaro.org> include/linux/of_fdt.h | 4 ++ 2 files changed, 135 insertions(+) -diff --git a/drivers/of/fdt.c b/drivers/of/fdt.c -index 758b4f8..819e112 100644 --- a/drivers/of/fdt.c +++ b/drivers/of/fdt.c @@ -15,6 +15,7 @@ @@ -37,7 +35,7 @@ index 758b4f8..819e112 100644 #include <linux/string.h> #include <linux/errno.h> #include <linux/slab.h> -@@ -440,6 +441,118 @@ struct boot_param_header *initial_boot_params; +@@ -440,6 +441,118 @@ struct boot_param_header *initial_boot_p #ifdef CONFIG_OF_EARLY_FLATTREE /** @@ -156,7 +154,7 @@ index 758b4f8..819e112 100644 * of_scan_flat_dt - scan flattened tree blob and call callback on each. * @it: callback function * @data: context data pointer -@@ -856,6 +969,16 @@ void __init __weak early_init_dt_add_memory_arch(u64 base, u64 size) +@@ -859,6 +972,16 @@ void __init __weak early_init_dt_add_mem memblock_add(base, size); } @@ -173,7 +171,7 @@ index 758b4f8..819e112 100644 /* * called from unflatten_device_tree() to bootstrap devicetree itself * Architectures can override this definition if memblock isn't used -@@ -864,6 +987,14 @@ void * __init __weak early_init_dt_alloc_memory_arch(u64 size, u64 align) +@@ -867,6 +990,14 @@ void * __init __weak early_init_dt_alloc { return __va(memblock_alloc(size, align)); } @@ -188,11 +186,9 @@ index 758b4f8..819e112 100644 #endif bool __init early_init_dt_scan(void *params) -diff --git a/include/linux/of_fdt.h b/include/linux/of_fdt.h -index 2b77058..ddd7219 100644 --- a/include/linux/of_fdt.h +++ b/include/linux/of_fdt.h -@@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(unsigned long node, const char *uname, +@@ -98,7 +98,10 @@ extern int early_init_dt_scan_chosen(uns int depth, void *data); extern int early_init_dt_scan_memory(unsigned long node, const char *uname, int depth, void *data); @@ -203,7 +199,7 @@ index 2b77058..ddd7219 100644 extern void * early_init_dt_alloc_memory_arch(u64 size, u64 align); extern u64 dt_mem_next_cell(int s, __be32 **cellp); -@@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tree(void); +@@ -118,6 +121,7 @@ extern void unflatten_and_copy_device_tr extern void early_init_devtree(void *); extern void early_get_first_memblock_info(void *, phys_addr_t *); #else /* CONFIG_OF_FLATTREE */ @@ -211,6 +207,3 @@ index 2b77058..ddd7219 100644 static inline const char *of_flat_dt_get_machine_name(void) { return NULL; } static inline void unflatten_device_tree(void) {} static inline void unflatten_and_copy_device_tree(void) {} --- -1.7.10.4 - |