diff options
| author | David S. Miller <davem@davemloft.net> | 2010-05-07 05:55:33 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2010-05-07 05:55:33 -0400 |
| commit | e0e33280fedcfa9dd70a54085c4d44d9d53b788f (patch) | |
| tree | bbe5872fddbd7676fabea783a1fb2daf757620d9 | |
| parent | a33fa66bcf365ffe5b79d1ae1d3582cc261ae56e (diff) | |
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>
| -rw-r--r-- | arch/microblaze/include/asm/system.h | 10 |
1 files changed, 10 insertions, 0 deletions
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; | |||
| 97 | 97 | ||
| 98 | #define arch_align_stack(x) (x) | 98 | #define arch_align_stack(x) (x) |
| 99 | 99 | ||
| 100 | /* | ||
| 101 | * MicroBlaze doesn't handle unaligned accesses in hardware. | ||
| 102 | * | ||
| 103 | * Based on this we force the IP header alignment in network drivers. | ||
| 104 | * We also modify NET_SKB_PAD to be a cacheline in size, thus maintaining | ||
| 105 | * cacheline alignment of buffers. | ||
| 106 | */ | ||
| 107 | #define NET_IP_ALIGN 2 | ||
| 108 | #define NET_SKB_PAD L1_CACHE_BYTES | ||
| 109 | |||
| 100 | #endif /* _ASM_MICROBLAZE_SYSTEM_H */ | 110 | #endif /* _ASM_MICROBLAZE_SYSTEM_H */ |