projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/agpgart
[powerpc.git]
/
mm
/
sparse.c
diff --git
a/mm/sparse.c
b/mm/sparse.c
index
e0a3fe4
..
86c52ab
100644
(file)
--- a/
mm/sparse.c
+++ b/
mm/sparse.c
@@
-1,7
+1,6
@@
/*
* sparse memory mappings.
*/
/*
* sparse memory mappings.
*/
-#include <linux/config.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
#include <linux/bootmem.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
#include <linux/bootmem.h>
@@
-45,7
+44,7
@@
static struct mem_section *sparse_index_alloc(int nid)
static int sparse_index_init(unsigned long section_nr, int nid)
{
static int sparse_index_init(unsigned long section_nr, int nid)
{
- static
spinlock_t index_init_lock = SPIN_LOCK_UNLOCKED
;
+ static
DEFINE_SPINLOCK(index_init_lock)
;
unsigned long root = SECTION_NR_TO_ROOT(section_nr);
struct mem_section *section;
int ret = 0;
unsigned long root = SECTION_NR_TO_ROOT(section_nr);
struct mem_section *section;
int ret = 0;