commit 215b3096371907e5d866bb219be7ef3d5ce6c083 · tjh.dev/kernel

tjh.dev / kernel

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

[S390] spp: fix compilation for CONFIG_32BIT

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

Signed-off-by: Heiko Carstens <heiko.carstens@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>

authored by Heiko Carstens and committed by Martin Schwidefsky 15 years ago 215b3096 2ddb3ec4

+3 -3

2 changed files

expand all

unified split

arch

s390

kernel

asm-offsets.c

setup.c

+2 -2

arch/s390/kernel/asm-offsets.c

··· 132 DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock)); 133 DEFINE(__LC_MACHINE_FLAGS, offsetof(struct _lowcore, machine_flags)); 134 DEFINE(__LC_FTRACE_FUNC, offsetof(struct _lowcore, ftrace_func)); 135 - DEFINE(__LC_SIE_HOOK, offsetof(struct _lowcore, sie_hook)); 136 - DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp)); 137 DEFINE(__LC_IRB, offsetof(struct _lowcore, irb)); 138 DEFINE(__LC_CPU_TIMER_SAVE_AREA, offsetof(struct _lowcore, cpu_timer_save_area)); 139 DEFINE(__LC_CLOCK_COMP_SAVE_AREA, offsetof(struct _lowcore, clock_comp_save_area)); ··· 152 DEFINE(__LC_FP_CREG_SAVE_AREA, offsetof(struct _lowcore, fpt_creg_save_area)); 153 DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr)); 154 DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data)); 155 #endif /* CONFIG_32BIT */ 156 return 0; 157 }

··· 132 DEFINE(__LC_MCCK_CLOCK, offsetof(struct _lowcore, mcck_clock)); 133 DEFINE(__LC_MACHINE_FLAGS, offsetof(struct _lowcore, machine_flags)); 134 DEFINE(__LC_FTRACE_FUNC, offsetof(struct _lowcore, ftrace_func)); 135 DEFINE(__LC_IRB, offsetof(struct _lowcore, irb)); 136 DEFINE(__LC_CPU_TIMER_SAVE_AREA, offsetof(struct _lowcore, cpu_timer_save_area)); 137 DEFINE(__LC_CLOCK_COMP_SAVE_AREA, offsetof(struct _lowcore, clock_comp_save_area)); ··· 154 DEFINE(__LC_FP_CREG_SAVE_AREA, offsetof(struct _lowcore, fpt_creg_save_area)); 155 DEFINE(__LC_LAST_BREAK, offsetof(struct _lowcore, breaking_event_addr)); 156 DEFINE(__LC_VDSO_PER_CPU, offsetof(struct _lowcore, vdso_per_cpu_data)); 157 + DEFINE(__LC_SIE_HOOK, offsetof(struct _lowcore, sie_hook)); 158 + DEFINE(__LC_CMF_HPP, offsetof(struct _lowcore, cmf_hpp)); 159 #endif /* CONFIG_32BIT */ 160 return 0; 161 }

+1 -1

arch/s390/kernel/setup.c

··· 401 lc->io_new_psw.mask = psw_kernel_bits; 402 lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler; 403 lc->clock_comparator = -1ULL; 404 - lc->cmf_hpp = -1ULL; 405 lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE; 406 lc->async_stack = (unsigned long) 407 __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0) + ASYNC_SIZE; ··· 417 __ctl_set_bit(14, 29); 418 } 419 #else 420 lc->vdso_per_cpu_data = (unsigned long) &lc->paste[0]; 421 #endif 422 lc->sync_enter_timer = S390_lowcore.sync_enter_timer;

··· 401 lc->io_new_psw.mask = psw_kernel_bits; 402 lc->io_new_psw.addr = PSW_ADDR_AMODE | (unsigned long) io_int_handler; 403 lc->clock_comparator = -1ULL; 404 lc->kernel_stack = ((unsigned long) &init_thread_union) + THREAD_SIZE; 405 lc->async_stack = (unsigned long) 406 __alloc_bootmem(ASYNC_SIZE, ASYNC_SIZE, 0) + ASYNC_SIZE; ··· 418 __ctl_set_bit(14, 29); 419 } 420 #else 421 + lc->cmf_hpp = -1ULL; 422 lc->vdso_per_cpu_data = (unsigned long) &lc->paste[0]; 423 #endif 424 lc->sync_enter_timer = S390_lowcore.sync_enter_timer;