diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-02-02 03:45:39 -0500 |
| commit | eaa4e4fcf1b5c60e656d93242f7fe422173f25b2 (patch) | |
| tree | c05d5d6ca3f625d72a9d136b4c485d3dc9472089 /include/linux/vmstat.h | |
| parent | be1e4e760d940c14d119bffef5eb007dfdf29046 (diff) | |
| parent | 5cb480f6b488128140c940abff3c36f524a334a8 (diff) | |
Merge branch 'linus' into sched/core, to resolve conflicts
Conflicts:
kernel/sysctl.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
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 e4b948080d20..a67b38415768 100644 --- a/include/linux/vmstat.h +++ b/include/linux/vmstat.h | |||
| @@ -142,8 +142,6 @@ static inline unsigned long zone_page_state_snapshot(struct zone *zone, | |||
| 142 | return x; | 142 | return x; |
| 143 | } | 143 | } |
| 144 | 144 | ||
| 145 | extern unsigned long global_reclaimable_pages(void); | ||
| 146 | |||
| 147 | #ifdef CONFIG_NUMA | 145 | #ifdef CONFIG_NUMA |
| 148 | /* | 146 | /* |
| 149 | * Determine the per node value of a stat item. This function | 147 | * Determine the per node value of a stat item. This function |