diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 14:55:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-02-21 14:55:49 -0800 |
| commit | f85cca6b25971a09efbe4c6a3ae405d40c8f86da (patch) | |
| tree | 9eb12a010e8677fdf42316464185c638341c2644 /arch/s390/include/asm/cache.h | |
| parent | 6f576d57f1fa0d6026b495d8746d56d949989161 (diff) | |
| parent | dd30ac327481f1663b6526fa9fa078569188b7cc (diff) | |
Merge branch 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6
* 'for-linus' of git://git390.marist.edu/pub/scm/linux-2.6:
[S390] net: provide architecture specific NET_SKB_PAD
[S390] atomic: use inline asm
[S390] correct ipl parameter block safe guard
[S390] atomic: use ACCESS_ONCE() for atomic_read()
[S390] dasd: correct device table
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"))) |