Commit da320c63 authored by Linus Torvalds's avatar Linus Torvalds

Merge http://linux-isdn.bkbits.net/linux-2.5.make

into penguin.transmeta.com:/home/penguin/torvalds/repositories/kernel/linux
parents b3434820 978364b9
......@@ -137,7 +137,6 @@ show_mem(void)
printk("%ld reserved pages\n",reserved);
printk("%ld pages shared\n",shared);
printk("%ld pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
#endif
......
......@@ -425,5 +425,4 @@ show_mem(void)
printk("%ld pages shared\n",shared);
printk("%ld pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
......@@ -100,7 +100,6 @@ void show_mem(void)
printk("%d slab pages\n", slab);
printk("%d pages shared\n", shared);
printk("%d pages swap cached\n", cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
struct node_info {
......
......@@ -181,7 +181,6 @@ show_mem(void)
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/*
......
......@@ -93,7 +93,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -187,7 +187,6 @@ show_mem(void)
pgdat = pgdat->node_next;
} while (pgdat);
printk("Total of %ld pages in page table cache\n", pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
printk("%d free buffer pages\n", nr_free_buffer_pages());
}
#else /* !CONFIG_DISCONTIGMEM */
......
......@@ -107,7 +107,6 @@ void show_mem(void)
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
extern void init_pointer_table(unsigned long ptable);
......
......@@ -135,7 +135,6 @@ void show_mem(void)
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%d free pages\n", free);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -339,7 +339,6 @@ void show_mem(void)
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n", pgtable_cache_size);
printk("%d free pages\n", free);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
#ifndef CONFIG_DISCONTIGMEM
......
......@@ -154,7 +154,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
void set_pte_phys (unsigned long vaddr, unsigned long phys)
......
......@@ -140,7 +140,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* Free up now-unused memory */
......
......@@ -134,7 +134,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
void *
......
......@@ -87,7 +87,6 @@ void show_mem(void)
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -87,7 +87,6 @@ void show_mem(void)
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld pages in page table cache\n",pgtable_cache_size);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -70,7 +70,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -82,7 +82,6 @@ void show_mem(void)
if (sparc_cpu_model == sun4m || sparc_cpu_model == sun4d)
printk("%ld entries in page dir cache\n",pgd_cache_size);
#endif
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
extern pgprot_t protection_map[16];
......
......@@ -341,7 +341,6 @@ void show_mem(void)
#ifndef CONFIG_SMP
printk("%d entries in page dir cache\n",pgd_cache_size);
#endif
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
void mmu_info(struct seq_file *m)
......
......@@ -67,7 +67,6 @@ void show_mem(void)
printk("%d reserved pages\n",reserved);
printk("%d pages shared\n",shared);
printk("%d pages swap cached\n",cached);
printk("%ld buffermem pages\n", nr_buffermem_pages());
}
/* References to section boundaries */
......
......@@ -422,10 +422,6 @@ static _INLINE_ void receive_chars(struct sgi_serial *info, struct pt_regs *regs
} else if (ch == 1) {
show_state();
return;
} else if (ch == 2) {
printk("%ld buffermem pages\n",
nr_buffermem_pages());
return;
}
}
/* Look for kgdb 'stop' character, consult the gdb documentation
......
......@@ -36,9 +36,6 @@
#define BH_ENTRY(list) list_entry((list), struct buffer_head, b_assoc_buffers)
/* This is used by some architectures to estimate available memory. */
atomic_t buffermem_pages = ATOMIC_INIT(0);
/*
* Hashed waitqueue_head's for wait_on_buffer()
*/
......@@ -151,10 +148,6 @@ void __wait_on_buffer(struct buffer_head * bh)
static inline void
__set_page_buffers(struct page *page, struct buffer_head *head)
{
struct inode *inode = page->mapping->host;
if (inode && S_ISBLK(inode->i_mode))
atomic_inc(&buffermem_pages);
if (page_has_buffers(page))
buffer_error();
set_page_buffers(page, head);
......@@ -164,14 +157,6 @@ __set_page_buffers(struct page *page, struct buffer_head *head)
static inline void
__clear_page_buffers(struct page *page)
{
struct address_space *mapping = page->mapping;
if (mapping) {
struct inode *inode = mapping->host;
if (S_ISBLK(inode->i_mode))
atomic_dec(&buffermem_pages);
}
clear_page_buffers(page);
page_cache_release(page);
}
......
......@@ -130,7 +130,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
{
struct sysinfo i;
int len;
int pg_size ;
struct page_state ps;
get_page_state(&ps);
......@@ -140,7 +139,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
#define K(x) ((x) << (PAGE_SHIFT - 10))
si_meminfo(&i);
si_swapinfo(&i);
pg_size = get_page_cache_size() - i.bufferram ;
/*
* Tagged format, for easy grepping and expansion.
......@@ -149,7 +147,6 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
"MemTotal: %8lu kB\n"
"MemFree: %8lu kB\n"
"MemShared: %8lu kB\n"
"Buffers: %8lu kB\n"
"Cached: %8lu kB\n"
"SwapCached: %8lu kB\n"
"Active: %8u kB\n"
......@@ -165,8 +162,7 @@ static int meminfo_read_proc(char *page, char **start, off_t off,
K(i.totalram),
K(i.freeram),
K(i.sharedram),
K(i.bufferram),
K(pg_size - swapper_space.nrpages),
K(ps.nr_pagecache-swapper_space.nrpages),
K(swapper_space.nrpages),
K(nr_active_pages),
K(nr_inactive_pages),
......
......@@ -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: */
......
......@@ -569,11 +569,6 @@ unsigned int nr_free_highpages (void)
}
#endif
unsigned long nr_buffermem_pages(void)
{
return atomic_read(&buffermem_pages);
}
/*
* Accumulate the page_state information across all CPUs.
* The result is unavoidably approximate - it can change
......@@ -613,7 +608,7 @@ void si_meminfo(struct sysinfo *val)
val->totalram = totalram_pages;
val->sharedram = 0;
val->freeram = nr_free_pages();
val->bufferram = atomic_read(&buffermem_pages);
val->bufferram = get_page_cache_size();
#ifdef CONFIG_HIGHMEM
val->totalhigh = totalhigh_pages;
val->freehigh = nr_free_highpages();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment