diff --git a/[refs] b/[refs] index 371ed55cfca3..2ee9814ced03 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7657e41a0bd16c9d8b3cefe8fd5d6ac3c25ae4bf +refs/heads/master: dd30ac327481f1663b6526fa9fa078569188b7cc diff --git a/trunk/arch/s390/include/asm/cache.h b/trunk/arch/s390/include/asm/cache.h index 24aafa68b643..2a30d5ac0667 100644 --- a/trunk/arch/s390/include/asm/cache.h +++ b/trunk/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")))