diff options
| author | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
|---|---|---|
| committer | David Woodhouse <David.Woodhouse@intel.com> | 2008-10-13 12:13:56 -0400 |
| commit | e758936e02700ff88a0b08b722a3847b95283ef2 (patch) | |
| tree | 50c919bef1b459a778b85159d5929de95b6c4a01 /include/asm-mips/smtc_proc.h | |
| parent | 239cfbde1f5843c4a24199f117d5f67f637d72d5 (diff) | |
| parent | 4480f15b3306f43bbb0310d461142b4e897ca45b (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Conflicts:
include/asm-x86/statfs.h
Diffstat (limited to 'include/asm-mips/smtc_proc.h')
| -rw-r--r-- | include/asm-mips/smtc_proc.h | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/include/asm-mips/smtc_proc.h b/include/asm-mips/smtc_proc.h deleted file mode 100644 index 25da651f1f5f..000000000000 --- a/include/asm-mips/smtc_proc.h +++ /dev/null | |||
| @@ -1,23 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Definitions for SMTC /proc entries | ||
| 3 | * Copyright(C) 2005 MIPS Technologies Inc. | ||
| 4 | */ | ||
| 5 | #ifndef __ASM_SMTC_PROC_H | ||
| 6 | #define __ASM_SMTC_PROC_H | ||
| 7 | |||
| 8 | /* | ||
| 9 | * per-"CPU" statistics | ||
| 10 | */ | ||
| 11 | |||
| 12 | struct smtc_cpu_proc { | ||
| 13 | unsigned long timerints; | ||
| 14 | unsigned long selfipis; | ||
| 15 | }; | ||
| 16 | |||
| 17 | extern struct smtc_cpu_proc smtc_cpu_stats[NR_CPUS]; | ||
| 18 | |||
| 19 | /* Count of number of recoveries of "stolen" FPU access rights on 34K */ | ||
| 20 | |||
| 21 | extern atomic_t smtc_fpu_recoveries; | ||
| 22 | |||
| 23 | #endif /* __ASM_SMTC_PROC_H */ | ||