redonkable/remarkable-linux
redonkable/remarkable-linux
1
0
Fork 0
Code Releases Activity

s390/sclp: replace uninitialized early_event_mask_sccb variable with sccb_early

Browse source 
Commit "s390/sclp: Consolidate early sclp init calls to sclp_early_detect()"
(7b50da53f6) replaced the sclp_event_mask_early()
with sclp_set_event_mask().  The early_event_mask_sccb variable is no longer
initialized but is still used in sclp_has_linemode() and sclp_has_vt220().

Replace early_event_mask_sccb with the sccb_early variable in both
functions.

Signed-off-by: Hendrik Brueckner <brueckner@linux.vnet.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
This commit is contained in:
Hendrik Brueckner 2013-11-29 17:29:20 +01:00 committed by Martin Schwidefsky
parent b2b0154e49
commit 9e3ea19e35
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/s390/char/sclp_early.c
View file

@ -35,7 +35,6 @@ struct read_info_sccb {
u8 _reserved5[4096 - 112]; /* 112-4095 */ u8 _reserved5[4096 - 112]; /* 112-4095 */
} __packed __aligned(PAGE_SIZE); } __packed __aligned(PAGE_SIZE);
static __initdata struct init_sccb early_event_mask_sccb __aligned(PAGE_SIZE);
static __initdata struct read_info_sccb early_read_info_sccb; static __initdata struct read_info_sccb early_read_info_sccb;
static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE); static __initdata char sccb_early[PAGE_SIZE] __aligned(PAGE_SIZE);
static unsigned long sclp_hsa_size; static unsigned long sclp_hsa_size;
@ -113,7 +112,7 @@ static void __init sclp_facilities_detect(void)
bool __init sclp_has_linemode(void) bool __init sclp_has_linemode(void)
{ {
struct init_sccb *sccb = &early_event_mask_sccb; struct init_sccb *sccb = (void *) &sccb_early;
if (sccb->header.response_code != 0x20) if (sccb->header.response_code != 0x20)
return 0; return 0;
@ -126,7 +125,7 @@ bool __init sclp_has_linemode(void)
bool __init sclp_has_vt220(void) bool __init sclp_has_vt220(void)
{ {
struct init_sccb *sccb = &early_event_mask_sccb; struct init_sccb *sccb = (void *) &sccb_early;
if (sccb->header.response_code != 0x20) if (sccb->header.response_code != 0x20)
return 0; return 0;