diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:13:22 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-08-22 11:13:22 -0700 |
| commit | 7da6cd8bdfe13fecc061b868dda57ee1a3a051f4 (patch) | |
| tree | c91173fc74f9e66a496296b031728a82835d70b3 /include/asm-sparc64/percpu.h | |
| parent | 13c926e04602db207366c7d213dd99d443ac4ad8 (diff) | |
| parent | efb896300cc9215f60bb4f7f77f93541ab9f1713 (diff) | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC32]: Revert f642b263800e6e57c377d630be6d2a999683b579.
[SPARC64]: Need to clobber global reg vars in switch_to().
Diffstat (limited to 'include/asm-sparc64/percpu.h')
| -rw-r--r-- | include/asm-sparc64/percpu.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/asm-sparc64/percpu.h b/include/asm-sparc64/percpu.h index caf8750792f..a1f53a4da40 100644 --- a/include/asm-sparc64/percpu.h +++ b/include/asm-sparc64/percpu.h @@ -3,6 +3,8 @@ #include <linux/compiler.h> +register unsigned long __local_per_cpu_offset asm("g5"); + #ifdef CONFIG_SMP #define setup_per_cpu_areas() do { } while (0) @@ -23,8 +25,6 @@ extern unsigned long __per_cpu_shift; __typeof__(type) per_cpu__##name \ ____cacheline_aligned_in_smp -register unsigned long __local_per_cpu_offset asm("g5"); - /* var is in discarded region: offset to particular copy we want */ #define per_cpu(var, cpu) (*RELOC_HIDE(&per_cpu__##var, __per_cpu_offset(cpu))) #define __get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __local_per_cpu_offset)) |