Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux

Pull s390 fixes from Martin Schwidefsky:
 "Two patches to save some memory if CONFIG_NR_CPUS is large, a changed
  default for the use of compare-and-delay, and a couple of bug fixes"

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux:
  s390/spinlock: disabled compare-and-delay by default
  s390/mm: align 64-bit PIE binaries to 4GB
  s390/cacheinfo: coding style changes
  s390/cacheinfo: fix shared cpu masks
  s390/smp: reduce size of struct pcpu
  s390/topology: convert cpu_topology array to per cpu variable
  s390/topology: delay initialization of topology cpu masks
  s390/vdso: fix clock_gettime for CLOCK_THREAD_CPUTIME_ID, -2 and -3

8 files changed, 119 insertions, 142 deletions

diff --git a/arch/s390/include/asm/topology.h b/arch/s390/include/asm/topology.h
index c4fbb9527c5c..b1453a2ae1ca 100644
--- a/arch/s390/include/asm/topology.h
+++ b/arch/s390/include/asm/topology.h
@@ -18,15 +18,15 @@ struct cpu_topology_s390 {
         cpumask_t book_mask;
 };
 
-extern struct cpu_topology_s390 cpu_topology[NR_CPUS];
+DECLARE_PER_CPU(struct cpu_topology_s390, cpu_topology);
 
-#define topology_physical_package_id(cpu)       (cpu_topology[cpu].socket_id)
-#define topology_thread_id(cpu)                 (cpu_topology[cpu].thread_id)
-#define topology_thread_cpumask(cpu)            (&cpu_topology[cpu].thread_mask)
-#define topology_core_id(cpu)                   (cpu_topology[cpu].core_id)
-#define topology_core_cpumask(cpu)              (&cpu_topology[cpu].core_mask)
-#define topology_book_id(cpu)                   (cpu_topology[cpu].book_id)
-#define topology_book_cpumask(cpu)              (&cpu_topology[cpu].book_mask)
+#define topology_physical_package_id(cpu) (per_cpu(cpu_topology, cpu).socket_id)
+#define topology_thread_id(cpu)           (per_cpu(cpu_topology, cpu).thread_id)
+#define topology_thread_cpumask(cpu)      (&per_cpu(cpu_topology, cpu).thread_mask)
+#define topology_core_id(cpu)             (per_cpu(cpu_topology, cpu).core_id)
+#define topology_core_cpumask(cpu)        (&per_cpu(cpu_topology, cpu).core_mask)
+#define topology_book_id(cpu)             (per_cpu(cpu_topology, cpu).book_id)
+#define topology_book_cpumask(cpu)        (&per_cpu(cpu_topology, cpu).book_mask)
 
 #define mc_capable() 1
 
@@ -51,14 +51,6 @@ static inline void topology_expect_change(void) { }
 #define POLARIZATION_VM         (2)
 #define POLARIZATION_VH         (3)
 
-#ifdef CONFIG_SCHED_BOOK
-void s390_init_cpu_topology(void);
-#else
-static inline void s390_init_cpu_topology(void)
-{
-};
-#endif
-
 #include <asm-generic/topology.h>
 
 #endif /* _ASM_S390_TOPOLOGY_H */
diff --git a/arch/s390/kernel/cache.c b/arch/s390/kernel/cache.c
index 632fa06ea162..0969d113b3d6 100644
--- a/arch/s390/kernel/cache.c
+++ b/arch/s390/kernel/cache.c
@@ -91,12 +91,9 @@ static inline enum cache_type get_cache_type(struct cache_info *ci, int level)
 {
         if (level >= CACHE_MAX_LEVEL)
                 return CACHE_TYPE_NOCACHE;
-
         ci += level;
-
         if (ci->scope != CACHE_SCOPE_SHARED && ci->scope != CACHE_SCOPE_PRIVATE)
                 return CACHE_TYPE_NOCACHE;
-
         return cache_type_map[ci->type];
 }
 
