Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
These changes are the raw update to linux-4.4.6-rt14. Kernel sources
[kvmfornfv.git]
/
kernel
/
arch
/
s390
/
kernel
/
processor.c
diff --git
a/kernel/arch/s390/kernel/processor.c
b/kernel/arch/s390/kernel/processor.c
index
dc488e1
..
7ce00e7
100644
(file)
--- a/
kernel/arch/s390/kernel/processor.c
+++ b/
kernel/arch/s390/kernel/processor.c
@@
-11,6
+11,7
@@
#include <linux/seq_file.h>
#include <linux/delay.h>
#include <linux/cpu.h>
#include <linux/seq_file.h>
#include <linux/delay.h>
#include <linux/cpu.h>
+#include <asm/diag.h>
#include <asm/elf.h>
#include <asm/lowcore.h>
#include <asm/param.h>
#include <asm/elf.h>
#include <asm/lowcore.h>
#include <asm/param.h>
@@
-20,8
+21,10
@@
static DEFINE_PER_CPU(struct cpuid, cpu_id);
void notrace cpu_relax(void)
{
void notrace cpu_relax(void)
{
- if (!smp_cpu_mtid && MACHINE_HAS_DIAG44)
+ if (!smp_cpu_mtid && MACHINE_HAS_DIAG44) {
+ diag_stat_inc(DIAG_STAT_X044);
asm volatile("diag 0,0,0x44");
asm volatile("diag 0,0,0x44");
+ }
barrier();
}
EXPORT_SYMBOL(cpu_relax);
barrier();
}
EXPORT_SYMBOL(cpu_relax);
@@
-40,6
+43,15
@@
void cpu_init(void)
enter_lazy_tlb(&init_mm, current);
}
enter_lazy_tlb(&init_mm, current);
}
+/*
+ * cpu_have_feature - Test CPU features on module initialization
+ */
+int cpu_have_feature(unsigned int num)
+{
+ return elf_hwcap & (1UL << num);
+}
+EXPORT_SYMBOL(cpu_have_feature);
+
/*
* show_cpuinfo - Get information on one CPU for use by procfs.
*/
/*
* show_cpuinfo - Get information on one CPU for use by procfs.
*/