Skip to content

Commit

Permalink
MIPS: Move processing of coherency kernel parameters earlier
Browse files Browse the repository at this point in the history
Commit 97ce2c8 (jump-label: initialize
jump-label subsystem much earlier) caused MIPS to break, so this was
resolved with commit 6650df3 (MIPS:
Move cache setup to setup_arch().).  Unfortunately, after this commit,
the coherency kernel parameters, cca and coherentio, are no longer
processed before their values are used.

This patch fixes this problem by marking them as early_param, which
results in them being processed before they are needed.

Signed-off-by: Shane McDonald <mcdonald.shane@gmail.com>
Acked-by: David Daney <david.daney@cavium.com>
Cc: Ralf Baechle <ralf@linux-mips.org>
Patchwork: http://patchwork.linux-mips.org/patch/3961
Signed-off-by: John Crispin <blogic@openwrt.org>
  • Loading branch information
Shane McDonald authored and John Crispin committed Nov 9, 2012
1 parent 0f73171 commit b5b64f2
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions arch/mips/mm/c-r4k.c
Original file line number Diff line number Diff line change
Expand Up @@ -1348,10 +1348,10 @@ static int __init cca_setup(char *str)
{
get_option(&str, &cca);

return 1;
return 0;
}

__setup("cca=", cca_setup);
early_param("cca", cca_setup);

static void __cpuinit coherency_setup(void)
{
Expand Down Expand Up @@ -1401,10 +1401,10 @@ static int __init setcoherentio(char *str)
{
coherentio = 1;

return 1;
return 0;
}

__setup("coherentio", setcoherentio);
early_param("coherentio", setcoherentio);
#endif

static void __cpuinit r4k_cache_error_setup(void)
Expand Down

0 comments on commit b5b64f2

Please sign in to comment.