From b2eabeda82428ca2684889b24893d7b1c719867d Mon Sep 17 00:00:00 2001 From: Gary Hade Date: Tue, 28 Oct 2008 16:43:14 -0700 Subject: [PATCH] --- yaml --- r: 118202 b: refs/heads/master c: fe8b868eccb9f85a0e231e35f0abac5b39bac801 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/mm/init_64.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index baa9aee263e1..172f181c5022 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d6cf1feb854c53c6d59e0d879603692b379e208 +refs/heads/master: fe8b868eccb9f85a0e231e35f0abac5b39bac801 diff --git a/trunk/arch/x86/mm/init_64.c b/trunk/arch/x86/mm/init_64.c index ebe1811e5b1e..9db01db6e3cd 100644 --- a/trunk/arch/x86/mm/init_64.c +++ b/trunk/arch/x86/mm/init_64.c @@ -858,7 +858,7 @@ int arch_add_memory(int nid, u64 start, u64 size) max_pfn_mapped = last_mapped_pfn; ret = __add_pages(zone, start_pfn, nr_pages); - WARN_ON(1); + WARN_ON_ONCE(ret); return ret; }