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 'sh-latest' of git://git.kernel.org/pub/scm/linux/kernel/git/lethal...
[pandora-kernel.git]
/
arch
/
sparc
/
include
/
asm
/
cpudata_32.h
diff --git
a/arch/sparc/include/asm/cpudata_32.h
b/arch/sparc/include/asm/cpudata_32.h
index
31d48a0
..
a4c5a93
100644
(file)
--- a/
arch/sparc/include/asm/cpudata_32.h
+++ b/
arch/sparc/include/asm/cpudata_32.h
@@
-16,6
+16,10
@@
typedef struct {
unsigned long clock_tick;
unsigned int multiplier;
unsigned int counter;
unsigned long clock_tick;
unsigned int multiplier;
unsigned int counter;
+#ifdef CONFIG_SMP
+ unsigned int irq_resched_count;
+ unsigned int irq_call_count;
+#endif
int prom_node;
int mid;
int next;
int prom_node;
int mid;
int next;
@@
-23,5
+27,6
@@
typedef struct {
DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
#define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
DECLARE_PER_CPU(cpuinfo_sparc, __cpu_data);
#define cpu_data(__cpu) per_cpu(__cpu_data, (__cpu))
+#define local_cpu_data() __get_cpu_var(__cpu_data)
#endif /* _SPARC_CPUDATA_H */
#endif /* _SPARC_CPUDATA_H */