git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'upstream' of git://ftp.linux-mips.org/pub/scm/upstream-linus
[pandora-kernel.git]
/
arch
/
powerpc
/
include
/
asm
/
feature-fixups.h
diff --git
a/arch/powerpc/include/asm/feature-fixups.h
b/arch/powerpc/include/asm/feature-fixups.h
index
cbd4dfa
..
96a7d06
100644
(file)
--- a/
arch/powerpc/include/asm/feature-fixups.h
+++ b/
arch/powerpc/include/asm/feature-fixups.h
@@
-165,7
+165,7
@@
label##2: \
.pushsection sect,"a"; \
.align 2; \
label##3: \
-
.long label##1b-label##3b;
\
+
FTR_ENTRY_OFFSET label##1b-label##3b;
\
.popsection;
#endif /* __ASM_POWERPC_FEATURE_FIXUPS_H */