The patch titled
unaligned access in sk_run_filter()
has been removed from the -mm tree. Its filename is
unaligned-access-in-sk_run_filter.patch
This patch was probably dropped from -mm because
it has now been merged into a subsystem tree or
into Linus's tree, or because it was folded into
its parent patch in the -mm tree.
From: Kirill Korotaev <dev@xxxxxxxxxx>
Fix unaligned access warnings noticed on IA64 in sk_run_filter(). 'ptr'
can be unaligned.
Signed-off-by: Dmitry Mishin <dim@xxxxxxxxxx>
Signed-off-by: Kirill Korotaev <dev@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
net/core/filter.c | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff -puN net/core/filter.c~unaligned-access-in-sk_run_filter net/core/filter.c
--- devel/net/core/filter.c~unaligned-access-in-sk_run_filter 2006-04-17 21:29:03.000000000 -0700
+++ devel-akpm/net/core/filter.c 2006-04-17 21:29:03.000000000 -0700
@@ -34,6 +34,7 @@
#include <linux/timer.h>
#include <asm/system.h>
#include <asm/uaccess.h>
+#include <asm/unaligned.h>
#include <linux/filter.h>
/* No hurry in this branch */
@@ -177,7 +178,7 @@ unsigned int sk_run_filter(struct sk_buf
load_w:
ptr = load_pointer(skb, k, 4, &tmp);
if (ptr != NULL) {
- A = ntohl(*(u32 *)ptr);
+ A = ntohl(get_unaligned((u32 *)ptr));
continue;
}
break;
@@ -186,7 +187,7 @@ load_w:
load_h:
ptr = load_pointer(skb, k, 2, &tmp);
if (ptr != NULL) {
- A = ntohs(*(u16 *)ptr);
+ A = ntohs(get_unaligned((u16 *)ptr));
continue;
}
break;
_
Patches currently in -mm which might be from dev@xxxxxxxxxx are
fix-dcache-race-during-umount.patch
fix-dcache-race-during-umount-fix.patch
prune_one_dentry-tweaks.patch
x86_64-ipi-calltraces.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
