Merge tag 'efi-urgent' into x86/urgent

* Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
This commit is contained in:
H. Peter Anvin
2014-02-07 11:27:30 -08:00
9081 changed files with 515598 additions and 199847 deletions

View File

@@ -150,8 +150,6 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone,
return x;
}
extern unsigned long global_reclaimable_pages(void);
#ifdef CONFIG_NUMA
/*
* Determine the per node value of a stat item. This function