diff options
| author | <jgarzik@pretzel.yyz.us> | 2005-05-26 02:17:16 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-05-26 02:17:16 -0400 |
| commit | c1ef1f351db70ad60c793b8218dd9f6739cfd66d (patch) | |
| tree | 3251d6bea051ad11397e6128ae584c1a4b85a5e6 /arch/sparc64/kernel/setup.c | |
| parent | ad6a9984eec72f3a609a8685281740f5e5f466aa (diff) | |
| parent | bef9c558841604116704e10b3d9ff3dbf4939423 (diff) | |
| download | linux-stable-c1ef1f351db70ad60c793b8218dd9f6739cfd66d.tar.gz linux-stable-c1ef1f351db70ad60c793b8218dd9f6739cfd66d.tar.bz2 linux-stable-c1ef1f351db70ad60c793b8218dd9f6739cfd66d.zip | |
Automatic merge of rsync://rsync.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git branch HEAD
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 12c3d84b7460..b7e6a91952b2 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; |