proc: move proc_console.c to fs/proc/consoles.c

Filename is supposed to match procfile name for random junk. Add __init while I'm at it. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

proc: move proc_console.c to fs/proc/consoles.c
Filename is supposed to match procfile name for random junk. Add __init while I'm at it. Signed-off-by: Alexey Dobriyan <adobriyan@gmail.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Alexey Dobriyan · Linus Torvalds
1 parent 3740a20c4f
Showing 3 changed files with 115 additions and 115 deletions Side-by-side Diff
fs/proc/Makefile
fs/proc/consoles.c
fs/proc/proc_console.c
@@ -10,12 +10,12 @@
 proc-y       += inode.o root.o base.o generic.o array.o \
 		proc_tty.o
 proc-y	+= cmdline.o
+proc-y	+= consoles.o
 proc-y	+= cpuinfo.o
 proc-y	+= devices.o
 proc-y	+= interrupts.o
 proc-y	+= loadavg.o
 proc-y	+= meminfo.o
-proc-y	+= proc_console.o
 proc-y	+= stat.o
 proc-y	+= uptime.o
 proc-y	+= version.o
+/*
+ * Copyright (c) 2010 Werner Fink, Jiri Slaby
+ *
+ * Licensed under GPLv2
+ */
+
+#include <linux/console.h>
+#include <linux/kernel.h>
+#include <linux/proc_fs.h>
+#include <linux/seq_file.h>
+#include <linux/tty_driver.h>
+
+/*
+ * This is handler for /proc/consoles
+ */
+static int show_console_dev(struct seq_file *m, void *v)
+{
+	static const struct {
+		short flag;
+		char name;
+	} con_flags[] = {
+		{ CON_ENABLED,		'E' },
+		{ CON_CONSDEV,		'C' },
+		{ CON_BOOT,		'B' },
+		{ CON_PRINTBUFFER,	'p' },
+		{ CON_BRL,		'b' },
+		{ CON_ANYTIME,		'a' },
+	};
+	char flags[ARRAY_SIZE(con_flags) + 1];
+	struct console *con = v;
+	unsigned int a;
+	int len;
+	dev_t dev = 0;
+
+	if (con->device) {
+		const struct tty_driver *driver;
+		int index;
+		driver = con->device(con, &index);
+		if (driver) {
+			dev = MKDEV(driver->major, driver->minor_start);
+			dev += index;
+		}
+	}
+
+	for (a = 0; a < ARRAY_SIZE(con_flags); a++)
+		flags[a] = (con->flags & con_flags[a].flag) ?
+			con_flags[a].name : ' ';
+	flags[a] = 0;
+
+	seq_printf(m, "%s%d%n", con->name, con->index, &len);
+	len = 21 - len;
+	if (len < 1)
+		len = 1;
+	seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
+			con->write ? 'W' : '-', con->unblank ? 'U' : '-',
+			flags);
+	if (dev)
+		seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
+
+	seq_printf(m, "\n");
+
+	return 0;
+}
+
+static void *c_start(struct seq_file *m, loff_t *pos)
+{
+	struct console *con;
+	loff_t off = 0;
+
+	acquire_console_sem();
+	for_each_console(con)
+		if (off++ == *pos)
+			break;
+
+	return con;
+}
+
+static void *c_next(struct seq_file *m, void *v, loff_t *pos)
+{
+	struct console *con = v;
+	++*pos;
+	return con->next;
+}
+
+static void c_stop(struct seq_file *m, void *v)
+{
+	release_console_sem();
+}
+
+static const struct seq_operations consoles_op = {
+	.start	= c_start,
+	.next	= c_next,
+	.stop	= c_stop,
+	.show	= show_console_dev
+};
+
+static int consoles_open(struct inode *inode, struct file *file)
+{
+	return seq_open(file, &consoles_op);
+}
+
+static const struct file_operations proc_consoles_operations = {
+	.open		= consoles_open,
+	.read		= seq_read,
+	.llseek		= seq_lseek,
+	.release	= seq_release,
+};
+
+static int __init proc_consoles_init(void)
+{
+	proc_create("consoles", 0, NULL, &proc_consoles_operations);
+	return 0;
+}
+module_init(proc_consoles_init);
-/*
- * Copyright (c) 2010 Werner Fink, Jiri Slaby
- *
- * Licensed under GPLv2
- */
-
-#include <linux/console.h>
-#include <linux/kernel.h>
-#include <linux/proc_fs.h>
-#include <linux/seq_file.h>
-#include <linux/tty_driver.h>
-
-/*
- * This is handler for /proc/consoles
- */
-static int show_console_dev(struct seq_file *m, void *v)
-{
-	static const struct {
-		short flag;
-		char name;
-	} con_flags[] = {
-		{ CON_ENABLED,		'E' },
-		{ CON_CONSDEV,		'C' },
-		{ CON_BOOT,		'B' },
-		{ CON_PRINTBUFFER,	'p' },
-		{ CON_BRL,		'b' },
-		{ CON_ANYTIME,		'a' },
-	};
-	char flags[ARRAY_SIZE(con_flags) + 1];
-	struct console *con = v;
-	unsigned int a;
-	int len;
-	dev_t dev = 0;
-
-	if (con->device) {
-		const struct tty_driver *driver;
-		int index;
-		driver = con->device(con, &index);
-		if (driver) {
-			dev = MKDEV(driver->major, driver->minor_start);
-			dev += index;
-		}
-	}
-
-	for (a = 0; a < ARRAY_SIZE(con_flags); a++)
-		flags[a] = (con->flags & con_flags[a].flag) ?
-			con_flags[a].name : ' ';
-	flags[a] = 0;
-
-	seq_printf(m, "%s%d%n", con->name, con->index, &len);
-	len = 21 - len;
-	if (len < 1)
-		len = 1;
-	seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
-			con->write ? 'W' : '-', con->unblank ? 'U' : '-',
-			flags);
-	if (dev)
-		seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
-
-	seq_printf(m, "\n");
-
-	return 0;
-}
-
-static void *c_start(struct seq_file *m, loff_t *pos)
-{
-	struct console *con;
-	loff_t off = 0;
-
-	acquire_console_sem();
-	for_each_console(con)
-		if (off++ == *pos)
-			break;
-
-	return con;
-}
-
-static void *c_next(struct seq_file *m, void *v, loff_t *pos)
-{
-	struct console *con = v;
-	++*pos;
-	return con->next;
-}
-
-static void c_stop(struct seq_file *m, void *v)
-{
-	release_console_sem();
-}
-
-static const struct seq_operations consoles_op = {
-	.start	= c_start,
-	.next	= c_next,
-	.stop	= c_stop,
-	.show	= show_console_dev
-};
-
-static int consoles_open(struct inode *inode, struct file *file)
-{
-	return seq_open(file, &consoles_op);
-}
-
-static const struct file_operations proc_consoles_operations = {
-	.open		= consoles_open,
-	.read		= seq_read,
-	.llseek		= seq_lseek,
-	.release	= seq_release,
-};
-
-static int register_proc_consoles(void)
-{
-	proc_create("consoles", 0, NULL, &proc_consoles_operations);
-	return 0;
-}
-module_init(register_proc_consoles);
...	...	@@ -10,12 +10,12 @@
10	10	proc-y += inode.o root.o base.o generic.o array.o \
11	11	proc_tty.o
12	12	proc-y += cmdline.o
	13	+proc-y += consoles.o
