Commit 88ed86fe authored by Linus Torvalds's avatar Linus Torvalds

Merge branch 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc

* 'proc' of git://git.kernel.org/pub/scm/linux/kernel/git/adobriyan/proc: (35 commits)
  proc: remove fs/proc/proc_misc.c
  proc: move /proc/vmcore creation to fs/proc/vmcore.c
  proc: move pagecount stuff to fs/proc/page.c
  proc: move all /proc/kcore stuff to fs/proc/kcore.c
  proc: move /proc/schedstat boilerplate to kernel/sched_stats.h
  proc: move /proc/modules boilerplate to kernel/module.c
  proc: move /proc/diskstats boilerplate to block/genhd.c
  proc: move /proc/zoneinfo boilerplate to mm/vmstat.c
  proc: move /proc/vmstat boilerplate to mm/vmstat.c
  proc: move /proc/pagetypeinfo boilerplate to mm/vmstat.c
  proc: move /proc/buddyinfo boilerplate to mm/vmstat.c
  proc: move /proc/vmallocinfo to mm/vmalloc.c
  proc: move /proc/slabinfo boilerplate to mm/slub.c, mm/slab.c
  proc: move /proc/slab_allocators boilerplate to mm/slab.c
  proc: move /proc/interrupts boilerplate code to fs/proc/interrupts.c
  proc: move /proc/stat to fs/proc/stat.c
  proc: move rest of /proc/partitions code to block/genhd.c
  proc: move /proc/cpuinfo code to fs/proc/cpuinfo.c
  proc: move /proc/devices code to fs/proc/devices.c
  proc: move rest of /proc/locks to fs/locks.c
  ...
