diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:48:06 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 15:48:06 -0500 |
| commit | b0138a6cb7923a997d278b47c176778534d1095b (patch) | |
| tree | 4fcb8822a69631baba568e4e1942847747123887 /arch/parisc/kernel/processor.c | |
| parent | 6572d6d7d0f965dda19d02af804ed3ae4b3bf1fc (diff) | |
| parent | 1055a8af093fea7490445bd15cd671020e542035 (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/kyle/parisc-2.6: (78 commits)
[PARISC] Use symbolic last syscall in __NR_Linux_syscalls
[PARISC] Add missing statfs64 and fstatfs64 syscalls
Revert "[PARISC] Optimize TLB flush on SMP systems"
[PARISC] Compat signal fixes for 64-bit parisc
[PARISC] Reorder syscalls to match unistd.h
Revert "[PATCH] make kernel/signal.c:kill_proc_info() static"
[PARISC] fix sys_rt_sigqueueinfo
[PARISC] fix section mismatch warnings in harmony sound driver
[PARISC] do not export get_register/set_register
[PARISC] add ENTRY()/ENDPROC() and simplify assembly of HP/UX emulation code
[PARISC] convert to use CONFIG_64BIT instead of __LP64__
[PARISC] use CONFIG_64BIT instead of __LP64__
[PARISC] add ASM_EXCEPTIONTABLE_ENTRY() macro
[PARISC] more ENTRY(), ENDPROC(), END() conversions
[PARISC] fix ENTRY() and ENDPROC() for 64bit-parisc
[PARISC] Fixes /proc/cpuinfo cache output on B160L
[PARISC] implement standard ENTRY(), END() and ENDPROC()
[PARISC] kill ENTRY_SYS_CPUS
[PARISC] clean up debugging printks in smp.c
[PARISC] factor syscall_restart code out of do_signal
...
Fix conflict in include/linux/sched.h due to kill_proc_info() being made
publicly available to PARISC again.
Diffstat (limited to 'arch/parisc/kernel/processor.c')
| -rw-r--r-- | arch/parisc/kernel/processor.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/parisc/kernel/processor.c b/arch/parisc/kernel/processor.c index fb81e5687e7c..7c056dcebf55 100644 --- a/arch/parisc/kernel/processor.c +++ b/arch/parisc/kernel/processor.c | |||
| @@ -93,7 +93,7 @@ static int __init processor_probe(struct parisc_device *dev) | |||
| 93 | cpuid = boot_cpu_data.cpu_count; | 93 | cpuid = boot_cpu_data.cpu_count; |
| 94 | txn_addr = dev->hpa.start; /* for legacy PDC */ | 94 | txn_addr = dev->hpa.start; /* for legacy PDC */ |
| 95 | 95 | ||
| 96 | #ifdef __LP64__ | 96 | #ifdef CONFIG_64BIT |
| 97 | if (is_pdc_pat()) { | 97 | if (is_pdc_pat()) { |
| 98 | ulong status; | 98 | ulong status; |
| 99 | unsigned long bytecnt; | 99 | unsigned long bytecnt; |
| @@ -153,8 +153,6 @@ static int __init processor_probe(struct parisc_device *dev) | |||
| 153 | p->cpuid = cpuid; /* save CPU id */ | 153 | p->cpuid = cpuid; /* save CPU id */ |
| 154 | p->txn_addr = txn_addr; /* save CPU IRQ address */ | 154 | p->txn_addr = txn_addr; /* save CPU IRQ address */ |
| 155 | #ifdef CONFIG_SMP | 155 | #ifdef CONFIG_SMP |
| 156 | spin_lock_init(&p->lock); | ||
| 157 | |||
| 158 | /* | 156 | /* |
| 159 | ** FIXME: review if any other initialization is clobbered | 157 | ** FIXME: review if any other initialization is clobbered |
| 160 | ** for boot_cpu by the above memset(). | 158 | ** for boot_cpu by the above memset(). |
| @@ -311,11 +309,11 @@ int __init init_per_cpu(int cpunum) | |||
| 311 | } else { | 309 | } else { |
| 312 | printk(KERN_WARNING "WARNING: No FP CoProcessor?!" | 310 | printk(KERN_WARNING "WARNING: No FP CoProcessor?!" |
| 313 | " (coproc_cfg.ccr_functional == 0x%lx, expected 0xc0)\n" | 311 | " (coproc_cfg.ccr_functional == 0x%lx, expected 0xc0)\n" |
| 314 | #ifdef __LP64__ | 312 | #ifdef CONFIG_64BIT |
| 315 | "Halting Machine - FP required\n" | 313 | "Halting Machine - FP required\n" |
| 316 | #endif | 314 | #endif |
| 317 | , coproc_cfg.ccr_functional); | 315 | , coproc_cfg.ccr_functional); |
| 318 | #ifdef __LP64__ | 316 | #ifdef CONFIG_64BIT |
| 319 | mdelay(100); /* previous chars get pushed to console */ | 317 | mdelay(100); /* previous chars get pushed to console */ |
| 320 | panic("FP CoProc not reported"); | 318 | panic("FP CoProc not reported"); |
| 321 | #endif | 319 | #endif |
| @@ -339,9 +337,6 @@ show_cpuinfo (struct seq_file *m, void *v) | |||
| 339 | #ifdef CONFIG_SMP | 337 | #ifdef CONFIG_SMP |
| 340 | if (0 == cpu_data[n].hpa) | 338 | if (0 == cpu_data[n].hpa) |
| 341 | continue; | 339 | continue; |
| 342 | #ifdef ENTRY_SYS_CPUS | ||
| 343 | #error iCOD support wants to show CPU state here | ||
| 344 | #endif | ||
| 345 | #endif | 340 | #endif |
| 346 | seq_printf(m, "processor\t: %d\n" | 341 | seq_printf(m, "processor\t: %d\n" |
| 347 | "cpu family\t: PA-RISC %s\n", | 342 | "cpu family\t: PA-RISC %s\n", |