diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 08:59:24 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-07-12 08:59:24 -0400 |
| commit | cda390bb8f0fc751194ef5f4c691ca8d3ff91009 (patch) | |
| tree | 9739758690c5107b73a09f632ae2f8fc2507db09 /arch/sparc/include/asm/cpudata.h | |
| parent | 9a2c33a422d60e8e55c5aff6752522dc39993b16 (diff) | |
| parent | 449fd15fbcde239875031d70fd06abb4a0e1ed09 (diff) | |
Merge branch 'kprobes-test-fixes' of git://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'arch/sparc/include/asm/cpudata.h')
| -rw-r--r-- | arch/sparc/include/asm/cpudata.h | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/sparc/include/asm/cpudata.h b/arch/sparc/include/asm/cpudata.h index b5976de7cacd..128b56b08676 100644 --- a/arch/sparc/include/asm/cpudata.h +++ b/arch/sparc/include/asm/cpudata.h | |||
| @@ -1,5 +1,15 @@ | |||
| 1 | #ifndef ___ASM_SPARC_CPUDATA_H | 1 | #ifndef ___ASM_SPARC_CPUDATA_H |
| 2 | #define ___ASM_SPARC_CPUDATA_H | 2 | #define ___ASM_SPARC_CPUDATA_H |
| 3 | |||
| 4 | #ifndef __ASSEMBLY__ | ||
| 5 | |||
| 6 | #include <linux/threads.h> | ||
| 7 | #include <linux/percpu.h> | ||
| 8 | |||
| 9 | extern const struct seq_operations cpuinfo_op; | ||
| 10 | |||
| 11 | #endif /* !(__ASSEMBLY__) */ | ||
| 12 | |||
| 3 | #if defined(__sparc__) && defined(__arch64__) | 13 | #if defined(__sparc__) && defined(__arch64__) |
| 4 | #include <asm/cpudata_64.h> | 14 | #include <asm/cpudata_64.h> |
| 5 | #else | 15 | #else |