diff options
| author | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
|---|---|---|
| committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2007-05-31 00:57:05 -0400 |
| commit | 5bc65793cbf8da0d35f19ef025dda22887e79e80 (patch) | |
| tree | 8291998abd73055de6f487fafa174ee2a5d3afee /mm/sparse.c | |
| parent | 6edae708bf77e012d855a7e2c7766f211d234f4f (diff) | |
| parent | 3f0a6766e0cc5a577805732e5adb50a585c58175 (diff) | |
[SCSI] Merge up to linux-2.6 head
Conflicts:
drivers/scsi/jazz_esp.c
Same changes made by both SCSI and SPARC trees: problem with UTF-8
conversion in the copyright.
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'mm/sparse.c')
| -rw-r--r-- | mm/sparse.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse.c b/mm/sparse.c index 6f3fff907bc2..1302f8348d51 100644 --- a/mm/sparse.c +++ b/mm/sparse.c | |||
| @@ -44,7 +44,7 @@ EXPORT_SYMBOL(page_to_nid); | |||
| 44 | #endif | 44 | #endif |
| 45 | 45 | ||
| 46 | #ifdef CONFIG_SPARSEMEM_EXTREME | 46 | #ifdef CONFIG_SPARSEMEM_EXTREME |
| 47 | static struct mem_section noinline *sparse_index_alloc(int nid) | 47 | static struct mem_section noinline __init_refok *sparse_index_alloc(int nid) |
| 48 | { | 48 | { |
| 49 | struct mem_section *section = NULL; | 49 | struct mem_section *section = NULL; |
| 50 | unsigned long array_size = SECTIONS_PER_ROOT * | 50 | unsigned long array_size = SECTIONS_PER_ROOT * |