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

Commit 215b3096 authored by Heiko Carstens's avatar Heiko Carstens Committed by Martin Schwidefsky
Browse files

[S390] spp: fix compilation for CONFIG_32BIT 



Fix build breakage for CONFIG_32BIT caused by cd3b70f5
"[S390] virtualization aware cpu measurement"

Signed-off-by: default avatarHeiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: default avatarMartin Schwidefsky <schwidefsky@de.ibm.com>
parent 2ddb3ec4

arch/s390/kernel/asm-offsets.c

+2 −2
Original line number Diff line number Diff line
@@ -132,8 +132,6 @@ int main(void) 
	DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock));

	DEFINE(__LC_MACHINE_FLAGS, offsetof(struct _lowcore, machine_flags));

	DEFINE(__LC_FTRACE_FUNC, offsetof(struct _lowcore, ftrace_func));

	DEFINE(__LC_SIE_HOOK, offsetof(struct _lowcore, sie_hook));

	DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp));

	DEFINE(__LC_IRB, offsetof(struct _lowcore, irb));

	DEFINE(__LC_CPU_TIMER_SAVE_AREA, offsetof(struct _lowcore, cpu_timer_save_area));

	DEFINE(__LC_CLOCK_COMP_SAVE_AREA, offsetof(struct _lowcore, clock_comp_save_area));
@@ -154,6 +152,8 @@ int main(void) 
	DEFINE(__LC_FP_CREG_SAVE_AREA, offsetof(struct _lowcore, fpt_creg_save_area));

	DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr));

	DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data));

	DEFINE(__LC_SIE_HOOK, offsetof(struct _lowcore, sie_hook));

	DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp));

#endif /* CONFIG_32BIT */

	return 0;

}

arch/s390/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -401,7 +401,6 @@ setup_lowcore(void) 
	lc->io_new_psw.mask = psw_kernel_bits;

	lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler;

	lc->clock_comparator = -1ULL;

	lc->cmf_hpp = -1ULL;

	lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE;

	lc->async_stack = (unsigned long)

		__alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0) + ASYNC_SIZE;
@@ -418,6 +417,7 @@ setup_lowcore(void) 
		__ctl_set_bit(14, 29);

	}

#else

	lc->cmf_hpp = -1ULL;

	lc->vdso_per_cpu_data = (unsigned long) &lc->paste[0];

#endif

	lc->sync_enter_timer = S390_lowcore.sync_enter_timer;