[patch 08/10] Sparc64: Use generic percpu

Christoph Lameter
2007-11-28T21:17:42Z

[-- Attachment #1: sparc64_generic_percpu --]
[-- Type: text/plain, Size: 2559 bytes --]

Sparc64 has a way of providing the base address for the per cpu area of the
currently executing processor in a global register.

Sparc64 also provides a way to calculate the address of a per cpu area
from a base address instead of performing an array lookup.

Cc: David Miller <davem@davemloft.net>
Signed-off-by: Christoph Lameter <clameter@sgi.com>

---
arch/sparc64/mm/init.c | 5 +++++
include/asm-sparc64/percpu.h | 12 ++----------
2 files changed, 7 insertions(+), 10 deletions(-)

Index: linux-2.6.24-rc3-mm2/include/asm-sparc64/percpu.h
===================================================================
--- linux-2.6.24-rc3-mm2.orig/include/asm-sparc64/percpu.h 2007-11-28 12:51:42.448213150 -0800
+++ linux-2.6.24-rc3-mm2/include/asm-sparc64/percpu.h 2007-11-28 12:52:01.036463295 -0800
@@ -7,7 +7,6 @@ register unsigned long __local_per_cpu_o

#ifdef CONFIG_SMP

-#define setup_per_cpu_areas() do { } while (0)
extern void real_setup_per_cpu_areas(void);

extern unsigned long __per_cpu_base;
@@ -16,21 +15,14 @@ extern unsigned long __per_cpu_shift;
(__per_cpu_base + ((unsigned long)(__cpu) << __per_cpu_shift))
#define per_cpu_offset(x) (__per_cpu_offset(x))

-/* 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))
-#define __raw_get_cpu_var(var) (*RELOC_HIDE(&per_cpu__##var, __local_per_cpu_offset))
+#define __my_cpu_offset __local_per_cpu_offset

#else /* ! SMP */

#define real_setup_per_cpu_areas() do { } while (0)

-#define per_cpu(var, cpu) (*((void)cpu, &per_cpu__##var))
-#define __get_cpu_var(var) per_cpu__##var
-#define __raw_get_cpu_var(var) per_cpu__##var
-
#endif /* SMP */

-#define DECLARE_PER_CPU(type, name) extern __typeof__(type) per_cpu__##name
+#include <asm-generic/percpu.h>

#endif /* __ARCH_SPARC64_PERCPU__ */
Index: linux-2.6.24-rc3-mm2/arch/sparc64/mm/init.c
===================================================================
--- linux-2.6.24-rc3-mm2.orig/arch/sparc64/mm/init.c 2007-11-28 12:51:19.464963124 -0800
+++ linux-2.6.24-rc3-mm2/arch/sparc64/mm/init.c 2007-11-28 12:52:01.040463210 -0800
@@ -1323,6 +1323,11 @@ pgd_t swapper_pg_dir[2048];
static void sun4u_pgprot_init(void);
static void sun4v_pgprot_init(void);

+/* Dummy function */
+void __init setup_per_cpu_areas(void)
+{
+}
+
void __init paging_init(void)
{
unsigned long end_pfn, pages_avail, shift, phys_base;

--