diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:52:30 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-31 15:52:30 -0500 |
| commit | 4b75679f60d0ce780609cbff249769b669f4fb69 (patch) | |
| tree | 2c8890020b5e7d340036acb01f73a6e53feb038d /include/asm-powerpc | |
| parent | 30c14e40ed85469f166b5effdab6705c73c5cd5e (diff) | |
| parent | 025be81e83043f20538dcced1e12c5f8d152fbdb (diff) | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6
* master.kernel.org:/pub/scm/linux/kernel/git/davem/net-2.6:
[NET]: Allow skb headroom to be overridden
[TCP]: Kill unused extern decl for tcp_v4_hash_connecting()
[NET]: add SO_RCVBUF comment
[NET]: Deinline some larger functions from netdevice.h
[DCCP]: Use NULL for pointers, comfort sparse.
[DECNET]: Fix refcount
Diffstat (limited to 'include/asm-powerpc')
| -rw-r--r-- | include/asm-powerpc/system.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/include/asm-powerpc/system.h b/include/asm-powerpc/system.h index 65f5a7b2646b..d075725bf444 100644 --- a/include/asm-powerpc/system.h +++ b/include/asm-powerpc/system.h | |||
| @@ -365,8 +365,11 @@ __cmpxchg(volatile void *ptr, unsigned long old, unsigned long new, | |||
| 365 | * powers of 2 writes until it reaches sufficient alignment). | 365 | * powers of 2 writes until it reaches sufficient alignment). |
| 366 | * | 366 | * |
| 367 | * Based on this we disable the IP header alignment in network drivers. | 367 | * Based on this we disable the IP header alignment in network drivers. |
| 368 | * We also modify NET_SKB_PAD to be a cacheline in size, thus maintaining | ||
| 369 | * cacheline alignment of buffers. | ||
| 368 | */ | 370 | */ |
| 369 | #define NET_IP_ALIGN 0 | 371 | #define NET_IP_ALIGN 0 |
| 372 | #define NET_SKB_PAD L1_CACHE_BYTES | ||
| 370 | #endif | 373 | #endif |
| 371 | 374 | ||
| 372 | #define arch_align_stack(x) (x) | 375 | #define arch_align_stack(x) (x) |