diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 00:01:28 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2012-10-05 00:01:28 +0200 |
| commit | 43a60c1792b13eed49220af0e1344bf48e3a0677 (patch) | |
| tree | cdacc16876e95df8a4ee7a554d267407ec0cb808 /arch/arm/kernel | |
| parent | Linux 3.6-rc1 (diff) | |
| parent | ARM: Don't unconditionally bloat thread_info (diff) | |
| download | linux-43a60c1792b13eed49220af0e1344bf48e3a0677.tar.xz linux-43a60c1792b13eed49220af0e1344bf48e3a0677.zip | |
Merge branch 'cleanup' into for-linus
Conflicts:
arch/arm/mach-imx/mach-imx27_visstrim_m10.c
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/asm-offsets.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/asm-offsets.c b/arch/arm/kernel/asm-offsets.c index 1429d8989fb9..c985b481192c 100644 --- a/arch/arm/kernel/asm-offsets.c +++ b/arch/arm/kernel/asm-offsets.c @@ -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 |