diff options
| author | Grant Grundler <grundler@gsyprf11.external.hp.com> | 2006-09-01 17:18:39 -0400 |
|---|---|---|
| committer | Matthew Wilcox <willy@parisc-linux.org> | 2006-10-04 08:47:57 -0400 |
| commit | 7908a0c72ee78ba5476c2a773d808c77593719c6 (patch) | |
| tree | 4e8a1f040aae280035d4936bf5971f39d4d6c5b5 /arch/parisc/kernel | |
| parent | 9cf8f370f0777a24808b3485f3b5abb8e736d3e8 (diff) | |
[PARISC] Prevent processor_probe() from clobbering cpu_data[0]
processor_probe() shouldn't clobber cpu_data[0]
cpu_data[0].it_value (used by timer_interrupt()) is already set.
Signed-off-by: Grant Grundler <grundler@parisc-linux.org>
Signed-off-by: Kyle McMartin <kyle@parisc-linux.org>
Diffstat (limited to 'arch/parisc/kernel')
| -rw-r--r-- | arch/parisc/kernel/processor.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index 99d7fca93104..fb81e5687e7c 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
| @@ -143,8 +143,9 @@ static int __init processor_probe(struct parisc_device *dev) | |||
| 143 | p = &cpu_data[cpuid]; | 143 | p = &cpu_data[cpuid]; |
| 144 | boot_cpu_data.cpu_count++; | 144 | boot_cpu_data.cpu_count++; |
| 145 | 145 | ||
| 146 | /* initialize counters */ | 146 | /* initialize counters - CPU 0 gets it_value set in time_init() */ |
| 147 | memset(p, 0, sizeof(struct cpuinfo_parisc)); | 147 | if (cpuid) |
| 148 | memset(p, 0, sizeof(struct cpuinfo_parisc)); | ||
| 148 | 149 | ||
| 149 | p->loops_per_jiffy = loops_per_jiffy; | 150 | p->loops_per_jiffy = loops_per_jiffy; |
| 150 | p->dev = dev; /* Save IODC data in case we need it */ | 151 | p->dev = dev; /* Save IODC data in case we need it */ |