diff options
| author | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2014-07-14 12:13:41 -0400 |
| commit | 03fe805a098422d27cbbbad29a54ff1349da3622 (patch) | |
| tree | 0db9cc9a701203ddcee58e5b907d4fb8ad31b421 /arch/sparc/include/asm/trap_block.h | |
| parent | 50dd9050e45ce11c575eabcaee8a914caf78fb74 (diff) | |
| parent | 5646eda5851e6cfdfa22d41895e3f5daffa643d3 (diff) | |
Merge branch 'topic/monotonic' into for-next
Diffstat (limited to 'arch/sparc/include/asm/trap_block.h')
| -rw-r--r-- | arch/sparc/include/asm/trap_block.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/sparc/include/asm/trap_block.h b/arch/sparc/include/asm/trap_block.h index 7e26b2db6211..6fd4436d32f0 100644 --- a/arch/sparc/include/asm/trap_block.h +++ b/arch/sparc/include/asm/trap_block.h | |||
| @@ -51,11 +51,11 @@ struct trap_per_cpu { | |||
| 51 | unsigned long __per_cpu_base; | 51 | unsigned long __per_cpu_base; |
| 52 | } __attribute__((aligned(64))); | 52 | } __attribute__((aligned(64))); |
| 53 | extern struct trap_per_cpu trap_block[NR_CPUS]; | 53 | extern struct trap_per_cpu trap_block[NR_CPUS]; |
| 54 | extern void init_cur_cpu_trap(struct thread_info *); | 54 | void init_cur_cpu_trap(struct thread_info *); |
| 55 | extern void setup_tba(void); | 55 | void setup_tba(void); |
| 56 | extern int ncpus_probed; | 56 | extern int ncpus_probed; |
| 57 | 57 | ||
| 58 | extern unsigned long real_hard_smp_processor_id(void); | 58 | unsigned long real_hard_smp_processor_id(void); |
| 59 | 59 | ||
| 60 | struct cpuid_patch_entry { | 60 | struct cpuid_patch_entry { |
| 61 | unsigned int addr; | 61 | unsigned int addr; |