git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'vmwgfx-fixes-5.1' of git://people.freedesktop.org/~thomash/linux into...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
mach-tegra
/
reset-handler.S
diff --git
a/arch/arm/mach-tegra/reset-handler.S
b/arch/arm/mach-tegra/reset-handler.S
index 805f306fa6f707f055878a31f00a2f412a89f9c5..e22ccf87eded394ff99df3187ddf5309f886fdc4 100644
(file)
--- a/
arch/arm/mach-tegra/reset-handler.S
+++ b/
arch/arm/mach-tegra/reset-handler.S
@@
-172,7
+172,7
@@
after_errata:
mov32 r5, TEGRA_IRAM_BASE + TEGRA_IRAM_RESET_HANDLER_OFFSET
mov r0, #CPU_NOT_RESETTABLE
cmp r10, #0
- str
neb
r0, [r5, #__tegra20_cpu1_resettable_status_offset]
+ str
bne
r0, [r5, #__tegra20_cpu1_resettable_status_offset]
1:
#endif