From: David S. Miller <davem@davemloft.net>
Date: Fri, 7 May 2010 09:55:33 +0000 (-0700)
Subject: Revert "microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides."
X-Git-Tag: v2.6.35-rc1~473^2~235
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=e0e33280fedcfa9dd70a54085c4d44d9d53b788f;p=linux.git

Revert "microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides."

This reverts commit 39e0786d3cf39c6d2f47b4818ae2da8b8ebc9ce2.

On request from microblaze developers, they are going to handle
this differently.

Signed-off-by: David S. Miller <davem@davemloft.net>
---

diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h
index b1e2f0710098..48c4f0335e3f 100644
--- a/arch/microblaze/include/asm/system.h
+++ b/arch/microblaze/include/asm/system.h
@@ -97,4 +97,14 @@ extern struct dentry *of_debugfs_root;
 
 #define arch_align_stack(x) (x)
 
+/*
+ * MicroBlaze doesn't handle unaligned accesses in hardware.
+ *
+ * Based on this we force the IP header alignment in network drivers.
+ * We also modify NET_SKB_PAD to be a cacheline in size, thus maintaining
+ * cacheline alignment of buffers.
+ */
+#define NET_IP_ALIGN	2
+#define NET_SKB_PAD	L1_CACHE_BYTES
+
 #endif /* _ASM_MICROBLAZE_SYSTEM_H */