git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PCI: irq and pci_ids patch for Intel Tigerpoint DeviceIDs
[safe/jmp/linux-2.6]
/
mm
/
vmalloc.c
diff --git
a/mm/vmalloc.c
b/mm/vmalloc.c
index
7e00b28
..
75f49d3
100644
(file)
--- a/
mm/vmalloc.c
+++ b/
mm/vmalloc.c
@@
-14,7
+14,6
@@
#include <linux/highmem.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
#include <linux/highmem.h>
#include <linux/slab.h>
#include <linux/spinlock.h>
-#include <linux/mutex.h>
#include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
@@
-496,7
+495,7
@@
static atomic_t vmap_lazy_nr = ATOMIC_INIT(0);
static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end,
int sync, int force_flush)
{
static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end,
int sync, int force_flush)
{
- static DEFINE_
MUTEX
(purge_lock);
+ static DEFINE_
SPINLOCK
(purge_lock);
LIST_HEAD(valist);
struct vmap_area *va;
int nr = 0;
LIST_HEAD(valist);
struct vmap_area *va;
int nr = 0;
@@
-507,10
+506,10
@@
static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end,
* the case that isn't actually used at the moment anyway.
*/
if (!sync && !force_flush) {
* the case that isn't actually used at the moment anyway.
*/
if (!sync && !force_flush) {
- if (!
mutex
_trylock(&purge_lock))
+ if (!
spin
_trylock(&purge_lock))
return;
} else
return;
} else
-
mutex
_lock(&purge_lock);
+
spin
_lock(&purge_lock);
rcu_read_lock();
list_for_each_entry_rcu(va, &vmap_area_list, list) {
rcu_read_lock();
list_for_each_entry_rcu(va, &vmap_area_list, list) {
@@
-542,7
+541,7
@@
static void __purge_vmap_area_lazy(unsigned long *start, unsigned long *end,
__free_vmap_area(va);
spin_unlock(&vmap_area_lock);
}
__free_vmap_area(va);
spin_unlock(&vmap_area_lock);
}
-
mutex
_unlock(&purge_lock);
+
spin
_unlock(&purge_lock);
}
/*
}
/*