proc: move /proc/stram to m68k-specific code
Subsystems (2)
PATCH 6/31 proc: move /proc/stram to m68k-specific code
Quoted 2 lines
From
0b0306563d7b79ad215c62499ed538d15372f574Mon Sep 17 00:00:00 2001
From: Alexey Dobriyan <[email protected]>
Date: Sat, 4 Oct 2008 13:49:34 +0400
Subject: [PATCH 06/31] proc: move /proc/stram to m68k-specific code
Signed-off-by Alexey Dobriyan <[email protected]>
--- arch/m68k/atari/stram.c | 28 ++++++++++++++++++++++------ fs/proc/proc_misc.c | 13 ------------- 2 files changed, 22 insertions(+), 19 deletions(-)
arch/m68k/atari/stram.c +22 -6
@@ -42,6 +42,7 @@/* abbrev for the && above... */ #define DO_PROC #include <linux/proc_fs.h> +#include <linux/seq_file.h> #endif /*
@@ -323,19 +324,16 @@ static int remove_region( BLOCK *block )#ifdef DO_PROC -#define PRINT_PROC(fmt,args...) len += sprintf( buf+len, fmt, ##args ) +#define PRINT_PROC(fmt,args...) seq_printf( m, fmt, ##args ) -int get_stram_list (char *buf ) +static int stram_proc_show (struct seq_file *m,void *v) { -int len =0 ;BLOCK *p;PRINT_PROC ("Total ST-RAM: %8u kB\n" , (stram_end - stram_start) >>10 );PRINT_PROC ("Allocated regions:\n" );for ( p = alloc_list; p; p = p->next ) { -if (len +50 >=PAGE_SIZE ) -break ; PRINT_PROC("0x%08lx-0x%08lx: %s (", virt_to_phys(p->start), virt_to_phys(p->start+p->size-1),
@@ -346,9 +344,27 @@ int get_stram_list( char *buf ) PRINT_PROC( "??)\n" ); } -return ( len ); +return 0 ; +} + +static int stram_proc_open (struct inode *inode,struct file *file) +{ +return single_open (file, stram_proc_show,NULL ); } +static const struct file_operations stram_proc_fops = { + .open = stram_proc_open, + .read = seq_read, + .llseek = seq_lseek, + .release = single_release, +}; + +static int __init proc_stram_init (void ) +{ +proc_create ("stram" ,0 ,NULL , &stram_proc_fops); +return 0 ; +} +module_init (proc_stram_init);#endif
fs/proc/proc_misc.c +0 -13
@@ -62,7 +62,6 @@* have a way to deal with that gracefully. Right now I used straightforward * wrappers, but this needs further analysis wrt potential overflows. */ -extern int get_stram_list (char *);extern int get_exec_domain_list (char *); static int proc_calc_metrics(char *page, char **start, off_t off,
@@ -196,15 +195,6 @@ static const struct file_operations proc_vmstat_file_operations = { .release = seq_release, }; -#ifdef CONFIG_STRAM_PROC -static int stram_read_proc (char *page,char **start,off_t off, -int count,int *eof,void *data) -{ -int len =get_stram_list (page); -return proc_calc_metrics (page, start, off, count, eof, len); -} -#endif -#ifdef CONFIG_BLOCK static int partitions_open (struct inode *inode,struct file *file) {
@@ -660,9 +650,6 @@ void __init proc_misc_init(void)char *name;int (*read_proc)(char *,char **,off_t ,int ,int *,void *); } *p, simple_ones[] = { -#ifdef CONFIG_STRAM_PROC - {"stram", stram_read_proc}, -#endif {"filesystems", filesystems_read_proc}, {"cmdline", cmdline_read_proc}, {"execdomains", execdomains_read_proc},
Signature · 1 line
1.5.6.5