diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 12:07:48 (GMT) |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2012-05-08 12:07:48 (GMT) |
| commit | 67ba5293f705eb1d1b98710e5ccb0f615936a6fc (patch) | |
| tree | cdb4cfd94033b5c0f42eeb4de368802049880a12 /arch/arm/include/asm/tls.h | |
| parent | 86627c93b35082f7a0e4d3111546943984b932c7 (diff) | |
| parent | d909a81b198a397593495508c4a5755fe95552fb (diff) | |
| download | linux-fsl-qoriq-67ba5293f705eb1d1b98710e5ccb0f615936a6fc.tar.xz | |
Merge branch 'smp/threadalloc' into smp/hotplug
Reason: Pull in the separate branch which was created so arch/tile can
base further work on it.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/arm/include/asm/tls.h')
| -rw-r--r-- | arch/arm/include/asm/tls.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h index 60843eb..73409e6 100644 --- a/arch/arm/include/asm/tls.h +++ b/arch/arm/include/asm/tls.h @@ -7,6 +7,8 @@ .macro set_tls_v6k, tp, tmp1, tmp2 mcr p15, 0, \tp, c13, c0, 3 @ set TLS register + mov \tmp1, #0 + mcr p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register .endm .macro set_tls_v6, tp, tmp1, tmp2 @@ -15,6 +17,8 @@ mov \tmp2, #0xffff0fff tst \tmp1, #HWCAP_TLS @ hardware TLS available? mcrne p15, 0, \tp, c13, c0, 3 @ yes, set TLS register + movne \tmp1, #0 + mcrne p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register streq \tp, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 .endm |