Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 117648
b: refs/heads/master
c: cf9887f
h: refs/heads/master
v: v3
  • Loading branch information
Alexey Dobriyan committed Oct 23, 2008
1 parent 3761f69 commit 1835b82
Show file tree
Hide file tree
Showing 4 changed files with 31 additions and 11 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 6827400713fa22312ca3b4f47b0e64871c88040c
refs/heads/master: cf9887f102541b8a0adb73f7da9c28d090622010
1 change: 1 addition & 0 deletions trunk/fs/proc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ proc-$(CONFIG_MMU) := mmu.o task_mmu.o

proc-y += inode.o root.o base.o generic.o array.o \
proc_tty.o proc_misc.o
proc-y += cmdline.o
proc-y += loadavg.o
proc-y += meminfo.o
proc-y += uptime.o
Expand Down
29 changes: 29 additions & 0 deletions trunk/fs/proc/cmdline.c
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
#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);
10 changes: 0 additions & 10 deletions trunk/fs/proc/proc_misc.c
Original file line number Diff line number Diff line change
Expand Up @@ -472,15 +472,6 @@ static const struct file_operations proc_interrupts_operations = {
.release = seq_release,
};

static int cmdline_read_proc(char *page, char **start, off_t off,
int count, int *eof, void *data)
{
int len;

len = sprintf(page, "%s\n", saved_command_line);
return proc_calc_metrics(page, start, off, count, eof, len);
}

#ifdef CONFIG_FILE_LOCKING
static int locks_open(struct inode *inode, struct file *filp)
{
Expand Down Expand Up @@ -641,7 +632,6 @@ void __init proc_misc_init(void)
char *name;
int (*read_proc)(char*,char**,off_t,int,int*,void*);
} *p, simple_ones[] = {
{"cmdline", cmdline_read_proc},
{"execdomains", execdomains_read_proc},
{NULL,}
};
Expand Down

0 comments on commit 1835b82

Please sign in to comment.