diff options
| author | Ingo Molnar | 2009-03-18 10:37:43 +0100 |
|---|---|---|
| committer | Ingo Molnar | 2009-03-18 10:37:43 +0100 |
| commit | 04dfcfcb54b073133bcca2c8f25b55e904558931 (patch) | |
| tree | 123d13f9e242751f629924e92fcb297dc669d767 /drivers/base | |
| parent | Merge branch 'iommu/fixes-2.6.29' of git://git.kernel.org/pub/scm/linux/kerne... (diff) | |
| parent | Avoid 64-bit "switch()" statements on 32-bit architectures (diff) | |
| download | kernel-qcow2-linux-04dfcfcb54b073133bcca2c8f25b55e904558931.tar.gz kernel-qcow2-linux-04dfcfcb54b073133bcca2c8f25b55e904558931.tar.xz kernel-qcow2-linux-04dfcfcb54b073133bcca2c8f25b55e904558931.zip | |
Merge branch 'linus' into core/iommu
Diffstat (limited to 'drivers/base')
| -rw-r--r-- | drivers/base/node.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/base/node.c b/drivers/base/node.c index 43fa90b837ee..f8f578a71b25 100644 --- a/drivers/base/node.c +++ b/drivers/base/node.c @@ -303,7 +303,7 @@ int unregister_mem_sect_under_nodes(struct memory_block *mem_blk) sect_start_pfn = section_nr_to_pfn(mem_blk->phys_index); sect_end_pfn = sect_start_pfn + PAGES_PER_SECTION - 1; for (pfn = sect_start_pfn; pfn <= sect_end_pfn; pfn++) { - unsigned int nid; + int nid; nid = get_nid_for_pfn(pfn); if (nid < 0) |