projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' into percpu
[linux-2.6-block.git]
/
arch
/
blackfin
/
mach-common
/
entry.S
diff --git
a/arch/blackfin/mach-common/entry.S
b/arch/blackfin/mach-common/entry.S
index b0ed0b487ff24dbd94b66565f8843afda8feea71..01b2f58dfb95f9e83d8f5cbf8067fb68358e6c9f 100644
(file)
--- a/
arch/blackfin/mach-common/entry.S
+++ b/
arch/blackfin/mach-common/entry.S
@@
-816,8
+816,8
@@
ENDPROC(_resume)
ENTRY(_ret_from_exception)
#ifdef CONFIG_IPIPE
- p2.l = _
per_cpu__
ipipe_percpu_domain;
- p2.h = _
per_cpu__
ipipe_percpu_domain;
+ p2.l = _ipipe_percpu_domain;
+ p2.h = _ipipe_percpu_domain;
r0.l = _ipipe_root;
r0.h = _ipipe_root;
r2 = [p2];