git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
vserver 2.0 rc7
[linux-2.6.git]
/
drivers
/
video
/
console
/
promcon.c
diff --git
a/drivers/video/console/promcon.c
b/drivers/video/console/promcon.c
index
fec664e
..
04f42fc
100644
(file)
--- a/
drivers/video/console/promcon.c
+++ b/
drivers/video/console/promcon.c
@@
-155,9
+155,9
@@
promcon_init_unimap(struct vc_data *conp)
k++;
}
set_fs(KERNEL_DS);
k++;
}
set_fs(KERNEL_DS);
- con_clear_unimap(conp
->vc_num
, NULL);
- con_set_unimap(conp
->vc_num
, k, p);
- con_protect_unimap(conp
->vc_num
, 1);
+ con_clear_unimap(conp, NULL);
+ con_set_unimap(conp, k, p);
+ con_protect_unimap(conp, 1);
set_fs(old_fs);
kfree(p);
}
set_fs(old_fs);
kfree(p);
}
@@
-175,7
+175,7
@@
promcon_init(struct vc_data *conp, int init)
p = *conp->vc_uni_pagedir_loc;
if (conp->vc_uni_pagedir_loc == &conp->vc_uni_pagedir ||
!--conp->vc_uni_pagedir_loc[1])
p = *conp->vc_uni_pagedir_loc;
if (conp->vc_uni_pagedir_loc == &conp->vc_uni_pagedir ||
!--conp->vc_uni_pagedir_loc[1])
- con_free_unimap(conp
->vc_num
);
+ con_free_unimap(conp);
conp->vc_uni_pagedir_loc = promcon_uni_pagedir;
promcon_uni_pagedir[1]++;
if (!promcon_uni_pagedir[0] && p) {
conp->vc_uni_pagedir_loc = promcon_uni_pagedir;
promcon_uni_pagedir[1]++;
if (!promcon_uni_pagedir[0] && p) {
@@
-183,7
+183,7
@@
promcon_init(struct vc_data *conp, int init)
}
if (!init) {
if (conp->vc_cols != pw + 1 || conp->vc_rows != ph + 1)
}
if (!init) {
if (conp->vc_cols != pw + 1 || conp->vc_rows != ph + 1)
- vc_resize(conp
->vc_num
, pw + 1, ph + 1);
+ vc_resize(conp, pw + 1, ph + 1);
}
}
}
}
@@
-192,9
+192,9
@@
promcon_deinit(struct vc_data *conp)
{
/* When closing the last console, reset video origin */
if (!--promcon_uni_pagedir[1])
{
/* When closing the last console, reset video origin */
if (!--promcon_uni_pagedir[1])
- con_free_unimap(conp
->vc_num
);
+ con_free_unimap(conp);
conp->vc_uni_pagedir_loc = &conp->vc_uni_pagedir;
conp->vc_uni_pagedir_loc = &conp->vc_uni_pagedir;
- con_set_default_unimap(conp
->vc_num
);
+ con_set_default_unimap(conp);
}
static int
}
static int