13	14	proc-y += cpuinfo.o
14	15	proc-y += devices.o
15	16	proc-y += interrupts.o
16	17	proc-y += loadavg.o
17	18	proc-y += meminfo.o
18		-proc-y += proc_console.o
19	19	proc-y += stat.o
20	20	proc-y += uptime.o
21	21	proc-y += version.o
	1	+/*
	2	+ * Copyright (c) 2010 Werner Fink, Jiri Slaby
	3	+ *
	4	+ * Licensed under GPLv2
	5	+ */
	6	+
	7	+#include <linux/console.h>
	8	+#include <linux/kernel.h>
	9	+#include <linux/proc_fs.h>
	10	+#include <linux/seq_file.h>
	11	+#include <linux/tty_driver.h>
	12	+
	13	+/*
	14	+ * This is handler for /proc/consoles
	15	+ */
	16	+static int show_console_dev(struct seq_file m, void v)
	17	+{
	18	+ static const struct {
	19	+ short flag;
	20	+ char name;
	21	+ } con_flags[] = {
	22	+ { CON_ENABLED, 'E' },
	23	+ { CON_CONSDEV, 'C' },
	24	+ { CON_BOOT, 'B' },
	25	+ { CON_PRINTBUFFER, 'p' },
	26	+ { CON_BRL, 'b' },
	27	+ { CON_ANYTIME, 'a' },
	28	+ };
	29	+ char flags[ARRAY_SIZE(con_flags) + 1];
	30	+ struct console *con = v;
	31	+ unsigned int a;
	32	+ int len;
	33	+ dev_t dev = 0;
	34	+
	35	+ if (con->device) {
	36	+ const struct tty_driver *driver;
	37	+ int index;
	38	+ driver = con->device(con, &index);
	39	+ if (driver) {
	40	+ dev = MKDEV(driver->major, driver->minor_start);
	41	+ dev += index;
	42	+ }
	43	+ }
	44	+
	45	+ for (a = 0; a < ARRAY_SIZE(con_flags); a++)
	46	+ flags[a] = (con->flags & con_flags[a].flag) ?
	47	+ con_flags[a].name : ' ';
	48	+ flags[a] = 0;
	49	+
	50	+ seq_printf(m, "%s%d%n", con->name, con->index, &len);
	51	+ len = 21 - len;
	52	+ if (len < 1)
	53	+ len = 1;
	54	+ seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
	55	+ con->write ? 'W' : '-', con->unblank ? 'U' : '-',
	56	+ flags);
	57	+ if (dev)
	58	+ seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
	59	+
	60	+ seq_printf(m, "\n");
	61	+
	62	+ return 0;
	63	+}
	64	+
	65	+static void c_start(struct seq_file m, loff_t *pos)
	66	+{
	67	+ struct console *con;
	68	+ loff_t off = 0;
	69	+
	70	+ acquire_console_sem();
	71	+ for_each_console(con)
	72	+ if (off++ == *pos)
	73	+ break;
	74	+
	75	+ return con;
	76	+}
	77	+
	78	+static void c_next(struct seq_file m, void v, loff_t pos)
	79	+{
	80	+ struct console *con = v;
	81	+ ++*pos;
	82	+ return con->next;
	83	+}
	84	+
	85	+static void c_stop(struct seq_file m, void v)
	86	+{
	87	+ release_console_sem();
	88	+}
	89	+
	90	+static const struct seq_operations consoles_op = {
	91	+ .start = c_start,
	92	+ .next = c_next,
	93	+ .stop = c_stop,
	94	+ .show = show_console_dev
	95	+};
	96	+
	97	+static int consoles_open(struct inode inode, struct file file)
	98	+{
	99	+ return seq_open(file, &consoles_op);
	100	+}
	101	+
	102	+static const struct file_operations proc_consoles_operations = {
	103	+ .open = consoles_open,
	104	+ .read = seq_read,
	105	+ .llseek = seq_lseek,
	106	+ .release = seq_release,
	107	+};
	108	+
	109	+static int __init proc_consoles_init(void)
	110	+{
	111	+ proc_create("consoles", 0, NULL, &proc_consoles_operations);
	112	+ return 0;
	113	+}
	114	+module_init(proc_consoles_init);
