sugar/linux
1
0
Fork 0
Code Activity

Merge branch 'cleanup' into for-linus

Browse Source 
Conflicts:
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
This commit is contained in:
Russell King
2012-10-04 23:01:28 +01:00
parent 0d7614f09c 9fc31ddc70
commit 43a60c1792
6 changed files with 6 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/kernel/asm-offsets.c
View File

@@ -59,10 +59,12 @@ int main(void)
DEFINE(TI_USED_CP, offsetof(struct thread_info, used_cp));
DEFINE(TI_TP_VALUE, offsetof(struct thread_info, tp_value));
DEFINE(TI_FPSTATE, offsetof(struct thread_info, fpstate));
#ifdef CONFIG_VFP
DEFINE(TI_VFPSTATE, offsetof(struct thread_info, vfpstate));
#ifdef CONFIG_SMP
DEFINE(VFP_CPU, offsetof(union vfp_state, hard.cpu));
#endif
#endif
#ifdef CONFIG_ARM_THUMBEE
DEFINE(TI_THUMBEE_STATE, offsetof(struct thread_info, thumbee_state));
#endif