diff options
| author | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-23 13:38:45 +0100 |
|---|---|---|
| committer | Thomas Bogendoerfer <tsbogend@alpha.franken.de> | 2020-03-23 13:38:45 +0100 |
| commit | 96b6eb8a77dab6ae7eff59c8d2f15e2b92a46552 (patch) | |
| tree | 6a82740ce264dbbd5611c9f7891d354499d849f7 /arch/mips/kernel | |
| parent | 1e07c876ab759954627c13876a5353a06711bf3e (diff) | |
| parent | f7d5f5655ef7e5d2a128f6696ac35256e83b119b (diff) | |
Merge tag 'mips_fixes_5.6.1' into mips-next
Pull in mips-fixes avoiding conflicts with more CI20 DT changes.
A few MIPS fixes:
- DT fixes for CI20
- Fix command line handling
- Correct patchwork URL
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Diffstat (limited to 'arch/mips/kernel')
| -rw-r--r-- | arch/mips/kernel/setup.c | 3 | ||||
| -rw-r--r-- | arch/mips/kernel/vpe.c | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/arch/mips/kernel/setup.c b/arch/mips/kernel/setup.c index 1ac2752fb791..a7b469d89e2c 100644 --- a/arch/mips/kernel/setup.c +++ b/arch/mips/kernel/setup.c @@ -605,7 +605,8 @@ static void __init bootcmdline_init(char **cmdline_p) * If we're configured to take boot arguments from DT, look for those * now. */ - if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB)) + if (IS_ENABLED(CONFIG_MIPS_CMDLINE_FROM_DTB) || + IS_ENABLED(CONFIG_MIPS_CMDLINE_DTB_EXTEND)) of_scan_flat_dt(bootcmdline_scan_chosen, &dt_bootargs); #endif diff --git a/arch/mips/kernel/vpe.c b/arch/mips/kernel/vpe.c index 6176b9acba95..d0d832ab3d3b 100644 --- a/arch/mips/kernel/vpe.c +++ b/arch/mips/kernel/vpe.c @@ -134,7 +134,7 @@ void release_vpe(struct vpe *v) { list_del(&v->list); if (v->load_addr) - release_progmem(v); + release_progmem(v->load_addr); kfree(v); } |