Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ae048112 authored by Alexey Dobriyan's avatar Alexey Dobriyan
Browse files

proc: move /proc/kmsg creation to fs/proc/kmsg.c 



Signed-off-by: default avatarAlexey Dobriyan <adobriyan@gmail.com>
parent 65968928

fs/proc/internal.h

+0 −1
Original line number Diff line number Diff line
@@ -61,7 +61,6 @@ extern const struct file_operations proc_smaps_operations; 
extern const struct file_operations proc_clear_refs_operations;

extern const struct file_operations proc_pagemap_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;



void free_proc_entry(struct proc_dir_entry *de);

fs/proc/kmsg.c

+9 −3
Original line number Diff line number Diff line
@@ -10,13 +10,12 @@ 
#include <linux/time.h>

#include <linux/kernel.h>

#include <linux/poll.h>

#include <linux/proc_fs.h>

#include <linux/fs.h>



#include <asm/uaccess.h>

#include <asm/io.h>



#include "internal.h"



extern wait_queue_head_t log_wait;



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) 
}





const struct file_operations proc_kmsg_operations = {

static const struct file_operations proc_kmsg_operations = {

	.read		= kmsg_read,

	.poll		= kmsg_poll,

	.open		= kmsg_open,

	.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);

fs/proc/proc_misc.c

+0 −3
Original line number Diff line number Diff line
@@ -605,9 +605,6 @@ void __init proc_misc_init(void) 
	proc_symlink("mounts", NULL, "self/mounts");



	/* And now for trickier ones */

#ifdef CONFIG_PRINTK

	proc_create("kmsg", S_IRUSR, NULL, &proc_kmsg_operations);

#endif

#ifdef CONFIG_FILE_LOCKING

	proc_create("locks", 0, NULL, &proc_locks_operations);

#endif