diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 12:04:19 -0500 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2011-02-08 12:04:19 -0500 |
| commit | 1b4df8d17d0b6e5c2aefcf08739873e150341493 (patch) | |
| tree | 90ba966bc6fd991e8651ed01ec87ba25a2a938c6 | |
| parent | 38dae2cc44a8ae7172a827a4c5e39064e92de214 (diff) | |
| download | rt-patches-1b4df8d17d0b6e5c2aefcf08739873e150341493.tar.gz | |
refresh rt-Add-the-preempt-rt-lock-replacement-APIs.patch
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | rt-Add-the-preempt-rt-lock-replacement-APIs.patch | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/rt-Add-the-preempt-rt-lock-replacement-APIs.patch b/rt-Add-the-preempt-rt-lock-replacement-APIs.patch index 8918eea..ca7f7b3 100644 --- a/rt-Add-the-preempt-rt-lock-replacement-APIs.patch +++ b/rt-Add-the-preempt-rt-lock-replacement-APIs.patch @@ -1,4 +1,4 @@ -From ea131b9b52ea0397d94f7e584572122389ca9aa7 Mon Sep 17 00:00:00 2001 +From a87b56c9af8f815fd739221b9f29c23812f3b3e3 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@linutronix.de> Date: Sun, 26 Jul 2009 19:39:56 +0200 Subject: [PATCH] rt: Add the preempt-rt lock replacement APIs @@ -400,7 +400,7 @@ index 0000000..07d98f5 + +#endif diff --git a/include/linux/rwlock.h b/include/linux/rwlock.h -index 71e0b00..688b04f 100644 +index bc2994e..4e804db 100644 --- a/include/linux/rwlock.h +++ b/include/linux/rwlock.h @@ -5,6 +5,60 @@ @@ -583,7 +583,7 @@ index 70e2f4b..e516c81 100644 #endif /* _LINUX_RWSEM_H */ diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h -index 8608821..4186cb7 100644 +index 89fac6a..f4a9e9d 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -58,23 +58,6 @@ @@ -610,7 +610,7 @@ index 8608821..4186cb7 100644 * Pull the arch_spinlock_t and arch_rwlock_t definitions: */ #include <linux/spinlock_types.h> -@@ -261,6 +244,98 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) +@@ -264,6 +247,98 @@ static inline void do_raw_spin_unlock(raw_spinlock_t *lock) __releases(lock) # include <linux/spinlock_api_up.h> #endif @@ -709,7 +709,7 @@ index 8608821..4186cb7 100644 /* * Map the spin_lock functions to the raw variants for PREEMPT_RT=n */ -@@ -393,4 +468,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); +@@ -396,4 +471,6 @@ extern int _atomic_dec_and_lock(atomic_t *atomic, spinlock_t *lock); #define atomic_dec_and_lock(atomic, lock) \ __cond_lock(lock, _atomic_dec_and_lock(atomic, lock)) @@ -761,7 +761,7 @@ index aadd590..b875516 100644 + #endif /* __LINUX_SPINLOCK_TYPES_H */ diff --git a/kernel/Makefile b/kernel/Makefile -index 7b97469..433df4a 100644 +index a987aa1..74491fc 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -7,7 +7,7 @@ obj-y = sched.o fork.o exec_domain.o panic.o printk.o \ @@ -793,7 +793,7 @@ index 7b97469..433df4a 100644 obj-$(CONFIG_USE_GENERIC_SMP_HELPERS) += smp.o ifneq ($(CONFIG_SMP),y) diff --git a/kernel/fork.c b/kernel/fork.c -index fe64cb8..51f15d6 100644 +index d356851..c67d376 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -85,7 +85,11 @@ int max_threads; /* tunable limit on nr_threads */ @@ -805,9 +805,9 @@ index fe64cb8..51f15d6 100644 +#else __cacheline_aligned DEFINE_RWLOCK(tasklist_lock); /* outer */ +#endif - EXPORT_SYMBOL_GPL(tasklist_lock); - int nr_processes(void) + #ifdef CONFIG_PROVE_RCU + int lockdep_tasklist_lock_is_held(void) diff --git a/kernel/rt.c b/kernel/rt.c new file mode 100644 index 0000000..97709a6 @@ -1431,5 +1431,5 @@ index 4755b98..f65f7cd 100644 + +#endif -- -1.7.1.1 +1.7.0.4 |