diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 14:24:44 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-02-02 14:24:44 -0500 |
| commit | bd1d462e13b278fc57752d0b9b15040e60e561a0 (patch) | |
| tree | e2fdf1c18a93aab02830bcb8a5db8cdddfbb63a8 /include/linux/swap.h | |
| parent | d5c38b137ac8a6e3dbed13bc494d60df5b69dfc4 (diff) | |
| parent | 62aa2b537c6f5957afd98e29f96897419ed5ebab (diff) | |
Merge 3.3-rc2 into the driver-core-next branch.
This was done to resolve a merge and build problem with the
drivers/acpi/processor_driver.c file.
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'include/linux/swap.h')
| -rw-r--r-- | include/linux/swap.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h index 06061a7f8e69..3e60228e7299 100644 --- a/include/linux/swap.h +++ b/include/linux/swap.h | |||
| @@ -273,7 +273,7 @@ static inline int zone_reclaim(struct zone *z, gfp_t mask, unsigned int order) | |||
| 273 | #endif | 273 | #endif |
| 274 | 274 | ||
| 275 | extern int page_evictable(struct page *page, struct vm_area_struct *vma); | 275 | extern int page_evictable(struct page *page, struct vm_area_struct *vma); |
| 276 | extern void scan_mapping_unevictable_pages(struct address_space *); | 276 | extern void check_move_unevictable_pages(struct page **, int nr_pages); |
| 277 | 277 | ||
| 278 | extern unsigned long scan_unevictable_pages; | 278 | extern unsigned long scan_unevictable_pages; |
| 279 | extern int scan_unevictable_handler(struct ctl_table *, int, | 279 | extern int scan_unevictable_handler(struct ctl_table *, int, |