Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge branch 'akpm' (patches from Andrew Morton)
Merge two fixes from Andrew Morton:
"The x86 fix should come from x86 guys but they appear to be
conferencing or otherwise distracted.
The ocfs2 fix is a bit of a mess - the code runs into an immediate
NULL deref and we're trying to work out how this got through test and
review, but we haven't heard from Goldwyn in the past few days.
Sasha's patch fixes the oops, but the feature as a whole is probably
broken. So this is a stopgap for 3.14 - I'll aim to get the real
fixes into 3.14.x"
* emailed patches from Andrew Morton akpm@linux-foundation.org>:
x86: fix boot on uniprocessor systems
ocfs2: check if cluster name exists before deref
+5
-2
+2
-1
arch/x86/include/asm/topology.h
+2
-1
arch/x86/include/asm/topology.h
···
119
119
120
120
extern const struct cpumask *cpu_coregroup_mask(int cpu);
121
121
122
-
#ifdef ENABLE_TOPO_DEFINES
123
122
#define topology_physical_package_id(cpu) (cpu_data(cpu).phys_proc_id)
124
123
#define topology_core_id(cpu) (cpu_data(cpu).cpu_core_id)
124
+
125
+
#ifdef ENABLE_TOPO_DEFINES
125
126
#define topology_core_cpumask(cpu) (per_cpu(cpu_core_map, cpu))
126
127
#define topology_thread_cpumask(cpu) (per_cpu(cpu_sibling_map, cpu))
127
128
#endif
+3
-1
fs/ocfs2/stackglue.c
+3
-1
fs/ocfs2/stackglue.c
···
346
346
347
347
strlcpy(new_conn->cc_name, group, GROUP_NAME_MAX + 1);
348
348
new_conn->cc_namelen = grouplen;
349
-
strlcpy(new_conn->cc_cluster_name, cluster_name, CLUSTER_NAME_MAX + 1);
349
+
if (cluster_name_len)
350
+
strlcpy(new_conn->cc_cluster_name, cluster_name,
351
+
CLUSTER_NAME_MAX + 1);
350
352
new_conn->cc_cluster_name_len = cluster_name_len;
351
353
new_conn->cc_recovery_handler = recovery_handler;
352
354
new_conn->cc_recovery_data = recovery_data;