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 'for-linus' of git://neil.brown.name/md
[sfrench/cifs-2.6.git]
/
arch
/
powerpc
/
kernel
/
align.c
diff --git
a/arch/powerpc/kernel/align.c
b/arch/powerpc/kernel/align.c
index 73cb6a3229ae40f3da6a5b080f8757f486325872..5ffcfaa77d6acf49d9902e2ab2aed650ab1fdc85 100644
(file)
--- a/
arch/powerpc/kernel/align.c
+++ b/
arch/powerpc/kernel/align.c
@@
-187,7
+187,7
@@
static struct aligninfo aligninfo[128] = {
{ 4, ST+F+S+U }, /* 11 1 1010: stfsux */
{ 8, ST+F+U }, /* 11 1 1011: stfdux */
INVALID, /* 11 1 1100 */
-
INVALID, /* 11 1 1101
*/
+
{ 4, LD+F }, /* 11 1 1101: lfiwzx
*/
INVALID, /* 11 1 1110 */
INVALID, /* 11 1 1111 */
};