diff options
author | Roland McGrath <roland@gnu.org> | 2000-02-05 12:21:17 +0000 |
---|---|---|
committer | Roland McGrath <roland@gnu.org> | 2000-02-05 12:21:17 +0000 |
commit | 11282e4f068cacd7d08e61c5372b560f4656df87 (patch) | |
tree | 7330691c769e4cddf13fb86e58b80b61cd71ce2a /pfinet/linux-src/include/linux/swap.h | |
parent | a60df9686250648ac13f559e98ebdc1422146494 (diff) | |
parent | e5f75e8ece5d1a8d3c17bd0156082caf153d3779 (diff) | |
download | hurd-11282e4f068cacd7d08e61c5372b560f4656df87.tar.gz hurd-11282e4f068cacd7d08e61c5372b560f4656df87.tar.bz2 hurd-11282e4f068cacd7d08e61c5372b560f4656df87.zip |
Merge from vendor branch Linux:
Import of Linux 2.2.14 subset (ipv4 stack and related)
Diffstat (limited to 'pfinet/linux-src/include/linux/swap.h')
-rw-r--r-- | pfinet/linux-src/include/linux/swap.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pfinet/linux-src/include/linux/swap.h b/pfinet/linux-src/include/linux/swap.h index 66ba5d62..0e3d2763 100644 --- a/pfinet/linux-src/include/linux/swap.h +++ b/pfinet/linux-src/include/linux/swap.h @@ -68,7 +68,7 @@ extern int nr_free_pages; extern atomic_t nr_async_pages; extern struct inode swapper_inode; extern unsigned long page_cache_size; -extern int buffermem; +extern long buffermem; /* Incomplete types for prototype declarations: */ struct task_struct; @@ -91,8 +91,8 @@ extern void rw_swap_page_nolock(int, unsigned long, char *, int); extern void swap_after_unlock_page (unsigned long entry); /* linux/mm/page_alloc.c */ -extern void swap_in(struct task_struct *, struct vm_area_struct *, - pte_t *, unsigned long, int); +extern int swap_in(struct task_struct *, struct vm_area_struct *, + pte_t *, unsigned long, int); /* linux/mm/swap_state.c */ |