diff options
| author | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 22:26:28 -0500 |
|---|---|---|
| committer | Nicolas Pitre <nicolas.pitre@linaro.org> | 2011-02-22 22:26:28 -0500 |
| commit | 239a14a340ad4a81cfff4075625382d7f78f5258 (patch) | |
| tree | 61c9e195a7c2ab7a189eb511f9c675bb52f006ad /arch/s390/include/asm/cache.h | |
| parent | f60e8ccbfce6b40a112bddef5b4926b7416b4f92 (diff) | |
| parent | f5412be599602124d2bdd49947b231dd77c0bf99 (diff) | |
Merge commit 'v2.6.38-rc6' into linaro-2.6.38
Diffstat (limited to 'arch/s390/include/asm/cache.h')
| -rw-r--r-- | arch/s390/include/asm/cache.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/s390/include/asm/cache.h b/arch/s390/include/asm/cache.h index 24aafa68b64..2a30d5ac066 100644 --- a/arch/s390/include/asm/cache.h +++ b/arch/s390/include/asm/cache.h @@ -13,6 +13,7 @@ #define L1_CACHE_BYTES 256 #define L1_CACHE_SHIFT 8 +#define NET_SKB_PAD 32 #define __read_mostly __attribute__((__section__(".data..read_mostly"))) |