|
 |
e293be |
diff -up linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/cpufeature.h.morefixes linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/cpufeature.h
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/cpufeature.h.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/cpufeature.h 2016-11-05 08:30:46.276033474 -0400
|
|
|
e293be |
@@ -354,6 +354,7 @@ extern const char * const x86_power_flag
|
|
|
e293be |
#define cpu_has_avx boot_cpu_has(X86_FEATURE_AVX)
|
|
|
e293be |
#define cpu_has_avx2 boot_cpu_has(X86_FEATURE_AVX2)
|
|
|
e293be |
#define cpu_has_ht boot_cpu_has(X86_FEATURE_HT)
|
|
|
e293be |
+#define cpu_has_mp boot_cpu_has(X86_FEATURE_MP)
|
|
|
e293be |
#define cpu_has_nx boot_cpu_has(X86_FEATURE_NX)
|
|
|
e293be |
#define cpu_has_xstore boot_cpu_has(X86_FEATURE_XSTORE)
|
|
|
e293be |
#define cpu_has_xstore_enabled boot_cpu_has(X86_FEATURE_XSTORE_EN)
|
|
|
e293be |
diff -up linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/irq_remapping.h.morefixes linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/irq_remapping.h
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/irq_remapping.h.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/arch/x86/include/asm/irq_remapping.h 2016-11-05 09:39:38.425043476 -0400
|
|
|
e293be |
@@ -110,7 +110,7 @@ static inline bool setup_remapped_irq(in
|
|
|
e293be |
return false;
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
-int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)
|
|
|
e293be |
+static inline int irq_set_vcpu_affinity(unsigned int irq, void *vcpu_info)
|
|
|
e293be |
{
|
|
|
e293be |
return -ENOSYS;
|
|
|
e293be |
}
|
|
|
e293be |
diff -up linux-3.10.0-514.sdl7.i686/arch/x86/kernel/irq_32.c.morefixes linux-3.10.0-514.sdl7.i686/arch/x86/kernel/irq_32.c
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/arch/x86/kernel/irq_32.c.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/arch/x86/kernel/irq_32.c 2016-11-05 09:49:59.371055125 -0400
|
|
|
e293be |
@@ -24,9 +24,12 @@
|
|
|
e293be |
DEFINE_PER_CPU_SHARED_ALIGNED(irq_cpustat_t, irq_stat);
|
|
|
e293be |
EXPORT_PER_CPU_SYMBOL(irq_stat);
|
|
|
e293be |
|
|
|
e293be |
+DEFINE_PER_CPU_SHARED_ALIGNED(rh_irq_cpustat_t, rh_irq_stat);
|
|
|
e293be |
+
|
|
|
e293be |
DEFINE_PER_CPU(struct pt_regs *, irq_regs);
|
|
|
e293be |
EXPORT_PER_CPU_SYMBOL(irq_regs);
|
|
|
e293be |
|
|
|
e293be |
+
|
|
|
e293be |
#ifdef CONFIG_DEBUG_STACKOVERFLOW
|
|
|
e293be |
|
|
|
e293be |
int sysctl_panic_on_stackoverflow __read_mostly;
|
|
|
e293be |
diff -up linux-3.10.0-514.sdl7.i686/include/linux/pps_kernel.h.morefixes linux-3.10.0-514.sdl7.i686/include/linux/pps_kernel.h
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/include/linux/pps_kernel.h.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/include/linux/pps_kernel.h 2016-11-05 10:44:41.492049162 -0400
|
|
|
e293be |
@@ -115,10 +115,17 @@ static inline void pps_get_ts(struct pps
|
|
|
e293be |
{
|
|
|
e293be |
struct system_time_snapshot snap;
|
|
|
e293be |
ktime_get_snapshot(&snap);
|
|
|
e293be |
+#if defined CONFIG_X86_64
|
|
|
e293be |
ts->ts_real = ktime_to_timespec64(snap.real);
|
|
|
e293be |
#ifdef CONFIG_NTP_PPS
|
|
|
e293be |
ts->ts_raw = ktime_to_timespec64(snap.raw);
|
|
|
e293be |
#endif
|
|
|
e293be |
+#else
|
|
|
e293be |
+ ts->ts_real = ktime_to_timespec(snap.real);
|
|
|
e293be |
+#ifdef CONFIG_NTP_PPS
|
|
|
e293be |
+ ts->ts_raw = ktime_to_timespec(snap.raw);
|
|
|
e293be |
+#endif
|
|
|
e293be |
+#endif
|
|
|
e293be |
}
|
|
|
e293be |
|
|
|
e293be |
/* Subtract known time delay from PPS event time(s) */
|
|
|
e293be |
diff -up linux-3.10.0-514.sdl7.i686/kernel/hrtimer.c.morefixes linux-3.10.0-514.sdl7.i686/kernel/hrtimer.c
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/kernel/hrtimer.c.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/kernel/hrtimer.c 2016-11-05 10:58:56.726065206 -0400
|
|
|
e293be |
@@ -328,6 +328,7 @@ u64 ktime_divns(const ktime_t kt, s64 di
|
|
|
e293be |
|
|
|
e293be |
return dclc;
|
|
|
e293be |
}
|
|
|
e293be |
+EXPORT_SYMBOL_GPL(ktime_divns);
|
|
|
e293be |
#endif /* BITS_PER_LONG >= 64 */
|
|
|
e293be |
|
|
|
e293be |
/*
|
|
|
e293be |
diff -up linux-3.10.0-514.sdl7.i686/mm/swap.c.morefixes linux-3.10.0-514.sdl7.i686/mm/swap.c
|
|
|
e293be |
--- linux-3.10.0-514.sdl7.i686/mm/swap.c.morefixes 2016-10-19 10:16:25.000000000 -0400
|
|
|
e293be |
+++ linux-3.10.0-514.sdl7.i686/mm/swap.c 2016-11-05 08:55:41.521061525 -0400
|
|
|
e293be |
@@ -972,9 +972,6 @@ void release_pages(struct page **pages,
|
|
|
e293be |
if (!put_page_testzero(page))
|
|
|
e293be |
continue;
|
|
|
e293be |
|
|
|
e293be |
- VM_BUG_ON_PAGE(check_mmu_gather &&
|
|
|
e293be |
- trans_huge_mmu_gather_count(page), page);
|
|
|
e293be |
-
|
|
|
e293be |
if (PageLRU(page)) {
|
|
|
e293be |
if (!was_thp)
|
|
|
e293be |
zone = zone_lru_lock(zone, page, &lock_batch,
|