diff options
| author | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2013-07-18 16:46:29 +0100 |
| commit | 9bca3d7f7c5865700303e8bce0eac57bab76bcc7 (patch) | |
| tree | 2e31b6d77ab5d206e5cada5590100150774cf3f9 /arch/arm/include/asm/arch_timer.h | |
| parent | 38b52683569174d95efcb60edfb4985be0e023b5 (diff) | |
| parent | dc2ed0827570f07ab496e9742d48eaaac07e4ff8 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/tc2' into linux-linaro-lsk
Conflicts (look like simple add/add stuff):
arch/arm/Kconfig
arch/arm/common/Makefile
Diffstat (limited to 'arch/arm/include/asm/arch_timer.h')
| -rw-r--r-- | arch/arm/include/asm/arch_timer.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/arch_timer.h b/arch/arm/include/asm/arch_timer.h index 7c1bfc0aea0c..4928cdacedf0 100644 --- a/arch/arm/include/asm/arch_timer.h +++ b/arch/arm/include/asm/arch_timer.h @@ -105,7 +105,7 @@ static inline void __cpuinit arch_counter_set_user_access(void) asm volatile("mrc p15, 0, %0, c14, c1, 0" : "=r" (cntkctl)); /* disable user access to everything */ - cntkctl &= ~((3 << 8) | (7 << 0)); + cntkctl &= ~((3 << 8) | (3 << 0)); asm volatile("mcr p15, 0, %0, c14, c1, 0" : : "r" (cntkctl)); } |