diff options
author | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
---|---|---|
committer | Andrey Konovalov <andrey.konovalov@linaro.org> | 2015-10-22 20:03:34 +0300 |
commit | 3985b18650bf2365debb142624f877007b31ada2 (patch) | |
tree | ac8910bfd2e800ac840c93ae84013e5b1f2cd19d /arch/arm64/kernel/smp.c | |
parent | 5b6d12b532bb2e4f114d8a2904eaac1ece43ea20 (diff) | |
parent | 0faf49393534fa4263bfbda7d0566e2e3d1aaf37 (diff) |
Automatically merging tracking-integration-linux-qcomlt into merge-linux-linarotracking-ll-linux-linaro-extra-20151104.0ll-20151022.1linux-linaro-4.3-rc6-2015.10ll_20151022.1
Conflicting files:
Diffstat (limited to 'arch/arm64/kernel/smp.c')
-rw-r--r-- | arch/arm64/kernel/smp.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index dbdaacddd9a5..38d3b6bf27ac 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -63,6 +63,7 @@ * where to place its SVC stack */ struct secondary_data secondary_data; +volatile unsigned long secondary_holding_pen_release = INVALID_HWID; enum ipi_msg_type { IPI_RESCHEDULE, |