From: David S. Miller Date: Fri, 7 May 2010 05:01:53 +0000 (-0700) Subject: microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides. X-Git-Tag: v2.6.35-rc1~473^2~247 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=39e0786d3cf39c6d2f47b4818ae2da8b8ebc9ce2;p=platform%2Fupstream%2Fkernel-adaptation-pc.git microblaze: Kill NET_SKB_PAD and NET_IP_ALIGN overrides. NET_IP_ALIGN defaults to 2, no need to override. NET_SKB_PAD is now 64, which is much larger than microblaze's L1_CACHE_SIZE so no need to override that either. Signed-off-by: David S. Miller --- diff --git a/arch/microblaze/include/asm/system.h b/arch/microblaze/include/asm/system.h index 48c4f03..b1e2f07 100644 --- a/arch/microblaze/include/asm/system.h +++ b/arch/microblaze/include/asm/system.h @@ -97,14 +97,4 @@ 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 */