diff --git a/[refs] b/[refs] index 138845361715..83d372961bf6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ca08de05ed83b7c2029c742ef3310a284b7790ee +refs/heads/master: 5a291321d6b7ab40923b9a42b36746f7b5ca0055 diff --git a/trunk/include/asm-s390/cache.h b/trunk/include/asm-s390/cache.h index cdf431b061bb..9b866816863c 100644 --- a/trunk/include/asm-s390/cache.h +++ b/trunk/include/asm-s390/cache.h @@ -14,8 +14,6 @@ #define L1_CACHE_BYTES 256 #define L1_CACHE_SHIFT 8 -#define ARCH_KMALLOC_MINALIGN 8 - #define __read_mostly __attribute__((__section__(".data.read_mostly"))) #endif