diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 18:55:14 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-06 18:55:14 -0500 |
| commit | a590f08c329d1f81030413435dd916753fb63cfd (patch) | |
| tree | 74127f2ffc4b3e08a9e81d2a9d7028070a885dbc | |
| parent | 19de085230ebe14f0a43614d20c2beabe0e67f98 (diff) | |
| download | rt-patches-a590f08c329d1f81030413435dd916753fb63cfd.tar.gz | |
trivial context shuffle
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | percpu-add-percpu-locked-infrastructure.patch | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/percpu-add-percpu-locked-infrastructure.patch b/percpu-add-percpu-locked-infrastructure.patch index b157deb..52108bf 100644 --- a/percpu-add-percpu-locked-infrastructure.patch +++ b/percpu-add-percpu-locked-infrastructure.patch @@ -1,4 +1,4 @@ -From 4f7b7cb59fcb0b6a226205d047814e023c7fe5c4 Mon Sep 17 00:00:00 2001 +From ba404fe58481603a411847fc718eb3366ccd4fc6 Mon Sep 17 00:00:00 2001 From: Ingo Molnar <mingo@elte.hu> Date: Fri, 3 Jul 2009 08:29:51 -0500 Subject: [PATCH] percpu: add percpu locked infrastructure @@ -16,7 +16,7 @@ Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/include/asm-generic/percpu.h b/include/asm-generic/percpu.h -index 04f91c2..37a3ec5 100644 +index 04f91c2..d1d3488 100644 --- a/include/asm-generic/percpu.h +++ b/include/asm-generic/percpu.h @@ -5,6 +5,9 @@ @@ -29,9 +29,9 @@ index 04f91c2..37a3ec5 100644 #ifdef CONFIG_SMP /* -@@ -63,6 +66,14 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; - #define this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset) - #define __this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) +@@ -60,10 +63,18 @@ extern unsigned long __per_cpu_offset[NR_CPUS]; + #define __raw_get_cpu_var(var) \ + (*SHIFT_PERCPU_PTR(&(var), __my_cpu_offset)) +#define per_cpu_lock(var, cpu) \ + (*SHIFT_PERCPU_PTR(&__per_cpu_var_lock(var), per_cpu_offset(cpu))) @@ -41,9 +41,14 @@ index 04f91c2..37a3ec5 100644 + per_cpu_lock(var, cpu) +#define __get_cpu_var_locked(var, cpu) \ + per_cpu_var_locked(var, cpu) ++ + #define this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, my_cpu_offset) + #define __this_cpu_ptr(ptr) SHIFT_PERCPU_PTR(ptr, __my_cpu_offset) +- #ifdef CONFIG_HAVE_SETUP_PER_CPU_AREA extern void setup_per_cpu_areas(void); + #endif @@ -71,6 +82,10 @@ extern void setup_per_cpu_areas(void); #else /* ! SMP */ @@ -56,7 +61,7 @@ index 04f91c2..37a3ec5 100644 #define __raw_get_cpu_var(var) (var) #define this_cpu_ptr(ptr) per_cpu_ptr(ptr, 0) diff --git a/include/linux/percpu-defs.h b/include/linux/percpu-defs.h -index 68567c0..2bc9661 100644 +index 68567c0..2187c24 100644 --- a/include/linux/percpu-defs.h +++ b/include/linux/percpu-defs.h @@ -91,6 +91,22 @@ |