Skip to contentSkip to conversation

x86/platform changes for v4.4

GIT PULL Ingo Molnar 1 participant 1 message Nov 3, 2015

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-platform-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86-platform-for-linus

# HEAD: d1f0f6c72c14af8a27a6549e0623f7cd61805e83 x86/intel-mid: Make intel_mid_ops static

Misc updates to the Intel MID and SGI UV platforms.

Thanks,

Ingo

------------------>
Andrzej Hajda (1):
arch/x86/intel-mid: Use kmemdup rather than duplicating its implementation

Andy Shevchenko (1):
x86/intel-mid: Make intel_mid_ops static

George Beshers (1):
x86/platform/uv: Insert per_cpu accessor function on uv_hub_nmi

Mike Travis (1):
x86/platform/uv: Implement simple dump failover if kdump fails

 arch/x86/include/asm/uv/uv_hub.h        |  2 +-
 arch/x86/platform/intel-mid/intel-mid.c |  2 +-
 arch/x86/platform/intel-mid/sfi.c       |  3 +-
 arch/x86/platform/uv/uv_nmi.c           | 53 +++++++++++++++++++--------------
 4 files changed, 33 insertions(+), 27 deletions(-)
arch/x86/include/asm/uv/uv_hub.h +1 -1
index a00ad8f2a657..ea7074784cc4 100644
@@ -609,7 +609,7 @@ struct uv_cpu_nmi_s {
 
 DECLARE_PER_CPU(struct uv_cpu_nmi_s, uv_cpu_nmi);
 
-#define uv_hub_nmi			(uv_cpu_nmi.hub)
+#define uv_hub_nmi			this_cpu_read(uv_cpu_nmi.hub)
 #define uv_cpu_nmi_per(cpu)		(per_cpu(uv_cpu_nmi, cpu))
 #define uv_hub_nmi_per(cpu)		(uv_cpu_nmi_per(cpu).hub)
 
arch/x86/platform/intel-mid/intel-mid.c +1 -1
index 01d54ea766c1..1bbc21e2e4ae 100644
@@ -61,7 +61,7 @@
 enum intel_mid_timer_options intel_mid_timer_options;
 
 /* intel_mid_ops to store sub arch ops */
-struct intel_mid_ops *intel_mid_ops;
+static struct intel_mid_ops *intel_mid_ops;
 /* getter function for sub arch ops*/
 static void *(*get_intel_mid_ops[])(void) = INTEL_MID_OPS_INIT;
 enum intel_mid_cpu_type __intel_mid_cpu_chip;
arch/x86/platform/intel-mid/sfi.c +1 -2
index ce992e8cc065..5ee360a951ce 100644
@@ -197,10 +197,9 @@ static int __init sfi_parse_gpio(struct sfi_table_header *table)
 	num = SFI_GET_NUM_ENTRIES(sb, struct sfi_gpio_table_entry);
 	pentry = (struct sfi_gpio_table_entry *)sb->pentry;
 
-	gpio_table = kmalloc(num * sizeof(*pentry), GFP_KERNEL);
+	gpio_table = kmemdup(pentry, num * sizeof(*pentry), GFP_KERNEL);
 	if (!gpio_table)
 		return -1;
-	memcpy(gpio_table, pentry, num * sizeof(*pentry));
 	gpio_num_entry = num;
 
 	pr_debug("GPIO pin info:\n");
arch/x86/platform/uv/uv_nmi.c +30 -23

124 lines not on this page · raw message