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

Commit cd5dead9 authored by Sebastian Ott's avatar Sebastian Ott Committed by Martin Schwidefsky
Browse files

s390/cio: simplify css_generate_pgid 



Simplify the css_generate_pgid code by using stap() independent of
CONFIG_SMP. For !CONFIG_SMP builds stap() will deliver the address
of the cpu we IPL'ed from (which can be != 0).

Note: the ifdef was likely added to be compatible with _very_ old
machines which we don't support anyway.

Reviewed-by: default avatarPeter Oberparleiter <oberpar@linux.vnet.ibm.com>
Signed-off-by: default avatarSebastian Ott <sebott@linux.vnet.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 230ccb37

drivers/s390/cio/css.c

+0 −5
Original line number Diff line number Diff line
@@ -702,17 +702,12 @@ css_generate_pgid(struct channel_subsystem *css, u32 tod_high) 
		css->global_pgid.pgid_high.ext_cssid.version = 0x80;

		css->global_pgid.pgid_high.ext_cssid.cssid = css->cssid;

	} else {

#ifdef CONFIG_SMP

		css->global_pgid.pgid_high.cpu_addr = stap();

#else

		css->global_pgid.pgid_high.cpu_addr = 0;

#endif

	}

	get_cpu_id(&cpu_id);

	css->global_pgid.cpu_id = cpu_id.ident;

	css->global_pgid.cpu_model = cpu_id.machine;

	css->global_pgid.tod_high = tod_high;



}



static void