parents 3856d30d 59c7572e
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/rtc.h> #include <linux/rtc.h>
...@@ -93,7 +94,7 @@ static char amiga_model_name[13] = "Amiga "; ...@@ -93,7 +94,7 @@ static char amiga_model_name[13] = "Amiga ";
static void amiga_sched_init(irq_handler_t handler); static void amiga_sched_init(irq_handler_t handler);
static void amiga_get_model(char *model); static void amiga_get_model(char *model);
static int amiga_get_hardware_list(char *buffer); static void amiga_get_hardware_list(struct seq_file *m);
/* amiga specific timer functions */ /* amiga specific timer functions */
static unsigned long amiga_gettimeoffset(void); static unsigned long amiga_gettimeoffset(void);
static int a3000_hwclk(int, struct rtc_time *); static int a3000_hwclk(int, struct rtc_time *);
...@@ -911,13 +912,11 @@ static void amiga_get_model(char *model) ...@@ -911,13 +912,11 @@ static void amiga_get_model(char *model)
} }
static int amiga_get_hardware_list(char *buffer) static void amiga_get_hardware_list(struct seq_file *m)
{ {
int len = 0;
if (AMIGAHW_PRESENT(CHIP_RAM)) if (AMIGAHW_PRESENT(CHIP_RAM))
len += sprintf(buffer+len, "Chip RAM:\t%ldK\n", amiga_chip_size>>10); seq_printf(m, "Chip RAM:\t%ldK\n", amiga_chip_size>>10);
len += sprintf(buffer+len, "PS Freq:\t%dHz\nEClock Freq:\t%ldHz\n", seq_printf(m, "PS Freq:\t%dHz\nEClock Freq:\t%ldHz\n",
amiga_psfreq, amiga_eclock); amiga_psfreq, amiga_eclock);
if (AMIGAHW_PRESENT(AMI_VIDEO)) { if (AMIGAHW_PRESENT(AMI_VIDEO)) {
char *type; char *type;
...@@ -935,14 +934,14 @@ static int amiga_get_hardware_list(char *buffer) ...@@ -935,14 +934,14 @@ static int amiga_get_hardware_list(char *buffer)
type = "Old or Unknown"; type = "Old or Unknown";
break; break;
} }
len += sprintf(buffer+len, "Graphics:\t%s\n", type); seq_printf(m, "Graphics:\t%s\n", type);
} }
#define AMIGAHW_ANNOUNCE(name, str) \ #define AMIGAHW_ANNOUNCE(name, str) \
if (AMIGAHW_PRESENT(name)) \ if (AMIGAHW_PRESENT(name)) \
len += sprintf (buffer+len, "\t%s\n", str) seq_printf (m, "\t%s\n", str)
len += sprintf (buffer + len, "Detected hardware:\n"); seq_printf (m, "Detected hardware:\n");
AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video"); AMIGAHW_ANNOUNCE(AMI_VIDEO, "Amiga Video");
AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter"); AMIGAHW_ANNOUNCE(AMI_BLITTER, "Blitter");
...@@ -975,15 +974,13 @@ static int amiga_get_hardware_list(char *buffer) ...@@ -975,15 +974,13 @@ static int amiga_get_hardware_list(char *buffer)
AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot"); AMIGAHW_ANNOUNCE(PCMCIA, "PCMCIA Slot");
#ifdef CONFIG_ZORRO #ifdef CONFIG_ZORRO
if (AMIGAHW_PRESENT(ZORRO)) if (AMIGAHW_PRESENT(ZORRO))
len += sprintf(buffer+len, "\tZorro II%s AutoConfig: %d Expansion " seq_printf(m, "\tZorro II%s AutoConfig: %d Expansion "
"Device%s\n", "Device%s\n",
AMIGAHW_PRESENT(ZORRO3) ? "I" : "", AMIGAHW_PRESENT(ZORRO3) ? "I" : "",
zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s"); zorro_num_autocon, zorro_num_autocon == 1 ? "" : "s");
#endif /* CONFIG_ZORRO */ #endif /* CONFIG_ZORRO */
#undef AMIGAHW_ANNOUNCE #undef AMIGAHW_ANNOUNCE
return len;
} }
/* /*
......
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/delay.h> #include <linux/delay.h>
...@@ -63,7 +64,7 @@ int atari_rtc_year_offset; ...@@ -63,7 +64,7 @@ int atari_rtc_year_offset;
/* local function prototypes */ /* local function prototypes */
static void atari_reset(void); static void atari_reset(void);
static void atari_get_model(char *model); static void atari_get_model(char *model);
static int atari_get_hardware_list(char *buffer); static void atari_get_hardware_list(struct seq_file *m);
/* atari specific irq functions */ /* atari specific irq functions */
extern void atari_init_IRQ (void); extern void atari_init_IRQ (void);
...@@ -611,21 +612,21 @@ static void atari_get_model(char *model) ...@@ -611,21 +612,21 @@ static void atari_get_model(char *model)
} }
static int atari_get_hardware_list(char *buffer) static void atari_get_hardware_list(struct seq_file *m)
{ {
int len = 0, i; int i;
for (i = 0; i < m68k_num_memory; i++) for (i = 0; i < m68k_num_memory; i++)
len += sprintf(buffer+len, "\t%3ld MB at 0x%08lx (%s)\n", seq_printf(m, "\t%3ld MB at 0x%08lx (%s)\n",
m68k_memory[i].size >> 20, m68k_memory[i].addr, m68k_memory[i].size >> 20, m68k_memory[i].addr,
(m68k_memory[i].addr & 0xff000000 ? (m68k_memory[i].addr & 0xff000000 ?
"alternate RAM" : "ST-RAM")); "alternate RAM" : "ST-RAM"));
#define ATARIHW_ANNOUNCE(name, str) \ #define ATARIHW_ANNOUNCE(name, str) \
if (ATARIHW_PRESENT(name)) \ if (ATARIHW_PRESENT(name)) \
len += sprintf(buffer + len, "\t%s\n", str) seq_printf(m, "\t%s\n", str)
len += sprintf(buffer + len, "Detected hardware:\n"); seq_printf(m, "Detected hardware:\n");
ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter"); ATARIHW_ANNOUNCE(STND_SHIFTER, "ST Shifter");
ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter"); ATARIHW_ANNOUNCE(EXTD_SHIFTER, "STe Shifter");
ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter"); ATARIHW_ANNOUNCE(TT_SHIFTER, "TT Shifter");
...@@ -654,6 +655,4 @@ static int atari_get_hardware_list(char *buffer) ...@@ -654,6 +655,4 @@ static int atari_get_hardware_list(char *buffer)
ATARIHW_ANNOUNCE(BLITTER, "Blitter"); ATARIHW_ANNOUNCE(BLITTER, "Blitter");
ATARIHW_ANNOUNCE(VME, "VME Bus"); ATARIHW_ANNOUNCE(VME, "VME Bus");
ATARIHW_ANNOUNCE(DSP56K, "DSP56001 processor"); ATARIHW_ANNOUNCE(DSP56K, "DSP56001 processor");
return len;
} }
...@@ -42,6 +42,7 @@ ...@@ -42,6 +42,7 @@
/* abbrev for the && above... */ /* abbrev for the && above... */
#define DO_PROC #define DO_PROC
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/seq_file.h>
#endif #endif
/* /*
...@@ -323,19 +324,16 @@ static int remove_region( BLOCK *block ) ...@@ -323,19 +324,16 @@ static int remove_region( BLOCK *block )
#ifdef DO_PROC #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; BLOCK *p;
PRINT_PROC("Total ST-RAM: %8u kB\n", PRINT_PROC("Total ST-RAM: %8u kB\n",
(stram_end - stram_start) >> 10); (stram_end - stram_start) >> 10);
PRINT_PROC( "Allocated regions:\n" ); PRINT_PROC( "Allocated regions:\n" );
for( p = alloc_list; p; p = p->next ) { for( p = alloc_list; p; p = p->next ) {
if (len + 50 >= PAGE_SIZE)
break;
PRINT_PROC("0x%08lx-0x%08lx: %s (", PRINT_PROC("0x%08lx-0x%08lx: %s (",
virt_to_phys(p->start), virt_to_phys(p->start),
virt_to_phys(p->start+p->size-1), virt_to_phys(p->start+p->size-1),
...@@ -346,9 +344,27 @@ int get_stram_list( char *buf ) ...@@ -346,9 +344,27 @@ int get_stram_list( char *buf )
PRINT_PROC( "??)\n" ); 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 #endif
......
...@@ -38,7 +38,6 @@ ...@@ -38,7 +38,6 @@
#include <asm/bvme6000hw.h> #include <asm/bvme6000hw.h>
static void bvme6000_get_model(char *model); static void bvme6000_get_model(char *model);
static int bvme6000_get_hardware_list(char *buffer);
extern void bvme6000_sched_init(irq_handler_t handler); extern void bvme6000_sched_init(irq_handler_t handler);
extern unsigned long bvme6000_gettimeoffset (void); extern unsigned long bvme6000_gettimeoffset (void);
extern int bvme6000_hwclk (int, struct rtc_time *); extern int bvme6000_hwclk (int, struct rtc_time *);
...@@ -82,15 +81,6 @@ static void bvme6000_get_model(char *model) ...@@ -82,15 +81,6 @@ static void bvme6000_get_model(char *model)
sprintf(model, "BVME%d000", m68k_cputype == CPU_68060 ? 6 : 4); sprintf(model, "BVME%d000", m68k_cputype == CPU_68060 ? 6 : 4);
} }
/* No hardware options on BVME6000? */
static int bvme6000_get_hardware_list(char *buffer)
{
*buffer = '\0';
return 0;
}
/* /*
* This function is called during kernel startup to initialize * This function is called during kernel startup to initialize
* the bvme6000 IRQ handling routines. * the bvme6000 IRQ handling routines.
...@@ -127,7 +117,6 @@ void __init config_bvme6000(void) ...@@ -127,7 +117,6 @@ void __init config_bvme6000(void)
mach_set_clock_mmss = bvme6000_set_clock_mmss; mach_set_clock_mmss = bvme6000_set_clock_mmss;
mach_reset = bvme6000_reset; mach_reset = bvme6000_reset;
mach_get_model = bvme6000_get_model; mach_get_model = bvme6000_get_model;
mach_get_hardware_list = bvme6000_get_hardware_list;
printk ("Board is %sconfigured as a System Controller\n", printk ("Board is %sconfigured as a System Controller\n",
*config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not "); *config_reg_ptr & BVME_CONFIG_SW1 ? "" : "not ");
......
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
#include <linux/string.h> #include <linux/string.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/initrd.h> #include <linux/initrd.h>
...@@ -80,7 +81,7 @@ void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL; ...@@ -80,7 +81,7 @@ void (*mach_sched_init) (irq_handler_t handler) __initdata = NULL;
/* machine dependent irq functions */ /* machine dependent irq functions */
void (*mach_init_IRQ) (void) __initdata = NULL; void (*mach_init_IRQ) (void) __initdata = NULL;
void (*mach_get_model) (char *model); void (*mach_get_model) (char *model);
int (*mach_get_hardware_list) (char *buffer); void (*mach_get_hardware_list) (struct seq_file *m);
/* machine dependent timer functions */ /* machine dependent timer functions */
unsigned long (*mach_gettimeoffset) (void); unsigned long (*mach_gettimeoffset) (void);
int (*mach_hwclk) (int, struct rtc_time*); int (*mach_hwclk) (int, struct rtc_time*);
...@@ -467,9 +468,9 @@ const struct seq_operations cpuinfo_op = { ...@@ -467,9 +468,9 @@ const struct seq_operations cpuinfo_op = {
.show = show_cpuinfo, .show = show_cpuinfo,
}; };
int get_hardware_list(char *buffer) #ifdef CONFIG_PROC_HARDWARE
static int hardware_proc_show(struct seq_file *m, void *v)
{ {
int len = 0;
char model[80]; char model[80];
unsigned long mem; unsigned long mem;
int i; int i;
...@@ -479,17 +480,37 @@ int get_hardware_list(char *buffer) ...@@ -479,17 +480,37 @@ int get_hardware_list(char *buffer)
else else
strcpy(model, "Unknown m68k"); strcpy(model, "Unknown m68k");
len += sprintf(buffer + len, "Model:\t\t%s\n", model); seq_printf(m, "Model:\t\t%s\n", model);
for (mem = 0, i = 0; i < m68k_num_memory; i++) for (mem = 0, i = 0; i < m68k_num_memory; i++)
mem += m68k_memory[i].size; mem += m68k_memory[i].size;
len += sprintf(buffer + len, "System Memory:\t%ldK\n", mem >> 10); seq_printf(m, "System Memory:\t%ldK\n", mem >> 10);
if (mach_get_hardware_list) if (mach_get_hardware_list)
len += mach_get_hardware_list(buffer + len); mach_get_hardware_list(m);
return len; return 0;
}
static int hardware_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, hardware_proc_show, NULL);
} }
static const struct file_operations hardware_proc_fops = {
.open = hardware_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_hardware_init(void)
{
proc_create("hardware", 0, NULL, &hardware_proc_fops);
return 0;
}
module_init(proc_hardware_init);
#endif
void check_bugs(void) void check_bugs(void)
{ {
#ifndef CONFIG_M68KFPU_EMU #ifndef CONFIG_M68KFPU_EMU
......
...@@ -37,7 +37,6 @@ ...@@ -37,7 +37,6 @@
static void mvme147_get_model(char *model); static void mvme147_get_model(char *model);
static int mvme147_get_hardware_list(char *buffer);
extern void mvme147_sched_init(irq_handler_t handler); extern void mvme147_sched_init(irq_handler_t handler);
extern unsigned long mvme147_gettimeoffset (void); extern unsigned long mvme147_gettimeoffset (void);
extern int mvme147_hwclk (int, struct rtc_time *); extern int mvme147_hwclk (int, struct rtc_time *);
...@@ -76,14 +75,6 @@ static void mvme147_get_model(char *model) ...@@ -76,14 +75,6 @@ static void mvme147_get_model(char *model)
sprintf(model, "Motorola MVME147"); sprintf(model, "Motorola MVME147");
} }
static int mvme147_get_hardware_list(char *buffer)
{
*buffer = '\0';
return 0;
}
/* /*
* This function is called during kernel startup to initialize * This function is called during kernel startup to initialize
* the mvme147 IRQ handling routines. * the mvme147 IRQ handling routines.
...@@ -104,7 +95,6 @@ void __init config_mvme147(void) ...@@ -104,7 +95,6 @@ void __init config_mvme147(void)
mach_set_clock_mmss = mvme147_set_clock_mmss; mach_set_clock_mmss = mvme147_set_clock_mmss;
mach_reset = mvme147_reset; mach_reset = mvme147_reset;
mach_get_model = mvme147_get_model; mach_get_model = mvme147_get_model;
mach_get_hardware_list = mvme147_get_hardware_list;
/* Board type is only set by newer versions of vmelilo/tftplilo */ /* Board type is only set by newer versions of vmelilo/tftplilo */
if (!vme_brdtype) if (!vme_brdtype)
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/linkage.h> #include <linux/linkage.h>
...@@ -42,7 +43,6 @@ extern t_bdid mvme_bdid; ...@@ -42,7 +43,6 @@ extern t_bdid mvme_bdid;
static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE; static MK48T08ptr_t volatile rtc = (MK48T08ptr_t)MVME_RTC_BASE;
static void mvme16x_get_model(char *model); static void mvme16x_get_model(char *model);
static int mvme16x_get_hardware_list(char *buffer);
extern void mvme16x_sched_init(irq_handler_t handler); extern void mvme16x_sched_init(irq_handler_t handler);
extern unsigned long mvme16x_gettimeoffset (void); extern unsigned long mvme16x_gettimeoffset (void);
extern int mvme16x_hwclk (int, struct rtc_time *); extern int mvme16x_hwclk (int, struct rtc_time *);
...@@ -93,26 +93,21 @@ static void mvme16x_get_model(char *model) ...@@ -93,26 +93,21 @@ static void mvme16x_get_model(char *model)
} }
static int mvme16x_get_hardware_list(char *buffer) static void mvme16x_get_hardware_list(struct seq_file *m)
{ {
p_bdid p = &mvme_bdid; p_bdid p = &mvme_bdid;
int len = 0;
if (p->brdno == 0x0162 || p->brdno == 0x0172) if (p->brdno == 0x0162 || p->brdno == 0x0172)
{ {
unsigned char rev = *(unsigned char *)MVME162_VERSION_REG; unsigned char rev = *(unsigned char *)MVME162_VERSION_REG;
len += sprintf (buffer+len, "VMEchip2 %spresent\n", seq_printf (m, "VMEchip2 %spresent\n",
rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : ""); rev & MVME16x_CONFIG_NO_VMECHIP2 ? "NOT " : "");
len += sprintf (buffer+len, "SCSI interface %spresent\n", seq_printf (m, "SCSI interface %spresent\n",
rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : ""); rev & MVME16x_CONFIG_NO_SCSICHIP ? "NOT " : "");
len += sprintf (buffer+len, "Ethernet i/f %spresent\n", seq_printf (m, "Ethernet i/f %spresent\n",
rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : ""); rev & MVME16x_CONFIG_NO_ETHERNET ? "NOT " : "");
} }
else
*buffer = '\0';
return (len);
} }
/* /*
......
...@@ -39,7 +39,6 @@ ...@@ -39,7 +39,6 @@
extern irqreturn_t q40_process_int(int level, struct pt_regs *regs); extern irqreturn_t q40_process_int(int level, struct pt_regs *regs);
extern void q40_init_IRQ(void); extern void q40_init_IRQ(void);
static void q40_get_model(char *model); static void q40_get_model(char *model);
static int q40_get_hardware_list(char *buffer);
extern void q40_sched_init(irq_handler_t handler); extern void q40_sched_init(irq_handler_t handler);
static unsigned long q40_gettimeoffset(void); static unsigned long q40_gettimeoffset(void);
...@@ -153,14 +152,6 @@ static void q40_get_model(char *model) ...@@ -153,14 +152,6 @@ static void q40_get_model(char *model)
sprintf(model, "Q40"); sprintf(model, "Q40");
} }
/* No hardware options on Q40? */
static int q40_get_hardware_list(char *buffer)
{
*buffer = '\0';
return 0;
}
static unsigned int serports[] = static unsigned int serports[] =
{ {
0x3f8,0x2f8,0x3e8,0x2e8,0 0x3f8,0x2f8,0x3e8,0x2e8,0
...@@ -191,7 +182,6 @@ void __init config_q40(void) ...@@ -191,7 +182,6 @@ void __init config_q40(void)
mach_reset = q40_reset; mach_reset = q40_reset;
mach_get_model = q40_get_model; mach_get_model = q40_get_model;
mach_get_hardware_list = q40_get_hardware_list;
#if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE) #if defined(CONFIG_INPUT_M68K_BEEP) || defined(CONFIG_INPUT_M68K_BEEP_MODULE)
mach_beep = q40_mksound; mach_beep = q40_mksound;
......
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/tty.h> #include <linux/tty.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -46,16 +47,9 @@ extern volatile unsigned char* sun3_intreg; ...@@ -46,16 +47,9 @@ extern volatile unsigned char* sun3_intreg;
extern unsigned long availmem; extern unsigned long availmem;
unsigned long num_pages; unsigned long num_pages;
static int sun3_get_hardware_list(char *buffer) static void sun3_get_hardware_list(struct seq_file *m)
{ {
seq_printf(m, "PROM Revision:\t%s\n", romvec->pv_monid);
int len = 0;
len += sprintf(buffer + len, "PROM Revision:\t%s\n",
romvec->pv_monid);
return len;
} }
void __init sun3_init(void) void __init sun3_init(void)
......
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include <linux/types.h> #include <linux/types.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/console.h> #include <linux/console.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -31,16 +32,9 @@ void sun3_leds(unsigned int i) ...@@ -31,16 +32,9 @@ void sun3_leds(unsigned int i)
} }
static int sun3x_get_hardware_list(char *buffer) static void sun3x_get_hardware_list(struct seq_file *m)
{ {
seq_printf(m, "PROM Revision:\t%s\n", romvec->pv_monid);
int len = 0;
len += sprintf(buffer + len, "PROM Revision:\t%s\n",
romvec->pv_monid);
return len;
} }
/* /*
......
...@@ -348,7 +348,8 @@ static inline void native_pagetable_setup_start(pgd_t *base) {} ...@@ -348,7 +348,8 @@ static inline void native_pagetable_setup_start(pgd_t *base) {}
static inline void native_pagetable_setup_done(pgd_t *base) {} static inline void native_pagetable_setup_done(pgd_t *base) {}
#endif #endif
extern int arch_report_meminfo(char *page); struct seq_file;
extern void arch_report_meminfo(struct seq_file *m);
#ifdef CONFIG_PARAVIRT #ifdef CONFIG_PARAVIRT
#include <asm/paravirt.h> #include <asm/paravirt.h>
......
...@@ -65,23 +65,22 @@ static void split_page_count(int level) ...@@ -65,23 +65,22 @@ static void split_page_count(int level)
direct_pages_count[level - 1] += PTRS_PER_PTE; direct_pages_count[level - 1] += PTRS_PER_PTE;
} }
int arch_report_meminfo(char *page) void arch_report_meminfo(struct seq_file *m)
{ {
int n = sprintf(page, "DirectMap4k: %8lu kB\n", seq_printf(m, "DirectMap4k: %8lu kB\n",
direct_pages_count[PG_LEVEL_4K] << 2); direct_pages_count[PG_LEVEL_4K] << 2);
#if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE) #if defined(CONFIG_X86_64) || defined(CONFIG_X86_PAE)
n += sprintf(page + n, "DirectMap2M: %8lu kB\n", seq_printf(m, "DirectMap2M: %8lu kB\n",
direct_pages_count[PG_LEVEL_2M] << 11); direct_pages_count[PG_LEVEL_2M] << 11);
#else #else
n += sprintf(page + n, "DirectMap4M: %8lu kB\n", seq_printf(m, "DirectMap4M: %8lu kB\n",
direct_pages_count[PG_LEVEL_2M] << 12); direct_pages_count[PG_LEVEL_2M] << 12);
#endif #endif
#ifdef CONFIG_X86_64 #ifdef CONFIG_X86_64
if (direct_gbpages) if (direct_gbpages)
n += sprintf(page + n, "DirectMap1G: %8lu kB\n", seq_printf(m, "DirectMap1G: %8lu kB\n",
direct_pages_count[PG_LEVEL_1G] << 20); direct_pages_count[PG_LEVEL_1G] << 20);
#endif #endif
return n;
} }
#else #else
static inline void split_page_count(int level) { } static inline void split_page_count(int level) { }
......
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
#include <linux/blkdev.h> #include <linux/blkdev.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
...@@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v) ...@@ -727,12 +728,24 @@ static int show_partition(struct seq_file *seqf, void *v)
return 0; return 0;
} }
const struct seq_operations partitions_op = { static const struct seq_operations partitions_op = {
.start = show_partition_start, .start = show_partition_start,
.next = disk_seqf_next, .next = disk_seqf_next,
.stop = disk_seqf_stop, .stop = disk_seqf_stop,
.show = show_partition .show = show_partition
}; };
static int partitions_open(struct inode *inode, struct file *file)
{
return seq_open(file, &partitions_op);
}
static const struct file_operations proc_partitions_operations = {
.open = partitions_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
#endif #endif
...@@ -992,12 +1005,32 @@ static int diskstats_show(struct seq_file *seqf, void *v) ...@@ -992,12 +1005,32 @@ static int diskstats_show(struct seq_file *seqf, void *v)
return 0; return 0;
} }
const struct seq_operations diskstats_op = { static const struct seq_operations diskstats_op = {
.start = disk_seqf_start, .start = disk_seqf_start,
.next = disk_seqf_next, .next = disk_seqf_next,
.stop = disk_seqf_stop, .stop = disk_seqf_stop,
.show = diskstats_show .show = diskstats_show
}; };
static int diskstats_open(struct inode *inode, struct file *file)
{
return seq_open(file, &diskstats_op);
}
static const struct file_operations proc_diskstats_operations = {
.open = diskstats_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_genhd_init(void)
{
proc_create("diskstats", 0, NULL, &proc_diskstats_operations);
proc_create("partitions", 0, NULL, &proc_partitions_operations);
return 0;
}
module_init(proc_genhd_init);
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
static void media_change_notify_thread(struct work_struct *work) static void media_change_notify_thread(struct work_struct *work)
......
...@@ -8,6 +8,8 @@ ...@@ -8,6 +8,8 @@
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/init.h> #include <linux/init.h>
...@@ -214,6 +216,43 @@ int get_filesystem_list(char * buf) ...@@ -214,6 +216,43 @@ int get_filesystem_list(char * buf)
return len; return len;
} }
#ifdef CONFIG_PROC_FS
static int filesystems_proc_show(struct seq_file *m, void *v)
{
struct file_system_type * tmp;
read_lock(&file_systems_lock);
tmp = file_systems;
while (tmp) {
seq_printf(m, "%s\t%s\n",
(tmp->fs_flags & FS_REQUIRES_DEV) ? "" : "nodev",
tmp->name);
tmp = tmp->next;
}
read_unlock(&file_systems_lock);
return 0;
}
static int filesystems_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, filesystems_proc_show, NULL);
}
static const struct file_operations filesystems_proc_fops = {
.open = filesystems_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_filesystems_init(void)
{
proc_create("filesystems", 0, NULL, &filesystems_proc_fops);
return 0;
}
module_init(proc_filesystems_init);
#endif
struct file_system_type *get_fs_type(const char *name) struct file_system_type *get_fs_type(const char *name)
{ {
struct file_system_type *fs; struct file_system_type *fs;
......
...@@ -2079,6 +2079,7 @@ int vfs_cancel_lock(struct file *filp, struct file_lock *fl) ...@@ -2079,6 +2079,7 @@ int vfs_cancel_lock(struct file *filp, struct file_lock *fl)
EXPORT_SYMBOL_GPL(vfs_cancel_lock); EXPORT_SYMBOL_GPL(vfs_cancel_lock);
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
static void lock_get_status(struct seq_file *f, struct file_lock *fl, static void lock_get_status(struct seq_file *f, struct file_lock *fl,
...@@ -2184,12 +2185,31 @@ static void locks_stop(struct seq_file *f, void *v) ...@@ -2184,12 +2185,31 @@ static void locks_stop(struct seq_file *f, void *v)
unlock_kernel(); unlock_kernel();
} }
struct seq_operations locks_seq_operations = { static const struct seq_operations locks_seq_operations = {
.start = locks_start, .start = locks_start,
.next = locks_next, .next = locks_next,
.stop = locks_stop, .stop = locks_stop,
.show = locks_show, .show = locks_show,
}; };
static int locks_open(struct inode *inode, struct file *filp)
{
return seq_open(filp, &locks_seq_operations);
}
static const struct file_operations proc_locks_operations = {
.open = locks_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_locks_init(void)
{
proc_create("locks", 0, NULL, &proc_locks_operations);
return 0;
}
module_init(proc_locks_init);
#endif #endif
/** /**
......
...@@ -8,11 +8,20 @@ proc-y := nommu.o task_nommu.o ...@@ -8,11 +8,20 @@ proc-y := nommu.o task_nommu.o
proc-$(CONFIG_MMU) := mmu.o task_mmu.o proc-$(CONFIG_MMU) := mmu.o task_mmu.o
proc-y += inode.o root.o base.o generic.o array.o \ proc-y += inode.o root.o base.o generic.o array.o \
proc_tty.o proc_misc.o proc_tty.o
proc-y += cmdline.o
proc-y += cpuinfo.o
proc-y += devices.o
proc-y += interrupts.o
proc-y += loadavg.o
proc-y += meminfo.o
proc-y += stat.o
proc-y += uptime.o
proc-y += version.o
proc-$(CONFIG_PROC_SYSCTL) += proc_sysctl.o proc-$(CONFIG_PROC_SYSCTL) += proc_sysctl.o
proc-$(CONFIG_NET) += proc_net.o proc-$(CONFIG_NET) += proc_net.o
proc-$(CONFIG_PROC_KCORE) += kcore.o proc-$(CONFIG_PROC_KCORE) += kcore.o
proc-$(CONFIG_PROC_VMCORE) += vmcore.o proc-$(CONFIG_PROC_VMCORE) += vmcore.o
proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o proc-$(CONFIG_PROC_DEVICETREE) += proc_devtree.o
proc-$(CONFIG_PRINTK) += kmsg.o proc-$(CONFIG_PRINTK) += kmsg.o
proc-$(CONFIG_PROC_PAGE_MONITOR) += page.o
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
static int cmdline_proc_show(struct seq_file *m, void *v)
{
seq_printf(m, "%s\n", saved_command_line);
return 0;
}
static int cmdline_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, cmdline_proc_show, NULL);
}
static const struct file_operations cmdline_proc_fops = {
.open = cmdline_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_cmdline_init(void)
{
proc_create("cmdline", 0, NULL, &cmdline_proc_fops);
return 0;
}
module_init(proc_cmdline_init);
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
extern const struct seq_operations cpuinfo_op;
static int cpuinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &cpuinfo_op);
}
static const struct file_operations proc_cpuinfo_operations = {
.open = cpuinfo_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_cpuinfo_init(void)
{
proc_create("cpuinfo", 0, NULL, &proc_cpuinfo_operations);
return 0;
}
module_init(proc_cpuinfo_init);
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
static int devinfo_show(struct seq_file *f, void *v)
{
int i = *(loff_t *) v;
if (i < CHRDEV_MAJOR_HASH_SIZE) {
if (i == 0)
seq_printf(f, "Character devices:\n");
chrdev_show(f, i);
}
#ifdef CONFIG_BLOCK
else {
i -= CHRDEV_MAJOR_HASH_SIZE;
if (i == 0)
seq_printf(f, "\nBlock devices:\n");
blkdev_show(f, i);
}
#endif
return 0;
}
static void *devinfo_start(struct seq_file *f, loff_t *pos)
{
if (*pos < (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
return pos;
return NULL;
}
static void *devinfo_next(struct seq_file *f, void *v, loff_t *pos)
{
(*pos)++;
if (*pos >= (BLKDEV_MAJOR_HASH_SIZE + CHRDEV_MAJOR_HASH_SIZE))
return NULL;
return pos;
}
static void devinfo_stop(struct seq_file *f, void *v)
{
/* Nothing to do */
}
static const struct seq_operations devinfo_ops = {
.start = devinfo_start,
.next = devinfo_next,
.stop = devinfo_stop,
.show = devinfo_show
};
static int devinfo_open(struct inode *inode, struct file *filp)
{
return seq_open(filp, &devinfo_ops);
}
static const struct file_operations proc_devinfo_operations = {
.open = devinfo_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_devices_init(void)
{
proc_create("devices", 0, NULL, &proc_devinfo_operations);
return 0;
}
module_init(proc_devices_init);
...@@ -547,9 +547,8 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp ...@@ -547,9 +547,8 @@ static int proc_register(struct proc_dir_entry * dir, struct proc_dir_entry * dp
for (tmp = dir->subdir; tmp; tmp = tmp->next) for (tmp = dir->subdir; tmp; tmp = tmp->next)
if (strcmp(tmp->name, dp->name) == 0) { if (strcmp(tmp->name, dp->name) == 0) {
printk(KERN_WARNING "proc_dir_entry '%s/%s' already registered\n", WARN(1, KERN_WARNING "proc_dir_entry '%s/%s' already registered\n",
dir->name, dp->name); dir->name, dp->name);
dump_stack();
break; break;
} }
......
...@@ -106,14 +106,13 @@ static void init_once(void *foo) ...@@ -106,14 +106,13 @@ static void init_once(void *foo)
inode_init_once(&ei->vfs_inode); inode_init_once(&ei->vfs_inode);
} }
int __init proc_init_inodecache(void) void __init proc_init_inodecache(void)
{ {
proc_inode_cachep = kmem_cache_create("proc_inode_cache", proc_inode_cachep = kmem_cache_create("proc_inode_cache",
sizeof(struct proc_inode), sizeof(struct proc_inode),
0, (SLAB_RECLAIM_ACCOUNT| 0, (SLAB_RECLAIM_ACCOUNT|
SLAB_MEM_SPREAD|SLAB_PANIC), SLAB_MEM_SPREAD|SLAB_PANIC),
init_once); init_once);
return 0;
} }
static const struct super_operations proc_sops = { static const struct super_operations proc_sops = {
......
...@@ -61,12 +61,11 @@ extern const struct file_operations proc_smaps_operations; ...@@ -61,12 +61,11 @@ extern const struct file_operations proc_smaps_operations;
extern const struct file_operations proc_clear_refs_operations; extern const struct file_operations proc_clear_refs_operations;
extern const struct file_operations proc_pagemap_operations; extern const struct file_operations proc_pagemap_operations;
extern const struct file_operations proc_net_operations; extern const struct file_operations proc_net_operations;
extern const struct file_operations proc_kmsg_operations;
extern const struct inode_operations proc_net_inode_operations; extern const struct inode_operations proc_net_inode_operations;
void free_proc_entry(struct proc_dir_entry *de); void free_proc_entry(struct proc_dir_entry *de);
int proc_init_inodecache(void); void proc_init_inodecache(void);
static inline struct pid *proc_pid(struct inode *inode) static inline struct pid *proc_pid(struct inode *inode)
{ {
......
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/irqnr.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
/*
* /proc/interrupts
*/
static void *int_seq_start(struct seq_file *f, loff_t *pos)
{
return (*pos <= nr_irqs) ? pos : NULL;
}
static void *int_seq_next(struct seq_file *f, void *v, loff_t *pos)
{
(*pos)++;
if (*pos > nr_irqs)
return NULL;
return pos;
}
static void int_seq_stop(struct seq_file *f, void *v)
{
/* Nothing to do */
}
static const struct seq_operations int_seq_ops = {
.start = int_seq_start,
.next = int_seq_next,
.stop = int_seq_stop,
.show = show_interrupts
};
static int interrupts_open(struct inode *inode, struct file *filp)
{
return seq_open(filp, &int_seq_ops);
}
static const struct file_operations proc_interrupts_operations = {
.open = interrupts_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_interrupts_init(void)
{
proc_create("interrupts", 0, NULL, &proc_interrupts_operations);
return 0;
}
module_init(proc_interrupts_init);
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
#define ELF_CORE_EFLAGS 0 #define ELF_CORE_EFLAGS 0
#endif #endif
static struct proc_dir_entry *proc_root_kcore;
static int open_kcore(struct inode * inode, struct file * filp) static int open_kcore(struct inode * inode, struct file * filp)
{ {
return capable(CAP_SYS_RAWIO) ? 0 : -EPERM; return capable(CAP_SYS_RAWIO) ? 0 : -EPERM;
...@@ -34,7 +36,7 @@ static int open_kcore(struct inode * inode, struct file * filp) ...@@ -34,7 +36,7 @@ static int open_kcore(struct inode * inode, struct file * filp)
static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *); static ssize_t read_kcore(struct file *, char __user *, size_t, loff_t *);
const struct file_operations proc_kcore_operations = { static const struct file_operations proc_kcore_operations = {
.read = read_kcore, .read = read_kcore,
.open = open_kcore, .open = open_kcore,
}; };
...@@ -399,3 +401,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos) ...@@ -399,3 +401,13 @@ read_kcore(struct file *file, char __user *buffer, size_t buflen, loff_t *fpos)
return acc; return acc;
} }
static int __init proc_kcore_init(void)
{
proc_root_kcore = proc_create("kcore", S_IRUSR, NULL, &proc_kcore_operations);
if (proc_root_kcore)
proc_root_kcore->size =
(size_t)high_memory - PAGE_OFFSET + PAGE_SIZE;
return 0;
}
module_init(proc_kcore_init);
...@@ -10,13 +10,12 @@ ...@@ -10,13 +10,12 @@
#include <linux/time.h> #include <linux/time.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/poll.h> #include <linux/poll.h>
#include <linux/proc_fs.h>
#include <linux/fs.h> #include <linux/fs.h>
#include <asm/uaccess.h> #include <asm/uaccess.h>
#include <asm/io.h> #include <asm/io.h>
#include "internal.h"
extern wait_queue_head_t log_wait; extern wait_queue_head_t log_wait;
extern int do_syslog(int type, char __user *bug, int count); extern int do_syslog(int type, char __user *bug, int count);
...@@ -49,9 +48,16 @@ static unsigned int kmsg_poll(struct file *file, poll_table *wait) ...@@ -49,9 +48,16 @@ static unsigned int kmsg_poll(struct file *file, poll_table *wait)
} }
const struct file_operations proc_kmsg_operations = { static const struct file_operations proc_kmsg_operations = {
.read = kmsg_read, .read = kmsg_read,
.poll = kmsg_poll, .poll = kmsg_poll,
.open = kmsg_open, .open = kmsg_open,
.release = kmsg_release, .release = kmsg_release,
}; };
static int __init proc_kmsg_init(void)
{
proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);
return 0;
}
module_init(proc_kmsg_init);
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/pid_namespace.h>
#include <linux/proc_fs.h>
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/seqlock.h>
#include <linux/time.h>
#define LOAD_INT(x) ((x) >> FSHIFT)
#define LOAD_FRAC(x) LOAD_INT(((x) & (FIXED_1-1)) * 100)
static int loadavg_proc_show(struct seq_file *m, void *v)
{
int a, b, c;
unsigned long seq;
do {
seq = read_seqbegin(&xtime_lock);
a = avenrun[0] + (FIXED_1/200);
b = avenrun[1] + (FIXED_1/200);
c = avenrun[2] + (FIXED_1/200);
} while (read_seqretry(&xtime_lock, seq));
seq_printf(m, "%d.%02d %d.%02d %d.%02d %ld/%d %d\n",
LOAD_INT(a), LOAD_FRAC(a),
LOAD_INT(b), LOAD_FRAC(b),
LOAD_INT(c), LOAD_FRAC(c),
nr_running(), nr_threads,
task_active_pid_ns(current)->last_pid);
return 0;
}
static int loadavg_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, loadavg_proc_show, NULL);
}
static const struct file_operations loadavg_proc_fops = {
.open = loadavg_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_loadavg_init(void)
{
proc_create("loadavg", 0, NULL, &loadavg_proc_fops);
return 0;
}
module_init(proc_loadavg_init);
#include <linux/fs.h>
#include <linux/hugetlb.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/mm.h>
#include <linux/mman.h>
#include <linux/mmzone.h>
#include <linux/proc_fs.h>
#include <linux/quicklist.h>
#include <linux/seq_file.h>
#include <linux/swap.h>
#include <linux/vmstat.h>
#include <asm/atomic.h>
#include <asm/page.h>
#include <asm/pgtable.h>
#include "internal.h"
void __attribute__((weak)) arch_report_meminfo(struct seq_file *m)
{
}
static int meminfo_proc_show(struct seq_file *m, void *v)
{
struct sysinfo i;
unsigned long committed;
unsigned long allowed;
struct vmalloc_info vmi;
long cached;
unsigned long pages[NR_LRU_LISTS];
int lru;
/*
* display in kilobytes.
*/
#define K(x) ((x) << (PAGE_SHIFT - 10))
si_meminfo(&i);
si_swapinfo(&i);
committed = atomic_long_read(&vm_committed_space);
allowed = ((totalram_pages - hugetlb_total_pages())
* sysctl_overcommit_ratio / 100) + total_swap_pages;
cached = global_page_state(NR_FILE_PAGES) -
total_swapcache_pages - i.bufferram;
if (cached < 0)
cached = 0;
get_vmalloc_info(&vmi);
for (lru = LRU_BASE; lru < NR_LRU_LISTS; lru++)
pages[lru] = global_page_state(NR_LRU_BASE + lru);
/*
* Tagged format, for easy grepping and expansion.
*/
seq_printf(m,
"MemTotal: %8lu kB\n"
"MemFree: %8lu kB\n"
"Buffers: %8lu kB\n"
"Cached: %8lu kB\n"
"SwapCached: %8lu kB\n"
"Active: %8lu kB\n"
"Inactive: %8lu kB\n"
"Active(anon): %8lu kB\n"
"Inactive(anon): %8lu kB\n"
"Active(file): %8lu kB\n"
"Inactive(file): %8lu kB\n"
#ifdef CONFIG_UNEVICTABLE_LRU
"Unevictable: %8lu kB\n"
"Mlocked: %8lu kB\n"
#endif
#ifdef CONFIG_HIGHMEM
"HighTotal: %8lu kB\n"
"HighFree: %8lu kB\n"
"LowTotal: %8lu kB\n"
"LowFree: %8lu kB\n"
#endif
"SwapTotal: %8lu kB\n"
"SwapFree: %8lu kB\n"
"Dirty: %8lu kB\n"
"Writeback: %8lu kB\n"
"AnonPages: %8lu kB\n"
"Mapped: %8lu kB\n"
"Slab: %8lu kB\n"
"SReclaimable: %8lu kB\n"
"SUnreclaim: %8lu kB\n"
"PageTables: %8lu kB\n"
#ifdef CONFIG_QUICKLIST
"Quicklists: %8lu kB\n"
#endif
"NFS_Unstable: %8lu kB\n"
"Bounce: %8lu kB\n"
"WritebackTmp: %8lu kB\n"
"CommitLimit: %8lu kB\n"
"Committed_AS: %8lu kB\n"
"VmallocTotal: %8lu kB\n"
"VmallocUsed: %8lu kB\n"
"VmallocChunk: %8lu kB\n",
K(i.totalram),
K(i.freeram),
K(i.bufferram),
K(cached),
K(total_swapcache_pages),
K(pages[LRU_ACTIVE_ANON] + pages[LRU_ACTIVE_FILE]),
K(pages[LRU_INACTIVE_ANON] + pages[LRU_INACTIVE_FILE]),
K(pages[LRU_ACTIVE_ANON]),
K(pages[LRU_INACTIVE_ANON]),
K(pages[LRU_ACTIVE_FILE]),
K(pages[LRU_INACTIVE_FILE]),
#ifdef CONFIG_UNEVICTABLE_LRU
K(pages[LRU_UNEVICTABLE]),
K(global_page_state(NR_MLOCK)),
#endif
#ifdef CONFIG_HIGHMEM
K(i.totalhigh),
K(i.freehigh),
K(i.totalram-i.totalhigh),
K(i.freeram-i.freehigh),
#endif
K(i.totalswap),
K(i.freeswap),
K(global_page_state(NR_FILE_DIRTY)),
K(global_page_state(NR_WRITEBACK)),
K(global_page_state(NR_ANON_PAGES)),
K(global_page_state(NR_FILE_MAPPED)),
K(global_page_state(NR_SLAB_RECLAIMABLE) +
global_page_state(NR_SLAB_UNRECLAIMABLE)),
K(global_page_state(NR_SLAB_RECLAIMABLE)),
K(global_page_state(NR_SLAB_UNRECLAIMABLE)),
K(global_page_state(NR_PAGETABLE)),
#ifdef CONFIG_QUICKLIST
K(quicklist_total_size()),
#endif
K(global_page_state(NR_UNSTABLE_NFS)),
K(global_page_state(NR_BOUNCE)),
K(global_page_state(NR_WRITEBACK_TEMP)),
K(allowed),
K(committed),
(unsigned long)VMALLOC_TOTAL >> 10,
vmi.used >> 10,
vmi.largest_chunk >> 10
);
hugetlb_report_meminfo(m);
arch_report_meminfo(m);
return 0;
#undef K
}
static int meminfo_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, meminfo_proc_show, NULL);
}
static const struct file_operations meminfo_proc_fops = {
.open = meminfo_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_meminfo_init(void)
{
proc_create("meminfo", 0, NULL, &meminfo_proc_fops);
return 0;
}
module_init(proc_meminfo_init);
#include <linux/bootmem.h>
#include <linux/compiler.h>
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <asm/uaccess.h>
#include "internal.h"
#define KPMSIZE sizeof(u64)
#define KPMMASK (KPMSIZE - 1)
/* /proc/kpagecount - an array exposing page counts
*
* Each entry is a u64 representing the corresponding
* physical page count.
*/
static ssize_t kpagecount_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
u64 __user *out = (u64 __user *)buf;
struct page *ppage;
unsigned long src = *ppos;
unsigned long pfn;
ssize_t ret = 0;
u64 pcount;
pfn = src / KPMSIZE;
count = min_t(size_t, count, (max_pfn * KPMSIZE) - src);
if (src & KPMMASK || count & KPMMASK)
return -EINVAL;
while (count > 0) {
ppage = NULL;
if (pfn_valid(pfn))
ppage = pfn_to_page(pfn);
pfn++;
if (!ppage)
pcount = 0;
else
pcount = page_mapcount(ppage);
if (put_user(pcount, out++)) {
ret = -EFAULT;
break;
}
count -= KPMSIZE;
}
*ppos += (char __user *)out - buf;
if (!ret)
ret = (char __user *)out - buf;
return ret;
}
static const struct file_operations proc_kpagecount_operations = {
.llseek = mem_lseek,
.read = kpagecount_read,
};
/* /proc/kpageflags - an array exposing page flags
*
* Each entry is a u64 representing the corresponding
* physical page flags.
*/
/* These macros are used to decouple internal flags from exported ones */
#define KPF_LOCKED 0
#define KPF_ERROR 1
#define KPF_REFERENCED 2
#define KPF_UPTODATE 3
#define KPF_DIRTY 4
#define KPF_LRU 5
#define KPF_ACTIVE 6
#define KPF_SLAB 7
#define KPF_WRITEBACK 8
#define KPF_RECLAIM 9
#define KPF_BUDDY 10
#define kpf_copy_bit(flags, srcpos, dstpos) (((flags >> srcpos) & 1) << dstpos)
static ssize_t kpageflags_read(struct file *file, char __user *buf,
size_t count, loff_t *ppos)
{
u64 __user *out = (u64 __user *)buf;
struct page *ppage;
unsigned long src = *ppos;
unsigned long pfn;
ssize_t ret = 0;
u64 kflags, uflags;
pfn = src / KPMSIZE;
count = min_t(unsigned long, count, (max_pfn * KPMSIZE) - src);
if (src & KPMMASK || count & KPMMASK)
return -EINVAL;
while (count > 0) {
ppage = NULL;
if (pfn_valid(pfn))
ppage = pfn_to_page(pfn);
pfn++;
if (!ppage)
kflags = 0;
else
kflags = ppage->flags;
uflags = kpf_copy_bit(KPF_LOCKED, PG_locked, kflags) |
kpf_copy_bit(kflags, KPF_ERROR, PG_error) |
kpf_copy_bit(kflags, KPF_REFERENCED, PG_referenced) |
kpf_copy_bit(kflags, KPF_UPTODATE, PG_uptodate) |
kpf_copy_bit(kflags, KPF_DIRTY, PG_dirty) |
kpf_copy_bit(kflags, KPF_LRU, PG_lru) |
kpf_copy_bit(kflags, KPF_ACTIVE, PG_active) |
kpf_copy_bit(kflags, KPF_SLAB, PG_slab) |
kpf_copy_bit(kflags, KPF_WRITEBACK, PG_writeback) |
kpf_copy_bit(kflags, KPF_RECLAIM, PG_reclaim) |
kpf_copy_bit(kflags, KPF_BUDDY, PG_buddy);
if (put_user(uflags, out++)) {
ret = -EFAULT;
break;
}
count -= KPMSIZE;
}
*ppos += (char __user *)out - buf;
if (!ret)
ret = (char __user *)out - buf;
return ret;
}
static const struct file_operations proc_kpageflags_operations = {
.llseek = mem_lseek,
.read = kpageflags_read,
};
static int __init proc_page_init(void)
{
proc_create("kpagecount", S_IRUSR, NULL, &proc_kpagecount_operations);
proc_create("kpageflags", S_IRUSR, NULL, &proc_kpageflags_operations);
return 0;
}
module_init(proc_page_init);
...@@ -4,6 +4,7 @@ ...@@ -4,6 +4,7 @@
* Copyright 1997 Paul Mackerras * Copyright 1997 Paul Mackerras
*/ */
#include <linux/errno.h> #include <linux/errno.h>
#include <linux/init.h>
#include <linux/time.h> #include <linux/time.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/stat.h> #include <linux/stat.h>
...@@ -214,7 +215,7 @@ void proc_device_tree_add_node(struct device_node *np, ...@@ -214,7 +215,7 @@ void proc_device_tree_add_node(struct device_node *np,
/* /*
* Called on initialization to set up the /proc/device-tree subtree * Called on initialization to set up the /proc/device-tree subtree
*/ */
void proc_device_tree_init(void) void __init proc_device_tree_init(void)
{ {
struct device_node *root; struct device_node *root;
if ( !have_of ) if ( !have_of )
......
This diff is collapsed.
/* /*
* /proc/sys support * /proc/sys support
*/ */
#include <linux/init.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/proc_fs.h> #include <linux/proc_fs.h>
#include <linux/security.h> #include <linux/security.h>
...@@ -402,7 +402,7 @@ static struct dentry_operations proc_sys_dentry_operations = { ...@@ -402,7 +402,7 @@ static struct dentry_operations proc_sys_dentry_operations = {
.d_compare = proc_sys_compare, .d_compare = proc_sys_compare,
}; };
int proc_sys_init(void) int __init proc_sys_init(void)
{ {
struct proc_dir_entry *proc_sys_root; struct proc_dir_entry *proc_sys_root;
......
...@@ -104,9 +104,9 @@ static struct file_system_type proc_fs_type = { ...@@ -104,9 +104,9 @@ static struct file_system_type proc_fs_type = {
void __init proc_root_init(void) void __init proc_root_init(void)
{ {
int err = proc_init_inodecache(); int err;
if (err)
return; proc_init_inodecache();
err = register_filesystem(&proc_fs_type); err = register_filesystem(&proc_fs_type);
if (err) if (err)
return; return;
...@@ -117,7 +117,7 @@ void __init proc_root_init(void) ...@@ -117,7 +117,7 @@ void __init proc_root_init(void)
return; return;
} }
proc_misc_init(); proc_symlink("mounts", NULL, "self/mounts");
proc_net_init(); proc_net_init();
......
#include <linux/cpumask.h>
#include <linux/fs.h>
#include <linux/gfp.h>
#include <linux/init.h>
#include <linux/interrupt.h>
#include <linux/kernel_stat.h>
#include <linux/proc_fs.h>
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/slab.h>
#include <linux/time.h>
#include <asm/cputime.h>
#ifndef arch_irq_stat_cpu
#define arch_irq_stat_cpu(cpu) 0
#endif
#ifndef arch_irq_stat
#define arch_irq_stat() 0
#endif
static int show_stat(struct seq_file *p, void *v)
{
int i, j;
unsigned long jif;
cputime64_t user, nice, system, idle, iowait, irq, softirq, steal;
cputime64_t guest;
u64 sum = 0;
struct timespec boottime;
unsigned int per_irq_sum;
user = nice = system = idle = iowait =
irq = softirq = steal = cputime64_zero;
guest = cputime64_zero;
getboottime(&boottime);
jif = boottime.tv_sec;
for_each_possible_cpu(i) {
user = cputime64_add(user, kstat_cpu(i).cpustat.user);
nice = cputime64_add(nice, kstat_cpu(i).cpustat.nice);
system = cputime64_add(system, kstat_cpu(i).cpustat.system);
idle = cputime64_add(idle, kstat_cpu(i).cpustat.idle);
iowait = cputime64_add(iowait, kstat_cpu(i).cpustat.iowait);
irq = cputime64_add(irq, kstat_cpu(i).cpustat.irq);
softirq = cputime64_add(softirq, kstat_cpu(i).cpustat.softirq);
steal = cputime64_add(steal, kstat_cpu(i).cpustat.steal);
guest = cputime64_add(guest, kstat_cpu(i).cpustat.guest);
for_each_irq_nr(j)
sum += kstat_irqs_cpu(j, i);
sum += arch_irq_stat_cpu(i);
}
sum += arch_irq_stat();
seq_printf(p, "cpu %llu %llu %llu %llu %llu %llu %llu %llu %llu\n",
(unsigned long long)cputime64_to_clock_t(user),
(unsigned long long)cputime64_to_clock_t(nice),
(unsigned long long)cputime64_to_clock_t(system),
(unsigned long long)cputime64_to_clock_t(idle),
(unsigned long long)cputime64_to_clock_t(iowait),
(unsigned long long)cputime64_to_clock_t(irq),
(unsigned long long)cputime64_to_clock_t(softirq),
(unsigned long long)cputime64_to_clock_t(steal),
(unsigned long long)cputime64_to_clock_t(guest));
for_each_online_cpu(i) {
/* Copy values here to work around gcc-2.95.3, gcc-2.96 */
user = kstat_cpu(i).cpustat.user;
nice = kstat_cpu(i).cpustat.nice;
system = kstat_cpu(i).cpustat.system;
idle = kstat_cpu(i).cpustat.idle;
iowait = kstat_cpu(i).cpustat.iowait;
irq = kstat_cpu(i).cpustat.irq;
softirq = kstat_cpu(i).cpustat.softirq;
steal = kstat_cpu(i).cpustat.steal;
guest = kstat_cpu(i).cpustat.guest;
seq_printf(p,
"cpu%d %llu %llu %llu %llu %llu %llu %llu %llu %llu\n",
i,
(unsigned long long)cputime64_to_clock_t(user),
(unsigned long long)cputime64_to_clock_t(nice),
(unsigned long long)cputime64_to_clock_t(system),
(unsigned long long)cputime64_to_clock_t(idle),
(unsigned long long)cputime64_to_clock_t(iowait),
(unsigned long long)cputime64_to_clock_t(irq),
(unsigned long long)cputime64_to_clock_t(softirq),
(unsigned long long)cputime64_to_clock_t(steal),
(unsigned long long)cputime64_to_clock_t(guest));
}
seq_printf(p, "intr %llu", (unsigned long long)sum);
/* sum again ? it could be updated? */
for_each_irq_nr(j) {
per_irq_sum = 0;
for_each_possible_cpu(i)
per_irq_sum += kstat_irqs_cpu(j, i);
seq_printf(p, " %u", per_irq_sum);
}
seq_printf(p,
"\nctxt %llu\n"
"btime %lu\n"
"processes %lu\n"
"procs_running %lu\n"
"procs_blocked %lu\n",
nr_context_switches(),
(unsigned long)jif,
total_forks,
nr_running(),
nr_iowait());
return 0;
}
static int stat_open(struct inode *inode, struct file *file)
{
unsigned size = 4096 * (1 + num_possible_cpus() / 32);
char *buf;
struct seq_file *m;
int res;
/* don't ask for more than the kmalloc() max size, currently 128 KB */
if (size > 128 * 1024)
size = 128 * 1024;
buf = kmalloc(size, GFP_KERNEL);
if (!buf)
return -ENOMEM;
res = single_open(file, show_stat, NULL);
if (!res) {
m = file->private_data;
m->buf = buf;
m->size = size;
} else
kfree(buf);
return res;
}
static const struct file_operations proc_stat_operations = {
.open = stat_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_stat_init(void)
{
proc_create("stat", 0, NULL, &proc_stat_operations);
return 0;
}
module_init(proc_stat_init);
...@@ -198,11 +198,8 @@ static int do_maps_open(struct inode *inode, struct file *file, ...@@ -198,11 +198,8 @@ static int do_maps_open(struct inode *inode, struct file *file,
return ret; return ret;
} }
static int show_map(struct seq_file *m, void *v) static void show_map_vma(struct seq_file *m, struct vm_area_struct *vma)
{ {
struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task;
struct vm_area_struct *vma = v;
struct mm_struct *mm = vma->vm_mm; struct mm_struct *mm = vma->vm_mm;
struct file *file = vma->vm_file; struct file *file = vma->vm_file;
int flags = vma->vm_flags; int flags = vma->vm_flags;
...@@ -254,6 +251,15 @@ static int show_map(struct seq_file *m, void *v) ...@@ -254,6 +251,15 @@ static int show_map(struct seq_file *m, void *v)
} }
} }
seq_putc(m, '\n'); seq_putc(m, '\n');
}
static int show_map(struct seq_file *m, void *v)
{
struct vm_area_struct *vma = v;
struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task;
show_map_vma(m, vma);
if (m->count < m->size) /* vma is copied successfully */ if (m->count < m->size) /* vma is copied successfully */
m->version = (vma != get_gate_vma(task))? vma->vm_start: 0; m->version = (vma != get_gate_vma(task))? vma->vm_start: 0;
...@@ -364,9 +370,10 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end, ...@@ -364,9 +370,10 @@ static int smaps_pte_range(pmd_t *pmd, unsigned long addr, unsigned long end,
static int show_smap(struct seq_file *m, void *v) static int show_smap(struct seq_file *m, void *v)
{ {
struct proc_maps_private *priv = m->private;
struct task_struct *task = priv->task;
struct vm_area_struct *vma = v; struct vm_area_struct *vma = v;
struct mem_size_stats mss; struct mem_size_stats mss;
int ret;
struct mm_walk smaps_walk = { struct mm_walk smaps_walk = {
.pmd_entry = smaps_pte_range, .pmd_entry = smaps_pte_range,
.mm = vma->vm_mm, .mm = vma->vm_mm,
...@@ -378,9 +385,7 @@ static int show_smap(struct seq_file *m, void *v) ...@@ -378,9 +385,7 @@ static int show_smap(struct seq_file *m, void *v)
if (vma->vm_mm && !is_vm_hugetlb_page(vma)) if (vma->vm_mm && !is_vm_hugetlb_page(vma))
walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk); walk_page_range(vma->vm_start, vma->vm_end, &smaps_walk);
ret = show_map(m, v); show_map_vma(m, vma);
if (ret)
return ret;
seq_printf(m, seq_printf(m,
"Size: %8lu kB\n" "Size: %8lu kB\n"
...@@ -402,7 +407,9 @@ static int show_smap(struct seq_file *m, void *v) ...@@ -402,7 +407,9 @@ static int show_smap(struct seq_file *m, void *v)
mss.referenced >> 10, mss.referenced >> 10,
mss.swap >> 10); mss.swap >> 10);
return ret; if (m->count < m->size) /* vma is copied successfully */
m->version = (vma != get_gate_vma(task)) ? vma->vm_start : 0;
return 0;
} }
static const struct seq_operations proc_pid_smaps_op = { static const struct seq_operations proc_pid_smaps_op = {
......
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/proc_fs.h>
#include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/time.h>
#include <asm/cputime.h>
static int uptime_proc_show(struct seq_file *m, void *v)
{
struct timespec uptime;
struct timespec idle;
cputime_t idletime = cputime_add(init_task.utime, init_task.stime);
do_posix_clock_monotonic_gettime(&uptime);
monotonic_to_bootbased(&uptime);
cputime_to_timespec(idletime, &idle);
seq_printf(m, "%lu.%02lu %lu.%02lu\n",
(unsigned long) uptime.tv_sec,
(uptime.tv_nsec / (NSEC_PER_SEC / 100)),
(unsigned long) idle.tv_sec,
(idle.tv_nsec / (NSEC_PER_SEC / 100)));
return 0;
}
static int uptime_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, uptime_proc_show, NULL);
}
static const struct file_operations uptime_proc_fops = {
.open = uptime_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_uptime_init(void)
{
proc_create("uptime", 0, NULL, &uptime_proc_fops);
return 0;
}
module_init(proc_uptime_init);
#include <linux/fs.h>
#include <linux/init.h>
#include <linux/kernel.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/utsname.h>
static int version_proc_show(struct seq_file *m, void *v)
{
seq_printf(m, linux_proc_banner,
utsname()->sysname,
utsname()->release,
utsname()->version);
return 0;
}
static int version_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, version_proc_show, NULL);
}
static const struct file_operations version_proc_fops = {
.open = version_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_version_init(void)
{
proc_create("version", 0, NULL, &version_proc_fops);
return 0;
}
module_init(proc_version_init);
...@@ -32,7 +32,7 @@ static size_t elfcorebuf_sz; ...@@ -32,7 +32,7 @@ static size_t elfcorebuf_sz;
/* Total size of vmcore file. */ /* Total size of vmcore file. */
static u64 vmcore_size; static u64 vmcore_size;
struct proc_dir_entry *proc_vmcore = NULL; static struct proc_dir_entry *proc_vmcore = NULL;
/* Reads a page from the oldmem device from given offset. */ /* Reads a page from the oldmem device from given offset. */
static ssize_t read_from_oldmem(char *buf, size_t count, static ssize_t read_from_oldmem(char *buf, size_t count,
...@@ -162,7 +162,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer, ...@@ -162,7 +162,7 @@ static ssize_t read_vmcore(struct file *file, char __user *buffer,
return acc; return acc;
} }
const struct file_operations proc_vmcore_operations = { static const struct file_operations proc_vmcore_operations = {
.read = read_vmcore, .read = read_vmcore,
}; };
...@@ -652,7 +652,7 @@ static int __init vmcore_init(void) ...@@ -652,7 +652,7 @@ static int __init vmcore_init(void)
return rc; return rc;
} }
/* Initialize /proc/vmcore size if proc is already up. */ proc_vmcore = proc_create("vmcore", S_IRUSR, NULL, &proc_vmcore_operations);
if (proc_vmcore) if (proc_vmcore)
proc_vmcore->size = vmcore_size; proc_vmcore->size = vmcore_size;
return 0; return 0;
......
...@@ -14,7 +14,7 @@ extern void (*mach_sched_init) (irq_handler_t handler); ...@@ -14,7 +14,7 @@ extern void (*mach_sched_init) (irq_handler_t handler);
/* machine dependent irq functions */ /* machine dependent irq functions */
extern void (*mach_init_IRQ) (void); extern void (*mach_init_IRQ) (void);
extern void (*mach_get_model) (char *model); extern void (*mach_get_model) (char *model);
extern int (*mach_get_hardware_list) (char *buffer); extern void (*mach_get_hardware_list) (struct seq_file *m);
/* machine dependent timer functions */ /* machine dependent timer functions */
extern unsigned long (*mach_gettimeoffset)(void); extern unsigned long (*mach_gettimeoffset)(void);
extern int (*mach_hwclk)(int, struct rtc_time*); extern int (*mach_hwclk)(int, struct rtc_time*);
......
...@@ -14,8 +14,6 @@ extern unsigned long long elfcorehdr_addr; ...@@ -14,8 +14,6 @@ extern unsigned long long elfcorehdr_addr;
extern ssize_t copy_oldmem_page(unsigned long, char *, size_t, extern ssize_t copy_oldmem_page(unsigned long, char *, size_t,
unsigned long, int); unsigned long, int);
extern const struct file_operations proc_vmcore_operations;
extern struct proc_dir_entry *proc_vmcore;
/* Architecture code defines this if there are other possible ELF /* Architecture code defines this if there are other possible ELF
* machine types, e.g. on bi-arch capable hardware. */ * machine types, e.g. on bi-arch capable hardware. */
......
...@@ -1042,7 +1042,6 @@ extern int vfs_setlease(struct file *, long, struct file_lock **); ...@@ -1042,7 +1042,6 @@ extern int vfs_setlease(struct file *, long, struct file_lock **);
extern int lease_modify(struct file_lock **, int); extern int lease_modify(struct file_lock **, int);
extern int lock_may_read(struct inode *, loff_t start, unsigned long count); extern int lock_may_read(struct inode *, loff_t start, unsigned long count);
extern int lock_may_write(struct inode *, loff_t start, unsigned long count); extern int lock_may_write(struct inode *, loff_t start, unsigned long count);
extern struct seq_operations locks_seq_operations;
#else /* !CONFIG_FILE_LOCKING */ #else /* !CONFIG_FILE_LOCKING */
#define fcntl_getlk(a, b) ({ -EINVAL; }) #define fcntl_getlk(a, b) ({ -EINVAL; })
#define fcntl_setlk(a, b, c, d) ({ -EACCES; }) #define fcntl_setlk(a, b, c, d) ({ -EACCES; })
......
...@@ -25,9 +25,6 @@ extern struct device_type part_type; ...@@ -25,9 +25,6 @@ extern struct device_type part_type;
extern struct kobject *block_depr; extern struct kobject *block_depr;
extern struct class block_class; extern struct class block_class;
extern const struct seq_operations partitions_op;
extern const struct seq_operations diskstats_op;
enum { enum {
/* These three have identical behaviour; use the second one if DOS FDISK gets /* These three have identical behaviour; use the second one if DOS FDISK gets
confused about extended/logical partitions starting past cylinder 1023. */ confused about extended/logical partitions starting past cylinder 1023. */
......
...@@ -27,7 +27,7 @@ void unmap_hugepage_range(struct vm_area_struct *, ...@@ -27,7 +27,7 @@ void unmap_hugepage_range(struct vm_area_struct *,
void __unmap_hugepage_range(struct vm_area_struct *, void __unmap_hugepage_range(struct vm_area_struct *,
unsigned long, unsigned long, struct page *); unsigned long, unsigned long, struct page *);
int hugetlb_prefault(struct address_space *, struct vm_area_struct *); int hugetlb_prefault(struct address_space *, struct vm_area_struct *);
int hugetlb_report_meminfo(char *); void hugetlb_report_meminfo(struct seq_file *);
int hugetlb_report_node_meminfo(int, char *); int hugetlb_report_node_meminfo(int, char *);
unsigned long hugetlb_total_pages(void); unsigned long hugetlb_total_pages(void);
int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, int hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma,
...@@ -79,7 +79,9 @@ static inline unsigned long hugetlb_total_pages(void) ...@@ -79,7 +79,9 @@ static inline unsigned long hugetlb_total_pages(void)
#define copy_hugetlb_page_range(src, dst, vma) ({ BUG(); 0; }) #define copy_hugetlb_page_range(src, dst, vma) ({ BUG(); 0; })
#define hugetlb_prefault(mapping, vma) ({ BUG(); 0; }) #define hugetlb_prefault(mapping, vma) ({ BUG(); 0; })
#define unmap_hugepage_range(vma, start, end, page) BUG() #define unmap_hugepage_range(vma, start, end, page) BUG()
#define hugetlb_report_meminfo(buf) 0 static inline void hugetlb_report_meminfo(struct seq_file *m)
{
}
#define hugetlb_report_node_meminfo(n, buf) 0 #define hugetlb_report_node_meminfo(n, buf) 0
#define follow_huge_pmd(mm, addr, pmd, write) NULL #define follow_huge_pmd(mm, addr, pmd, write) NULL
#define follow_huge_pud(mm, addr, pud, write) NULL #define follow_huge_pud(mm, addr, pud, write) NULL
......
...@@ -97,12 +97,9 @@ struct vmcore { ...@@ -97,12 +97,9 @@ struct vmcore {
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
extern struct proc_dir_entry *proc_root_kcore;
extern spinlock_t proc_subdir_lock; extern spinlock_t proc_subdir_lock;
extern void proc_root_init(void); extern void proc_root_init(void);
extern void proc_misc_init(void);
void proc_flush_task(struct task_struct *task); void proc_flush_task(struct task_struct *task);
struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *); struct dentry *proc_pid_lookup(struct inode *dir, struct dentry * dentry, struct nameidata *);
...@@ -138,8 +135,6 @@ extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct p ...@@ -138,8 +135,6 @@ extern struct inode *proc_get_inode(struct super_block *, unsigned int, struct p
extern int proc_readdir(struct file *, void *, filldir_t); extern int proc_readdir(struct file *, void *, filldir_t);
extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *); extern struct dentry *proc_lookup(struct inode *, struct dentry *, struct nameidata *);
extern const struct file_operations proc_kcore_operations;
extern int pid_ns_prepare_proc(struct pid_namespace *ns); extern int pid_ns_prepare_proc(struct pid_namespace *ns);
extern void pid_ns_release_proc(struct pid_namespace *ns); extern void pid_ns_release_proc(struct pid_namespace *ns);
......
...@@ -680,10 +680,6 @@ struct sched_info { ...@@ -680,10 +680,6 @@ struct sched_info {
}; };
#endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */ #endif /* defined(CONFIG_SCHEDSTATS) || defined(CONFIG_TASK_DELAY_ACCT) */
#ifdef CONFIG_SCHEDSTATS
extern const struct file_operations proc_schedstat_operations;
#endif /* CONFIG_SCHEDSTATS */
#ifdef CONFIG_TASK_DELAY_ACCT #ifdef CONFIG_TASK_DELAY_ACCT
struct task_delay_info { struct task_delay_info {
spinlock_t lock; spinlock_t lock;
......
...@@ -288,9 +288,4 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node) ...@@ -288,9 +288,4 @@ static inline void *kzalloc_node(size_t size, gfp_t flags, int node)
return kmalloc_node(size, flags | __GFP_ZERO, node); return kmalloc_node(size, flags | __GFP_ZERO, node);
} }
#ifdef CONFIG_SLABINFO
extern const struct seq_operations slabinfo_op;
ssize_t slabinfo_write(struct file *, const char __user *, size_t, loff_t *);
#endif
#endif /* _LINUX_SLAB_H */ #endif /* _LINUX_SLAB_H */
...@@ -103,6 +103,4 @@ extern void free_vm_area(struct vm_struct *area); ...@@ -103,6 +103,4 @@ extern void free_vm_area(struct vm_struct *area);
extern rwlock_t vmlist_lock; extern rwlock_t vmlist_lock;
extern struct vm_struct *vmlist; extern struct vm_struct *vmlist;
extern const struct seq_operations vmalloc_op;
#endif /* _LINUX_VMALLOC_H */ #endif /* _LINUX_VMALLOC_H */
...@@ -54,10 +54,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT, ...@@ -54,10 +54,6 @@ enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
NR_VM_EVENT_ITEMS NR_VM_EVENT_ITEMS
}; };
extern const struct seq_operations fragmentation_op;
extern const struct seq_operations pagetypeinfo_op;
extern const struct seq_operations zoneinfo_op;
extern const struct seq_operations vmstat_op;
extern int sysctl_stat_interval; extern int sysctl_stat_interval;
#ifdef CONFIG_VM_EVENT_COUNTERS #ifdef CONFIG_VM_EVENT_COUNTERS
......
...@@ -12,7 +12,9 @@ ...@@ -12,7 +12,9 @@
#include <linux/kmod.h> #include <linux/kmod.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/personality.h> #include <linux/personality.h>
#include <linux/proc_fs.h>
#include <linux/sched.h> #include <linux/sched.h>
#include <linux/seq_file.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/types.h> #include <linux/types.h>
...@@ -173,20 +175,39 @@ __set_personality(u_long personality) ...@@ -173,20 +175,39 @@ __set_personality(u_long personality)
return 0; return 0;
} }
int #ifdef CONFIG_PROC_FS
get_exec_domain_list(char *page) static int execdomains_proc_show(struct seq_file *m, void *v)
{ {
struct exec_domain *ep; struct exec_domain *ep;
int len = 0;
read_lock(&exec_domains_lock); read_lock(&exec_domains_lock);
for (ep = exec_domains; ep && len < PAGE_SIZE - 80; ep = ep->next) for (ep = exec_domains; ep; ep = ep->next)
len += sprintf(page + len, "%d-%d\t%-16s\t[%s]\n", seq_printf(m, "%d-%d\t%-16s\t[%s]\n",
ep->pers_low, ep->pers_high, ep->name, ep->pers_low, ep->pers_high, ep->name,
module_name(ep->module)); module_name(ep->module));
read_unlock(&exec_domains_lock); read_unlock(&exec_domains_lock);
return (len); return 0;
}
static int execdomains_proc_open(struct inode *inode, struct file *file)
{
return single_open(file, execdomains_proc_show, NULL);
}
static const struct file_operations execdomains_proc_fops = {
.open = execdomains_proc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = single_release,
};
static int __init proc_execdomains_init(void)
{
proc_create("execdomains", 0, NULL, &execdomains_proc_fops);
return 0;
} }
module_init(proc_execdomains_init);
#endif
asmlinkage long asmlinkage long
sys_personality(u_long personality) sys_personality(u_long personality)
......
...@@ -20,11 +20,13 @@ ...@@ -20,11 +20,13 @@
#include <linux/moduleloader.h> #include <linux/moduleloader.h>
#include <linux/init.h> #include <linux/init.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
#include <linux/fs.h>
#include <linux/sysfs.h> #include <linux/sysfs.h>
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/vmalloc.h> #include <linux/vmalloc.h>
#include <linux/elf.h> #include <linux/elf.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
#include <linux/fcntl.h> #include <linux/fcntl.h>
...@@ -2556,23 +2558,6 @@ unsigned long module_kallsyms_lookup_name(const char *name) ...@@ -2556,23 +2558,6 @@ unsigned long module_kallsyms_lookup_name(const char *name)
} }
#endif /* CONFIG_KALLSYMS */ #endif /* CONFIG_KALLSYMS */
/* Called by the /proc file system to return a list of modules. */
static void *m_start(struct seq_file *m, loff_t *pos)
{
mutex_lock(&module_mutex);
return seq_list_start(&modules, *pos);
}
static void *m_next(struct seq_file *m, void *p, loff_t *pos)
{
return seq_list_next(p, &modules, pos);
}
static void m_stop(struct seq_file *m, void *p)
{
mutex_unlock(&module_mutex);
}
static char *module_flags(struct module *mod, char *buf) static char *module_flags(struct module *mod, char *buf)
{ {
int bx = 0; int bx = 0;
...@@ -2606,6 +2591,24 @@ static char *module_flags(struct module *mod, char *buf) ...@@ -2606,6 +2591,24 @@ static char *module_flags(struct module *mod, char *buf)
return buf; return buf;
} }
#ifdef CONFIG_PROC_FS
/* Called by the /proc file system to return a list of modules. */
static void *m_start(struct seq_file *m, loff_t *pos)
{
mutex_lock(&module_mutex);
return seq_list_start(&modules, *pos);
}
static void *m_next(struct seq_file *m, void *p, loff_t *pos)
{
return seq_list_next(p, &modules, pos);
}
static void m_stop(struct seq_file *m, void *p)
{
mutex_unlock(&module_mutex);
}
static int m_show(struct seq_file *m, void *p) static int m_show(struct seq_file *m, void *p)
{ {
struct module *mod = list_entry(p, struct module, list); struct module *mod = list_entry(p, struct module, list);
...@@ -2636,13 +2639,33 @@ static int m_show(struct seq_file *m, void *p) ...@@ -2636,13 +2639,33 @@ static int m_show(struct seq_file *m, void *p)
Where refcount is a number or -, and deps is a comma-separated list Where refcount is a number or -, and deps is a comma-separated list
of depends or -. of depends or -.
*/ */
const struct seq_operations modules_op = { static const struct seq_operations modules_op = {
.start = m_start, .start = m_start,
.next = m_next, .next = m_next,
.stop = m_stop, .stop = m_stop,
.show = m_show .show = m_show
}; };
static int modules_open(struct inode *inode, struct file *file)
{
return seq_open(file, &modules_op);
}
static const struct file_operations proc_modules_operations = {
.open = modules_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init proc_modules_init(void)
{
proc_create("modules", 0, NULL, &proc_modules_operations);
return 0;
}
module_init(proc_modules_init);
#endif
/* Given an address, look for it in the module exception tables. */ /* Given an address, look for it in the module exception tables. */
const struct exception_table_entry *search_module_extables(unsigned long addr) const struct exception_table_entry *search_module_extables(unsigned long addr)
{ {
......
...@@ -55,6 +55,7 @@ ...@@ -55,6 +55,7 @@
#include <linux/cpuset.h> #include <linux/cpuset.h>
#include <linux/percpu.h> #include <linux/percpu.h>
#include <linux/kthread.h> #include <linux/kthread.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/syscalls.h> #include <linux/syscalls.h>
......
...@@ -90,13 +90,20 @@ static int schedstat_open(struct inode *inode, struct file *file) ...@@ -90,13 +90,20 @@ static int schedstat_open(struct inode *inode, struct file *file)
return res; return res;
} }
const struct file_operations proc_schedstat_operations = { static const struct file_operations proc_schedstat_operations = {
.open = schedstat_open, .open = schedstat_open,
.read = seq_read, .read = seq_read,
.llseek = seq_lseek, .llseek = seq_lseek,
.release = single_release, .release = single_release,
}; };
static int __init proc_schedstat_init(void)
{
proc_create("schedstat", 0, NULL, &proc_schedstat_operations);
return 0;
}
module_init(proc_schedstat_init);
/* /*
* Expects runqueue lock to be held for atomicity of update * Expects runqueue lock to be held for atomicity of update
*/ */
......
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/seq_file.h>
#include <linux/sysctl.h> #include <linux/sysctl.h>
#include <linux/highmem.h> #include <linux/highmem.h>
#include <linux/mmu_notifier.h> #include <linux/mmu_notifier.h>
...@@ -1455,10 +1456,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write, ...@@ -1455,10 +1456,10 @@ int hugetlb_overcommit_handler(struct ctl_table *table, int write,
#endif /* CONFIG_SYSCTL */ #endif /* CONFIG_SYSCTL */
int hugetlb_report_meminfo(char *buf) void hugetlb_report_meminfo(struct seq_file *m)
{ {
struct hstate *h = &default_hstate; struct hstate *h = &default_hstate;
return sprintf(buf, seq_printf(m,
"HugePages_Total: %5lu\n" "HugePages_Total: %5lu\n"
"HugePages_Free: %5lu\n" "HugePages_Free: %5lu\n"
"HugePages_Rsvd: %5lu\n" "HugePages_Rsvd: %5lu\n"
......
...@@ -95,6 +95,7 @@ ...@@ -95,6 +95,7 @@
#include <linux/init.h> #include <linux/init.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#include <linux/cpuset.h> #include <linux/cpuset.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/notifier.h> #include <linux/notifier.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
...@@ -4258,7 +4259,7 @@ static int s_show(struct seq_file *m, void *p) ...@@ -4258,7 +4259,7 @@ static int s_show(struct seq_file *m, void *p)
* + further values on SMP and with statistics enabled * + further values on SMP and with statistics enabled
*/ */
const struct seq_operations slabinfo_op = { static const struct seq_operations slabinfo_op = {
.start = s_start, .start = s_start,
.next = s_next, .next = s_next,
.stop = s_stop, .stop = s_stop,
...@@ -4315,6 +4316,19 @@ ssize_t slabinfo_write(struct file *file, const char __user * buffer, ...@@ -4315,6 +4316,19 @@ ssize_t slabinfo_write(struct file *file, const char __user * buffer,
return res; return res;
} }
static int slabinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &slabinfo_op);
}
static const struct file_operations proc_slabinfo_operations = {
.open = slabinfo_open,
.read = seq_read,
.write = slabinfo_write,
.llseek = seq_lseek,
.release = seq_release,
};
#ifdef CONFIG_DEBUG_SLAB_LEAK #ifdef CONFIG_DEBUG_SLAB_LEAK
static void *leaks_start(struct seq_file *m, loff_t *pos) static void *leaks_start(struct seq_file *m, loff_t *pos)
...@@ -4443,13 +4457,47 @@ static int leaks_show(struct seq_file *m, void *p) ...@@ -4443,13 +4457,47 @@ static int leaks_show(struct seq_file *m, void *p)
return 0; return 0;
} }
const struct seq_operations slabstats_op = { static const struct seq_operations slabstats_op = {
.start = leaks_start, .start = leaks_start,
.next = s_next, .next = s_next,
.stop = s_stop, .stop = s_stop,
.show = leaks_show, .show = leaks_show,
}; };
static int slabstats_open(struct inode *inode, struct file *file)
{
unsigned long *n = kzalloc(PAGE_SIZE, GFP_KERNEL);
int ret = -ENOMEM;
if (n) {
ret = seq_open(file, &slabstats_op);
if (!ret) {
struct seq_file *m = file->private_data;
*n = PAGE_SIZE / (2 * sizeof(unsigned long));
m->private = n;
n = NULL;
}
kfree(n);
}
return ret;
}
static const struct file_operations proc_slabstats_operations = {
.open = slabstats_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
};
#endif
static int __init slab_proc_init(void)
{
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
#ifdef CONFIG_DEBUG_SLAB_LEAK
proc_create("slab_allocators", 0, NULL, &proc_slabstats_operations);
#endif #endif
return 0;
}
module_init(slab_proc_init);
#endif #endif
/** /**
......
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/cpu.h> #include <linux/cpu.h>
#include <linux/cpuset.h> #include <linux/cpuset.h>
...@@ -4417,14 +4418,6 @@ __initcall(slab_sysfs_init); ...@@ -4417,14 +4418,6 @@ __initcall(slab_sysfs_init);
* The /proc/slabinfo ABI * The /proc/slabinfo ABI
*/ */
#ifdef CONFIG_SLABINFO #ifdef CONFIG_SLABINFO
ssize_t slabinfo_write(struct file *file, const char __user *buffer,
size_t count, loff_t *ppos)
{
return -EINVAL;
}
static void print_slabinfo_header(struct seq_file *m) static void print_slabinfo_header(struct seq_file *m)
{ {
seq_puts(m, "slabinfo - version: 2.1\n"); seq_puts(m, "slabinfo - version: 2.1\n");
...@@ -4492,11 +4485,29 @@ static int s_show(struct seq_file *m, void *p) ...@@ -4492,11 +4485,29 @@ static int s_show(struct seq_file *m, void *p)
return 0; return 0;
} }
const struct seq_operations slabinfo_op = { static const struct seq_operations slabinfo_op = {
.start = s_start, .start = s_start,
.next = s_next, .next = s_next,
.stop = s_stop, .stop = s_stop,
.show = s_show, .show = s_show,
}; };
static int slabinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &slabinfo_op);
}
static const struct file_operations proc_slabinfo_operations = {
.open = slabinfo_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static int __init slab_proc_init(void)
{
proc_create("slabinfo",S_IWUSR|S_IRUGO,NULL,&proc_slabinfo_operations);
return 0;
}
module_init(slab_proc_init);
#endif /* CONFIG_SLABINFO */ #endif /* CONFIG_SLABINFO */
...@@ -15,6 +15,7 @@ ...@@ -15,6 +15,7 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/spinlock.h> #include <linux/spinlock.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/debugobjects.h> #include <linux/debugobjects.h>
#include <linux/kallsyms.h> #include <linux/kallsyms.h>
...@@ -1718,11 +1719,41 @@ static int s_show(struct seq_file *m, void *p) ...@@ -1718,11 +1719,41 @@ static int s_show(struct seq_file *m, void *p)
return 0; return 0;
} }
const struct seq_operations vmalloc_op = { static const struct seq_operations vmalloc_op = {
.start = s_start, .start = s_start,
.next = s_next, .next = s_next,
.stop = s_stop, .stop = s_stop,
.show = s_show, .show = s_show,
}; };
static int vmalloc_open(struct inode *inode, struct file *file)
{
unsigned int *ptr = NULL;
int ret;
if (NUMA_BUILD)
ptr = kmalloc(nr_node_ids * sizeof(unsigned int), GFP_KERNEL);
ret = seq_open(file, &vmalloc_op);
if (!ret) {
struct seq_file *m = file->private_data;
m->private = ptr;
} else
kfree(ptr);
return ret;
}
static const struct file_operations proc_vmalloc_operations = {
.open = vmalloc_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release_private,
};
static int __init proc_vmalloc_init(void)
{
proc_create("vmallocinfo", S_IRUSR, NULL, &proc_vmalloc_operations);
return 0;
}
module_init(proc_vmalloc_init);
#endif #endif
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Copyright (C) 2006 Silicon Graphics, Inc., * Copyright (C) 2006 Silicon Graphics, Inc.,
* Christoph Lameter <christoph@lameter.com> * Christoph Lameter <christoph@lameter.com>
*/ */
#include <linux/fs.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/err.h> #include <linux/err.h>
#include <linux/module.h> #include <linux/module.h>
...@@ -384,7 +384,7 @@ void zone_statistics(struct zone *preferred_zone, struct zone *z) ...@@ -384,7 +384,7 @@ void zone_statistics(struct zone *preferred_zone, struct zone *z)
#endif #endif
#ifdef CONFIG_PROC_FS #ifdef CONFIG_PROC_FS
#include <linux/proc_fs.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
static char * const migratetype_names[MIGRATE_TYPES] = { static char * const migratetype_names[MIGRATE_TYPES] = {
...@@ -581,20 +581,44 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg) ...@@ -581,20 +581,44 @@ static int pagetypeinfo_show(struct seq_file *m, void *arg)
return 0; return 0;
} }
const struct seq_operations fragmentation_op = { static const struct seq_operations fragmentation_op = {
.start = frag_start, .start = frag_start,
.next = frag_next, .next = frag_next,
.stop = frag_stop, .stop = frag_stop,
.show = frag_show, .show = frag_show,
}; };
const struct seq_operations pagetypeinfo_op = { static int fragmentation_open(struct inode *inode, struct file *file)
{
return seq_open(file, &fragmentation_op);
}
static const struct file_operations fragmentation_file_operations = {
.open = fragmentation_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static const struct seq_operations pagetypeinfo_op = {
.start = frag_start, .start = frag_start,
.next = frag_next, .next = frag_next,
.stop = frag_stop, .stop = frag_stop,
.show = pagetypeinfo_show, .show = pagetypeinfo_show,
}; };
static int pagetypeinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &pagetypeinfo_op);
}
static const struct file_operations pagetypeinfo_file_ops = {
.open = pagetypeinfo_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
#ifdef CONFIG_ZONE_DMA #ifdef CONFIG_ZONE_DMA
#define TEXT_FOR_DMA(xx) xx "_dma", #define TEXT_FOR_DMA(xx) xx "_dma",
#else #else
...@@ -771,7 +795,7 @@ static int zoneinfo_show(struct seq_file *m, void *arg) ...@@ -771,7 +795,7 @@ static int zoneinfo_show(struct seq_file *m, void *arg)
return 0; return 0;
} }
const struct seq_operations zoneinfo_op = { static const struct seq_operations zoneinfo_op = {
.start = frag_start, /* iterate over all zones. The same as in .start = frag_start, /* iterate over all zones. The same as in
* fragmentation. */ * fragmentation. */
.next = frag_next, .next = frag_next,
...@@ -779,6 +803,18 @@ const struct seq_operations zoneinfo_op = { ...@@ -779,6 +803,18 @@ const struct seq_operations zoneinfo_op = {
.show = zoneinfo_show, .show = zoneinfo_show,
}; };
static int zoneinfo_open(struct inode *inode, struct file *file)
{
return seq_open(file, &zoneinfo_op);
}
static const struct file_operations proc_zoneinfo_file_operations = {
.open = zoneinfo_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
static void *vmstat_start(struct seq_file *m, loff_t *pos) static void *vmstat_start(struct seq_file *m, loff_t *pos)
{ {
unsigned long *v; unsigned long *v;
...@@ -834,13 +870,24 @@ static void vmstat_stop(struct seq_file *m, void *arg) ...@@ -834,13 +870,24 @@ static void vmstat_stop(struct seq_file *m, void *arg)
m->private = NULL; m->private = NULL;
} }
const struct seq_operations vmstat_op = { static const struct seq_operations vmstat_op = {
.start = vmstat_start, .start = vmstat_start,
.next = vmstat_next, .next = vmstat_next,
.stop = vmstat_stop, .stop = vmstat_stop,
.show = vmstat_show, .show = vmstat_show,
}; };
static int vmstat_open(struct inode *inode, struct file *file)
{
return seq_open(file, &vmstat_op);
}
static const struct file_operations proc_vmstat_file_operations = {
.open = vmstat_open,
.read = seq_read,
.llseek = seq_lseek,
.release = seq_release,
};
#endif /* CONFIG_PROC_FS */ #endif /* CONFIG_PROC_FS */
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
...@@ -898,9 +945,11 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb, ...@@ -898,9 +945,11 @@ static int __cpuinit vmstat_cpuup_callback(struct notifier_block *nfb,
static struct notifier_block __cpuinitdata vmstat_notifier = static struct notifier_block __cpuinitdata vmstat_notifier =
{ &vmstat_cpuup_callback, NULL, 0 }; { &vmstat_cpuup_callback, NULL, 0 };
#endif
static int __init setup_vmstat(void) static int __init setup_vmstat(void)
{ {
#ifdef CONFIG_SMP
int cpu; int cpu;
refresh_zone_stat_thresholds(); refresh_zone_stat_thresholds();
...@@ -908,7 +957,13 @@ static int __init setup_vmstat(void) ...@@ -908,7 +957,13 @@ static int __init setup_vmstat(void)
for_each_online_cpu(cpu) for_each_online_cpu(cpu)
start_cpu_timer(cpu); start_cpu_timer(cpu);
#endif
#ifdef CONFIG_PROC_FS
proc_create("buddyinfo", S_IRUGO, NULL, &fragmentation_file_operations);
proc_create("pagetypeinfo", S_IRUGO, NULL, &pagetypeinfo_file_ops);
proc_create("vmstat", S_IRUGO, NULL, &proc_vmstat_file_operations);
proc_create("zoneinfo", S_IRUGO, NULL, &proc_zoneinfo_file_operations);
#endif
return 0; return 0;
} }
module_init(setup_vmstat) module_init(setup_vmstat)
#endif
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