git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branches 'msm-fixes' and 'msm-video' of git://codeaurora.org/quic/kernel/dwalke...
[pandora-kernel.git]
/
arch
/
alpha
/
kernel
/
srmcons.c
diff --git
a/arch/alpha/kernel/srmcons.c
b/arch/alpha/kernel/srmcons.c
index
9d7dff2
..
783f4e5
100644
(file)
--- a/
arch/alpha/kernel/srmcons.c
+++ b/
arch/alpha/kernel/srmcons.c
@@
-164,9
+164,9
@@
srmcons_get_private_struct(struct srmcons_private **ps)
int retval = 0;
if (srmconsp == NULL) {
int retval = 0;
if (srmconsp == NULL) {
+ srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
spin_lock_irqsave(&srmconsp_lock, flags);
spin_lock_irqsave(&srmconsp_lock, flags);
- srmconsp = kmalloc(sizeof(*srmconsp), GFP_KERNEL);
if (srmconsp == NULL)
retval = -ENOMEM;
else {
if (srmconsp == NULL)
retval = -ENOMEM;
else {
@@
-229,7
+229,7
@@
srmcons_close(struct tty_struct *tty, struct file *filp)
static struct tty_driver *srmcons_driver;
static struct tty_driver *srmcons_driver;
-static struct tty_operations srmcons_ops = {
+static
const
struct tty_operations srmcons_ops = {
.open = srmcons_open,
.close = srmcons_close,
.write = srmcons_write,
.open = srmcons_open,
.close = srmcons_close,
.write = srmcons_write,
@@
-289,7
+289,7
@@
srm_console_device(struct console *co, int *index)
return srmcons_driver;
}
return srmcons_driver;
}
-static int
__init
+static int
srm_console_setup(struct console *co, char *options)
{
return 0;
srm_console_setup(struct console *co, char *options)
{
return 0;
@@
-300,7
+300,7
@@
static struct console srmcons = {
.write = srm_console_write,
.device = srm_console_device,
.setup = srm_console_setup,
.write = srm_console_write,
.device = srm_console_device,
.setup = srm_console_setup,
- .flags = CON_PRINTBUFFER,
+ .flags = CON_PRINTBUFFER
| CON_BOOT
,
.index = -1,
};
.index = -1,
};