From 2b3b5abdb4d2feb50f61a5fe29fffe143958e771 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Thu, 26 May 2011 09:48:27 +0200 Subject: [PATCH] --- yaml --- r: 252217 b: refs/heads/master c: ac5fa22fd4f27376e4ec41b44279c9992322d7ce h: refs/heads/master i: 252215: 810d62e91bd1bafd18fd6231c3931be132d4ba1c v: v3 --- [refs] | 2 +- trunk/arch/s390/include/asm/topology.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index c955885b026f..3777df95bc4e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b07c9015efcde71ed929ce5ded0268630bb1c95e +refs/heads/master: ac5fa22fd4f27376e4ec41b44279c9992322d7ce diff --git a/trunk/arch/s390/include/asm/topology.h b/trunk/arch/s390/include/asm/topology.h index c5338834ddbd..005d77d8ae2a 100644 --- a/trunk/arch/s390/include/asm/topology.h +++ b/trunk/arch/s390/include/asm/topology.h @@ -7,7 +7,7 @@ extern unsigned char cpu_core_id[NR_CPUS]; extern cpumask_t cpu_core_map[NR_CPUS]; -static inline const struct cpumask *cpu_coregroup_mask(unsigned int cpu) +static inline const struct cpumask *cpu_coregroup_mask(int cpu) { return &cpu_core_map[cpu]; } @@ -21,7 +21,7 @@ static inline const struct cpumask *cpu_coregroup_mask(unsigned int cpu) extern unsigned char cpu_book_id[NR_CPUS]; extern cpumask_t cpu_book_map[NR_CPUS]; -static inline const struct cpumask *cpu_book_mask(unsigned int cpu) +static inline const struct cpumask *cpu_book_mask(int cpu) { return &cpu_book_map[cpu]; }