diff options
| author | James Morris <jmorris@namei.org> | 2008-11-14 01:29:12 +0100 |
|---|---|---|
| committer | James Morris <jmorris@namei.org> | 2008-11-14 01:29:12 +0100 |
| commit | 2b828925652340277a889cbc11b2d0637f7cdaf7 (patch) | |
| tree | 32fcb3d3e466fc419fad2d3717956a5b5ad3d35a /mm/sparse-vmemmap.c | |
| parent | CRED: Allow kernel services to override LSM settings for task actions (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jba... (diff) | |
| download | linux-2b828925652340277a889cbc11b2d0637f7cdaf7.tar.xz linux-2b828925652340277a889cbc11b2d0637f7cdaf7.zip | |
Merge branch 'master' into next
Conflicts:
security/keys/internal.h
security/keys/process_keys.c
security/keys/request_key.c
Fixed conflicts above by using the non 'tsk' versions.
Signed-off-by: James Morris <jmorris@namei.org>
Diffstat (limited to 'mm/sparse-vmemmap.c')
| -rw-r--r-- | mm/sparse-vmemmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/sparse-vmemmap.c b/mm/sparse-vmemmap.c index a91b5f8fcaf6..a13ea6401ae7 100644 --- a/mm/sparse-vmemmap.c +++ b/mm/sparse-vmemmap.c @@ -64,7 +64,7 @@ void __meminit vmemmap_verify(pte_t *pte, int node, unsigned long pfn = pte_pfn(*pte); int actual_node = early_pfn_to_nid(pfn); - if (actual_node != node) + if (node_distance(actual_node, node) > LOCAL_DISTANCE) printk(KERN_WARNING "[%lx-%lx] potential offnode " "page_structs\n", start, end - 1); } |