Skip to content

Commit 80c1c30

Browse files
committed
Merge tag 'arc-7.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc
Pull ARC fixes from Vineet Gupta: - Misc fixes and config updates * tag 'arc-7.2-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc: ARC: configs: Drop redundant I2C_DESIGNWARE_PLATFORM arc: validate DT CPU map strings before parsing them
2 parents f2ec631 + 76f38ad commit 80c1c30

5 files changed

Lines changed: 4 additions & 6 deletions

File tree

arch/arc/configs/axs101_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
6767
CONFIG_I2C=y
6868
CONFIG_I2C_CHARDEV=y
6969
CONFIG_I2C_DESIGNWARE_CORE=y
70-
CONFIG_I2C_DESIGNWARE_PLATFORM=y
7170
# CONFIG_HWMON is not set
7271
CONFIG_DRM=m
7372
CONFIG_DRM_I2C_ADV7511=m

arch/arc/configs/axs103_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
6767
CONFIG_I2C=y
6868
CONFIG_I2C_CHARDEV=y
6969
CONFIG_I2C_DESIGNWARE_CORE=y
70-
CONFIG_I2C_DESIGNWARE_PLATFORM=y
7170
# CONFIG_HWMON is not set
7271
CONFIG_FB=y
7372
CONFIG_FRAMEBUFFER_CONSOLE=y

arch/arc/configs/axs103_smp_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ CONFIG_SERIAL_OF_PLATFORM=y
6767
CONFIG_I2C=y
6868
CONFIG_I2C_CHARDEV=y
6969
CONFIG_I2C_DESIGNWARE_CORE=y
70-
CONFIG_I2C_DESIGNWARE_PLATFORM=y
7170
# CONFIG_HWMON is not set
7271
CONFIG_DRM=m
7372
CONFIG_DRM_I2C_ADV7511=m

arch/arc/configs/tb10x_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ CONFIG_SERIAL_8250_DW=y
6161
CONFIG_I2C=y
6262
# CONFIG_I2C_COMPAT is not set
6363
CONFIG_I2C_DESIGNWARE_CORE=y
64-
CONFIG_I2C_DESIGNWARE_PLATFORM=y
6564
CONFIG_GPIO_SYSFS=y
6665
# CONFIG_HWMON is not set
6766
# CONFIG_USB_SUPPORT is not set

arch/arc/kernel/smp.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <linux/irqdomain.h>
2323
#include <linux/export.h>
2424
#include <linux/of_fdt.h>
25+
#include <linux/string.h>
2526

2627
#include <asm/mach_desc.h>
2728
#include <asm/setup.h>
@@ -43,9 +44,10 @@ static int __init arc_get_cpu_map(const char *name, struct cpumask *cpumask)
4344
{
4445
unsigned long dt_root = of_get_flat_dt_root();
4546
const char *buf;
47+
int len;
4648

47-
buf = of_get_flat_dt_prop(dt_root, name, NULL);
48-
if (!buf)
49+
buf = of_get_flat_dt_prop(dt_root, name, &len);
50+
if (!buf || !memchr(buf, '\0', len))
4951
return -EINVAL;
5052

5153
if (cpulist_parse(buf, cpumask))

0 commit comments

Comments
 (0)