summaryrefslogtreecommitdiff
path: root/include/linux
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-20 21:35:01 -0700
committerLinus Torvalds <torvalds@penguin.transmeta.com>2002-05-20 21:35:01 -0700
commitda320c6398d48272a3e57e6727bea19963e5b0f1 (patch)
tree61d4619dd48ee6692b16b7ba28d8329f309f3921 /include/linux
parentb3434820ee5851a5cb57248fc57223cc56ab9a29 (diff)
parent978364b96a712fa71888c5ab6f57f530d42fb418 (diff)
Merge http://linux-isdn.bkbits.net/linux-2.5.make
into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/swap.h4
1 files changed, 0 insertions, 4 deletions
diff --git a/include/linux/swap.h b/include/linux/swap.h
index 3a376842c21c..3d87e4334851 100644
--- a/include/linux/swap.h
+++ b/include/linux/swap.h
@@ -102,12 +102,8 @@ extern unsigned long totalhigh_pages;
extern unsigned int nr_free_pages(void);
extern unsigned int nr_free_buffer_pages(void);
extern unsigned int nr_free_pagecache_pages(void);
-extern unsigned long nr_buffermem_pages(void);
extern int nr_active_pages;
extern int nr_inactive_pages;
-extern atomic_t nr_async_pages;
-extern atomic_t buffermem_pages;
-extern spinlock_t pagecache_lock;
extern void __remove_inode_page(struct page *);
/* Incomplete types for prototype declarations: */