diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 18:01:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-25 18:01:26 -0700 |
commit | bef9c558841604116704e10b3d9ff3dbf4939423 (patch) | |
tree | f5c58b6b0cfd2a92fb3b1d1f4cbfdfb3df6f45d6 /arch/sparc64/kernel/setup.c | |
parent | 3db602bdcd52d8b7523cfb4fb705cea84dbe1617 (diff) | |
parent | 4b463f785837f73bdd88ae3821bb7b69599010c9 (diff) |
Merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/sparc64/kernel/setup.c')
-rw-r--r-- | arch/sparc64/kernel/setup.c | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/setup.c b/arch/sparc64/kernel/setup.c index 12c3d84b746..b7e6a91952b 100644 --- a/arch/sparc64/kernel/setup.c +++ b/arch/sparc64/kernel/setup.c @@ -383,6 +383,17 @@ static void __init process_switch(char c) /* Use PROM debug console. */ register_console(&prom_debug_console); break; + case 'P': + /* Force UltraSPARC-III P-Cache on. */ + if (tlb_type != cheetah) { + printk("BOOT: Ignoring P-Cache force option.\n"); + break; + } + cheetah_pcache_forced_on = 1; + add_taint(TAINT_MACHINE_CHECK); + cheetah_enable_pcache(); + break; + default: printk("Unknown boot switch (-%c)\n", c); break; |