From be9d39250d8e37fa8c38c79be90147ba01c5e670 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 18 Oct 2012 13:13:41 +0200 Subject: [PATCH] --- yaml --- r: 334742 b: refs/heads/master c: d18f99c28bab882f42949363658da5cf1d2f624f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/s390/kernel/cache.c | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 79262e60729f..e2ce68141457 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c985cb37f1b39c2c8035af741a2a0b79f1fbaca7 +refs/heads/master: d18f99c28bab882f42949363658da5cf1d2f624f diff --git a/trunk/arch/s390/kernel/cache.c b/trunk/arch/s390/kernel/cache.c index 8df8d8a19c98..64b24650e4f8 100644 --- a/trunk/arch/s390/kernel/cache.c +++ b/trunk/arch/s390/kernel/cache.c @@ -59,8 +59,8 @@ enum { enum { CACHE_TI_UNIFIED = 0, - CACHE_TI_INSTRUCTION = 0, - CACHE_TI_DATA, + CACHE_TI_DATA = 0, + CACHE_TI_INSTRUCTION, }; struct cache_info { @@ -121,7 +121,10 @@ static int __init cache_add(int level, int private, int type) cache = kzalloc(sizeof(*cache), GFP_KERNEL); if (!cache) return -ENOMEM; - ti = type == CACHE_TYPE_DATA ? CACHE_TI_DATA : CACHE_TI_UNIFIED; + if (type == CACHE_TYPE_INSTRUCTION) + ti = CACHE_TI_INSTRUCTION; + else + ti = CACHE_TI_UNIFIED; cache->size = ecag(EXTRACT_SIZE, level, ti); cache->line_size = ecag(EXTRACT_LINE_SIZE, level, ti); cache->associativity = ecag(EXTRACT_ASSOCIATIVITY, level, ti);