toracat / rpms / kernel

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