diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
|---|---|---|
| committer | H. Peter Anvin <hpa@linux.intel.com> | 2014-02-07 14:27:30 -0500 |
| commit | a3b072cd180c12e8fe0ece9487b9065808327640 (patch) | |
| tree | 62b982041be84748852d77cdf6ca5639ef40858f /include/linux/vmstat.h | |
| parent | 75a1ba5b2c529db60ca49626bcaf0bddf4548438 (diff) | |
| parent | 081cd62a010f97b5bc1d2b0cd123c5abc692b68a (diff) | |
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>
Diffstat (limited to 'include/linux/vmstat.h')
| -rw-r--r-- | include/linux/vmstat.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/include/linux/vmstat.h b/include/linux/vmstat.h index 80ebba9c2e87..67ce70c8279b 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h | |||
| @@ -150,8 +150,6 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone, | |||
| 150 | return x; | 150 | return x; |
| 151 | } | 151 | } |
| 152 | 152 | ||
| 153 | extern unsigned long global_reclaimable_pages(void); | ||
| 154 | |||
| 155 | #ifdef CONFIG_NUMA | 153 | #ifdef CONFIG_NUMA |
| 156 | /* | 154 | /* |
| 157 | * Determine the per node value of a stat item. This function | 155 | * Determine the per node value of a stat item. This function |