summaryrefslogtreecommitdiff
path: root/arch/sparc64/kernel/smp.c
diff options
context:
space:
mode:
author <jgarzik@pretzel.yyz.us>2005-05-26 02:17:16 -0400
committerJeff Garzik <jgarzik@pobox.com>2005-05-26 02:17:16 -0400
commitc1ef1f351db70ad60c793b8218dd9f6739cfd66d (patch)
tree3251d6bea051ad11397e6128ae584c1a4b85a5e6 /arch/sparc64/kernel/smp.c
parentad6a9984eec72f3a609a8685281740f5e5f466aa (diff)
parentbef9c558841604116704e10b3d9ff3dbf4939423 (diff)
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/smp.c')
-rw-r--r--arch/sparc64/kernel/smp.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/smp.c b/arch/sparc64/kernel/smp.c
index 6dff06a44e76..e5b9c7a27789 100644
--- a/arch/sparc64/kernel/smp.c
+++ b/arch/sparc64/kernel/smp.c
@@ -123,6 +123,9 @@ void __init smp_callin(void)
smp_setup_percpu_timer();
+ if (cheetah_pcache_forced_on)
+ cheetah_enable_pcache();
+
local_irq_enable();
calibrate_delay();