@@ -111,23 +108,19 @@ static inline unsigned long ecag(int ai, int li, int ti)
 }
 
 static void ci_leaf_init(struct cacheinfo *this_leaf, int private,
-                         enum cache_type type, unsigned int level)
+                         enum cache_type type, unsigned int level, int cpu)
 {
         int ti, num_sets;
-        int cpu = smp_processor_id();
 
         if (type == CACHE_TYPE_INST)
                 ti = CACHE_TI_INSTRUCTION;
         else
                 ti = CACHE_TI_UNIFIED;
-
         this_leaf->level = level + 1;
         this_leaf->type = type;
         this_leaf->coherency_line_size = ecag(EXTRACT_LINE_SIZE, level, ti);
-        this_leaf->ways_of_associativity = ecag(EXTRACT_ASSOCIATIVITY,
-                                                level, ti);
+        this_leaf->ways_of_associativity = ecag(EXTRACT_ASSOCIATIVITY, level, ti);
         this_leaf->size = ecag(EXTRACT_SIZE, level, ti);
-
         num_sets = this_leaf->size / this_leaf->coherency_line_size;
         num_sets /= this_leaf->ways_of_associativity;
         this_leaf->number_of_sets = num_sets;
@@ -145,7 +138,6 @@ int init_cache_level(unsigned int cpu)
 
         if (!this_cpu_ci)
                 return -EINVAL;
-
         ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);
         do {
                 ctype = get_cache_type(&ct.ci[0], level);
@@ -154,34 +146,31 @@ int init_cache_level(unsigned int cpu)
                 /* Separate instruction and data caches */
                 leaves += (ctype == CACHE_TYPE_SEPARATE) ? 2 : 1;
         } while (++level < CACHE_MAX_LEVEL);
-
         this_cpu_ci->num_levels = level;
         this_cpu_ci->num_leaves = leaves;
-
         return 0;
 }
 
 int populate_cache_leaves(unsigned int cpu)
 {
+        struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
+        struct cacheinfo *this_leaf = this_cpu_ci->info_list;
         unsigned int level, idx, pvt;
         union cache_topology ct;
         enum cache_type ctype;
-        struct cpu_cacheinfo *this_cpu_ci = get_cpu_cacheinfo(cpu);
-        struct cacheinfo *this_leaf = this_cpu_ci->info_list;
 
         ct.raw = ecag(EXTRACT_TOPOLOGY, 0, 0);
         for (idx = 0, level = 0; level < this_cpu_ci->num_levels &&
              idx < this_cpu_ci->num_leaves; idx++, level++) {
                 if (!this_leaf)
                         return -EINVAL;
-
                 pvt = (ct.ci[level].scope == CACHE_SCOPE_PRIVATE) ? 1 : 0;
                 ctype = get_cache_type(&ct.ci[0], level);
                 if (ctype == CACHE_TYPE_SEPARATE) {
-                        ci_leaf_init(this_leaf++, pvt, CACHE_TYPE_DATA, level);
-                        ci_leaf_init(this_leaf++, pvt, CACHE_TYPE_INST, level);
+                        ci_leaf_init(this_leaf++, pvt, CACHE_TYPE_DATA, level, cpu);
+                        ci_leaf_init(this_leaf++, pvt, CACHE_TYPE_INST, level, cpu);
                 } else {
-                        ci_leaf_init(this_leaf++, pvt, ctype, level);
+                        ci_leaf_init(this_leaf++, pvt, ctype, level, cpu);
                 }
         }
         return 0;
diff --git a/arch/s390/kernel/early.c b/arch/s390/kernel/early.c
index 70a329450901..4427ab7ac23a 100644
--- a/arch/s390/kernel/early.c
+++ b/arch/s390/kernel/early.c
@@ -393,17 +393,19 @@ static __init void detect_machine_facilities(void)
                 S390_lowcore.machine_flags |= MACHINE_FLAG_TLB_LC;
         if (test_facility(129))
                 S390_lowcore.machine_flags |= MACHINE_FLAG_VX;
-        if (test_facility(128))
-                S390_lowcore.machine_flags |= MACHINE_FLAG_CAD;
 #endif
 }