aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2017-08-14 23:08:03 +0000
committerandroid-build-merger <android-build-merger@google.com>2017-08-14 23:08:03 +0000
commit2937ee18996a5c60bafcabf79a8285f585c640c4 (patch)
tree8e415c04e41506150ef6fca54e88f9b82444e7bb
parent682cb0a686647d3c73be3d1d96a8cdb7c3b0bb31 (diff)
parent9a29413c596d30f210e5e6ce17cce21dc985e30a (diff)
downloadv4.4-2937ee18996a5c60bafcabf79a8285f585c640c4.tar.gz
BACKPORT: arm64: asm-offsets: remove unused definitions am: d6d869da8d
am: 9a29413c59 Change-Id: I628bcad566e54a14c114c81e2d88ab2727cfa900
-rw-r--r--arch/arm64/kernel/asm-offsets.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm64/kernel/asm-offsets.c b/arch/arm64/kernel/asm-offsets.c
index b84d8e85d19d..66357a43c097 100644
--- a/arch/arm64/kernel/asm-offsets.c
+++ b/arch/arm64/kernel/asm-offsets.c
@@ -36,8 +36,10 @@ int main(void)
DEFINE(TI_FLAGS, offsetof(struct thread_info, flags));
DEFINE(TI_PREEMPT, offsetof(struct thread_info, preempt_count));
DEFINE(TI_ADDR_LIMIT, offsetof(struct thread_info, addr_limit));
+#ifndef CONFIG_THREAD_INFO_IN_TASK
DEFINE(TI_TASK, offsetof(struct thread_info, task));
DEFINE(TI_CPU, offsetof(struct thread_info, cpu));
+#endif
#ifdef CONFIG_ARM64_SW_TTBR0_PAN
DEFINE(TSK_TI_TTBR0, offsetof(struct thread_info, ttbr0));
#endif