Merge remote-tracking branches 'asoc/topic/fsl-easi', 'asoc/topic/fsl-sai', 'asoc...

[firefly-linux-kernel-4.4.55.git] / arch / metag / kernel / cachepart.c

diff --git a/arch/metag/kernel/cachepart.c b/arch/metag/kernel/cachepart.c
index 0a2385fa2a1d44fca40f6b5e74be956dfb9268de..04b7d4f8429ac399ba74c34a39722311f052da3b 100644 (file)
--- a/arch/metag/kernel/cachepart.c
+++ b/arch/metag/kernel/cachepart.c
@@ -55,7 +55,7 @@ unsigned int get_global_icache_size(void)
        return (get_icache_size() * ((temp >> SYSC_xCPARTG_AND_S) + 1)) >> 4;
 }
 
-static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
+static int get_thread_cache_size(unsigned int cache, int thread_id)
 {
        unsigned int cache_size;
        unsigned int t_cache_part;
@@ -94,7 +94,7 @@ static unsigned int get_thread_cache_size(unsigned int cache, int thread_id)
 
 void check_for_cache_aliasing(int thread_id)
 {
-       unsigned int thread_cache_size;
+       int thread_cache_size;
        unsigned int cache_type;
        for (cache_type = ICACHE; cache_type <= DCACHE; cache_type++) {
                thread_cache_size =