| From 7b83299e5b9385943a857d59e15cba270df20d7e Mon Sep 17 00:00:00 2001 |
| From: Randy Dunlap <rdunlap@infradead.org> |
| Date: Wed, 23 Feb 2022 20:46:35 +0100 |
| Subject: ARM: 9182/1: mmu: fix returns from early_param() and __setup() functions |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Randy Dunlap <rdunlap@infradead.org> |
| |
| commit 7b83299e5b9385943a857d59e15cba270df20d7e upstream. |
| |
| early_param() handlers should return 0 on success. |
| __setup() handlers should return 1 on success, i.e., the parameter |
| has been handled. A return of 0 would cause the "option=value" string |
| to be added to init's environment strings, polluting it. |
| |
| ../arch/arm/mm/mmu.c: In function 'test_early_cachepolicy': |
| ../arch/arm/mm/mmu.c:215:1: error: no return statement in function returning non-void [-Werror=return-type] |
| ../arch/arm/mm/mmu.c: In function 'test_noalign_setup': |
| ../arch/arm/mm/mmu.c:221:1: error: no return statement in function returning non-void [-Werror=return-type] |
| |
| Fixes: b849a60e0903 ("ARM: make cr_alignment read-only #ifndef CONFIG_CPU_CP15") |
| Signed-off-by: Randy Dunlap <rdunlap@infradead.org> |
| Reported-by: Igor Zhbanov <i.zhbanov@omprussia.ru> |
| Cc: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> |
| Cc: linux-arm-kernel@lists.infradead.org |
| Cc: patches@armlinux.org.uk |
| Signed-off-by: Russell King (Oracle) <rmk+kernel@armlinux.org.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| arch/arm/mm/mmu.c | 2 ++ |
| 1 file changed, 2 insertions(+) |
| |
| --- a/arch/arm/mm/mmu.c |
| +++ b/arch/arm/mm/mmu.c |
| @@ -229,12 +229,14 @@ early_param("ecc", early_ecc); |
| static int __init early_cachepolicy(char *p) |
| { |
| pr_warn("cachepolicy kernel parameter not supported without cp15\n"); |
| + return 0; |
| } |
| early_param("cachepolicy", early_cachepolicy); |
| |
| static int __init noalign_setup(char *__unused) |
| { |
| pr_warn("noalign kernel parameter not supported without cp15\n"); |
| + return 1; |
| } |
| __setup("noalign", noalign_setup); |
| |