Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit d197c43d04decb6b1298fa3ef26ea04a9ca7c977

Authored by Joe Perches
Committed by Linus Torvalds
1 parent b9ee979e9d
Exists in smarc-imx_3.14.28_1.0.0_ga and in 1 other branch imx_3.14.28_1.0.0_ga

printk: add console_cmdline.h 

Add an include file for the console_cmdline struct so that the braille
console driver can be separated.

Signed-off-by: Joe Perches <joe@perches.com>
Cc: Samuel Thibault <samuel.thibault@ens-lyon.org>
Cc: Ming Lei <ming.lei@canonical.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 2 changed files with 17 additions and 9 deletions Side-by-side Diff

kernel/printk/console_cmdline.h
Diff comments   View file @ d197c43
  1 +#ifndef _CONSOLE_CMDLINE_H
  2 +#define _CONSOLE_CMDLINE_H
  3 +
  4 +struct console_cmdline
  5 +{
  6 + char name[8]; /* Name of the driver */
  7 + int index; /* Minor dev. to use */
  8 + char *options; /* Options for the driver */
  9 +#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
  10 + char *brl_options; /* Options for braille driver */
  11 +#endif
  12 +};
  13 +
  14 +#endif
kernel/printk/printk.c
Diff comments   View file @ d197c43
... ... @@ -51,6 +51,8 @@
51 51 #define CREATE_TRACE_POINTS
52 52 #include <trace/events/printk.h>
53 53  
  54 +#include "console_cmdline.h"
  55 +
54 56 /* printk's without a loglevel use this.. */
55 57 #define DEFAULT_MESSAGE_LOGLEVEL CONFIG_DEFAULT_MESSAGE_LOGLEVEL
56 58  
57 59  
... ... @@ -105,19 +107,11 @@
105 107 /*
106 108 * Array of consoles built from command line options (console=)
107 109 */
108   -struct console_cmdline
109   -{
110   - char name[8]; /* Name of the driver */
111   - int index; /* Minor dev. to use */
112   - char *options; /* Options for the driver */
113   -#ifdef CONFIG_A11Y_BRAILLE_CONSOLE
114   - char *brl_options; /* Options for braille driver */
115   -#endif
116   -};
117 110  
118 111 #define MAX_CMDLINECONSOLES 8
119 112  
120 113 static struct console_cmdline console_cmdline[MAX_CMDLINECONSOLES];
  114 +
121 115 static int selected_console = -1;
122 116 static int preferred_console = -1;
123 117 int console_set_on_cmdline;