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

Commit 0c688614 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Greg Kroah-Hartman
Browse files

console: move console_init() out of tty_io.c 



All the console driver handling code lives in printk.c.
Move console_init() there as well so console support can still be used
when the TTY code is configured out. No logical changes from this patch.

Signed-off-by: default avatarNicolas Pitre <nico@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 72f1b85a

drivers/tty/tty_io.c

+0 −24
Original line number Diff line number Diff line
@@ -3584,30 +3584,6 @@ void tty_default_fops(struct file_operations *fops) 
	*fops = tty_fops;

}



/*

 * Initialize the console device. This is called *early*, so

 * we can't necessarily depend on lots of kernel help here.

 * Just do some early initializations, and do the complex setup

 * later.

 */

void __init console_init(void)

{

	initcall_t *call;



	/* Setup the default TTY line discipline. */

	n_tty_init();



	/*

	 * set up the console device so that later boot sequences can

	 * inform about problems etc..

	 */

	call = __con_initcall_start;

	while (call < __con_initcall_end) {

		(*call)();

		call++;

	}

}



static char *tty_devnode(struct device *dev, umode_t *mode)

{

	if (!mode)

include/linux/console.h

+2 −0
Original line number Diff line number Diff line
@@ -212,4 +212,6 @@ extern bool vgacon_text_force(void); 
static inline bool vgacon_text_force(void) { return false; }

#endif



extern void console_init(void);



#endif /* _LINUX_CONSOLE_H */

include/linux/tty.h

+4 −3
Original line number Diff line number Diff line
@@ -390,7 +390,6 @@ static inline bool tty_throttled(struct tty_struct *tty) 
}



#ifdef CONFIG_TTY

extern void console_init(void);

extern void tty_kref_put(struct tty_struct *tty);

extern struct pid *tty_get_pgrp(struct tty_struct *tty);

extern void tty_vhangup_self(void);
@@ -402,8 +401,6 @@ extern struct tty_struct *get_current_tty(void); 
extern int __init tty_init(void);

extern const char *tty_name(const struct tty_struct *tty);

#else

static inline void console_init(void)

{ }

static inline void tty_kref_put(struct tty_struct *tty)

{ }

static inline struct pid *tty_get_pgrp(struct tty_struct *tty)
@@ -669,7 +666,11 @@ extern int tty_ldisc_receive_buf(struct tty_ldisc *ld, const unsigned char *p, 


/* n_tty.c */

extern void n_tty_inherit_ops(struct tty_ldisc_ops *ops);

#ifdef CONFIG_TTY

extern void __init n_tty_init(void);

#else

static inline void n_tty_init(void) { }

#endif



/* tty_audit.c */

#ifdef CONFIG_AUDIT

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <linux/initrd.h>

#include <linux/bootmem.h>

#include <linux/acpi.h>

#include <linux/tty.h>

#include <linux/console.h>

#include <linux/nmi.h>

#include <linux/percpu.h>

#include <linux/kmod.h>

kernel/printk/printk.c

+24 −0
Original line number Diff line number Diff line
@@ -2610,6 +2610,30 @@ int unregister_console(struct console *console) 
}

EXPORT_SYMBOL(unregister_console);



/*

 * Initialize the console device. This is called *early*, so

 * we can't necessarily depend on lots of kernel help here.

 * Just do some early initializations, and do the complex setup

 * later.

 */

void __init console_init(void)

{

	initcall_t *call;



	/* Setup the default TTY line discipline. */

	n_tty_init();



	/*

	 * set up the console device so that later boot sequences can

	 * inform about problems etc..

	 */

	call = __con_initcall_start;

	while (call < __con_initcall_end) {

		(*call)();

		call++;

	}

}



/*

 * Some boot consoles access data that is in the init section and which will

 * be discarded after the initcalls have been run. To make sure that no code