1		-/*
2		- * Copyright (c) 2010 Werner Fink, Jiri Slaby
3		- *
4		- * Licensed under GPLv2
5		- */
6		-
7		-#include <linux/console.h>
8		-#include <linux/kernel.h>
9		-#include <linux/proc_fs.h>
10		-#include <linux/seq_file.h>
11		-#include <linux/tty_driver.h>
12		-
13		-/*
14		- * This is handler for /proc/consoles
15		- */
16		-static int show_console_dev(struct seq_file m, void v)
17		-{
18		- static const struct {
19		- short flag;
20		- char name;
21		- } con_flags[] = {
22		- { CON_ENABLED, 'E' },
23		- { CON_CONSDEV, 'C' },
24		- { CON_BOOT, 'B' },
25		- { CON_PRINTBUFFER, 'p' },
26		- { CON_BRL, 'b' },
27		- { CON_ANYTIME, 'a' },
28		- };
29		- char flags[ARRAY_SIZE(con_flags) + 1];
30		- struct console *con = v;
31		- unsigned int a;
32		- int len;
33		- dev_t dev = 0;
34		-
35		- if (con->device) {
36		- const struct tty_driver *driver;
37		- int index;
38		- driver = con->device(con, &index);
39		- if (driver) {
40		- dev = MKDEV(driver->major, driver->minor_start);
41		- dev += index;
42		- }
43		- }
44		-
45		- for (a = 0; a < ARRAY_SIZE(con_flags); a++)
46		- flags[a] = (con->flags & con_flags[a].flag) ?
47		- con_flags[a].name : ' ';
48		- flags[a] = 0;
49		-
50		- seq_printf(m, "%s%d%n", con->name, con->index, &len);
51		- len = 21 - len;
52		- if (len < 1)
53		- len = 1;
54		- seq_printf(m, "%*c%c%c%c (%s)", len, ' ', con->read ? 'R' : '-',
55		- con->write ? 'W' : '-', con->unblank ? 'U' : '-',
56		- flags);
57		- if (dev)
58		- seq_printf(m, " %4d:%d", MAJOR(dev), MINOR(dev));
59		-
60		- seq_printf(m, "\n");
61		-
62		- return 0;
63		-}
64		-
65		-static void c_start(struct seq_file m, loff_t *pos)
66		-{
67		- struct console *con;
68		- loff_t off = 0;
69		-
70		- acquire_console_sem();
71		- for_each_console(con)
72		- if (off++ == *pos)
73		- break;
74		-
75		- return con;
76		-}
77		-
78		-static void c_next(struct seq_file m, void v, loff_t pos)
79		-{
80		- struct console *con = v;
81		- ++*pos;
82		- return con->next;
83		-}
84		-
85		-static void c_stop(struct seq_file m, void v)
86		-{
87		- release_console_sem();
88		-}
89		-
90		-static const struct seq_operations consoles_op = {
91		- .start = c_start,
92		- .next = c_next,
93		- .stop = c_stop,
94		- .show = show_console_dev
95		-};
96		-
97		-static int consoles_open(struct inode inode, struct file file)
98		-{
99		- return seq_open(file, &consoles_op);
100		-}
101		-
102		-static const struct file_operations proc_consoles_operations = {
103		- .open = consoles_open,
104		- .read = seq_read,
105		- .llseek = seq_lseek,
106		- .release = seq_release,
107		-};
108		-
109		-static int register_proc_consoles(void)
110		-{
111		- proc_create("consoles", 0, NULL, &proc_consoles_operations);
112		- return 0;
113		-}
114		-module_init(register_proc_consoles);