git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fix/hda' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound-2.6
[pandora-kernel.git]
/
arch
/
parisc
/
kernel
/
setup.c
diff --git
a/arch/parisc/kernel/setup.c
b/arch/parisc/kernel/setup.c
index
8d8b024
..
cb71f3d
100644
(file)
--- a/
arch/parisc/kernel/setup.c
+++ b/
arch/parisc/kernel/setup.c
@@
-1,5
+1,4
@@
-/* $Id: setup.c,v 1.8 2000/02/02 04:42:38 prumpf Exp $
- *
+/*
* Initial setup-routines for HP 9000 based hardware.
*
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
* Initial setup-routines for HP 9000 based hardware.
*
* Copyright (C) 1991, 1992, 1995 Linus Torvalds
@@
-316,7
+315,7
@@
static int __init parisc_init(void)
processor_init();
printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",
processor_init();
printk(KERN_INFO "CPU(s): %d x %s at %d.%06d MHz\n",
-
boot_cpu_data.cpu_count
,
+
num_present_cpus()
,
boot_cpu_data.cpu_name,
boot_cpu_data.cpu_hz / 1000000,
boot_cpu_data.cpu_hz % 1000000 );
boot_cpu_data.cpu_name,
boot_cpu_data.cpu_hz / 1000000,
boot_cpu_data.cpu_hz % 1000000 );
@@
-382,8
+381,8
@@
void start_parisc(void)
if (ret >= 0 && coproc_cfg.ccr_functional) {
mtctl(coproc_cfg.ccr_functional, 10);
if (ret >= 0 && coproc_cfg.ccr_functional) {
mtctl(coproc_cfg.ccr_functional, 10);
-
cpu_data[cpunum]
.fp_rev = coproc_cfg.revision;
-
cpu_data[cpunum]
.fp_model = coproc_cfg.model;
+
per_cpu(cpu_data, cpunum)
.fp_rev = coproc_cfg.revision;
+
per_cpu(cpu_data, cpunum)
.fp_model = coproc_cfg.model;
asm volatile ("fstd %fr0,8(%sp)");
} else {
asm volatile ("fstd %fr0,8(%sp)");
} else {