diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 11:18:33 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-07-20 11:18:33 -0700 |
| commit | 293bccc5b202400a6e47bd42e852d50d7d991b4e (patch) | |
| tree | eee50bfc31341228b4c31b340a03ebeb3c0c4a50 /arch/nds32/kernel/setup.c | |
| parent | bfa54a3a00e2f7ff051a50f3957e4fca3d73f6e7 (diff) | |
| parent | 987553894f0ce8c1d83578136603a89009f42d35 (diff) | |
| download | lwn-293bccc5b202400a6e47bd42e852d50d7d991b4e.tar.gz lwn-293bccc5b202400a6e47bd42e852d50d7d991b4e.zip | |
Merge tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux
Pull nds32 updates from Greentime Hu:
"Bug fixes and build ixes for nds32"
* tag 'nds32-for-linus-4.18' of git://git.kernel.org/pub/scm/linux/kernel/git/greentime/linux:
nds32: fix build error "relocation truncated to fit: R_NDS32_25_PCREL_RELA" when make allyesconfig
nds32: To simplify the implementation of update_mmu_cache()
nds32: Fix the dts pointer is not passed correctly issue.
nds32: To implement these icache invalidation APIs since nds32 cores don't snoop data cache. This issue is found by Guo Ren. Based on the Documentation/core-api/cachetlb.rst and it says:
nds32: Fix build error caused by configuration flag rename
nds32: define __NDS32_E[BL]__ for sparse
Diffstat (limited to 'arch/nds32/kernel/setup.c')
| -rw-r--r-- | arch/nds32/kernel/setup.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/nds32/kernel/setup.c b/arch/nds32/kernel/setup.c index 2f5b2ccebe47..63a1a5ef5219 100644 --- a/arch/nds32/kernel/setup.c +++ b/arch/nds32/kernel/setup.c @@ -278,7 +278,8 @@ static void __init setup_memory(void) void __init setup_arch(char **cmdline_p) { - early_init_devtree( __dtb_start); + early_init_devtree(__atags_pointer ? \ + phys_to_virt(__atags_pointer) : __dtb_start); setup_cpuinfo(); |