aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2017-09-22 19:02:54 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2017-09-22 19:02:54 -0400
commitd21b8ea7d765166bf17da1ad8ab75e81b6087229 (patch)
treeb858afa47664dcf1c9af056a772006d05231b233
parent4d9af767418bf085e067bae905ce8675fc0f36eb (diff)
parent637f23abca87d26e091e0d6647ec878d97d2c6cd (diff)
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
Pull arch/tile fixes from Chris Metcalf: "These are a code cleanup and config cleanup, respectively" * git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile: tile: array underflow in setup_maxnodemem() tile: defconfig: Cleanup from old Kconfig options
-rw-r--r--arch/tile/configs/tilegx_defconfig1
-rw-r--r--arch/tile/configs/tilepro_defconfig2
-rw-r--r--arch/tile/kernel/setup.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/arch/tile/configs/tilegx_defconfig b/arch/tile/configs/tilegx_defconfig
index 0d925fa0f0c1..9f94435cc44f 100644
--- a/arch/tile/configs/tilegx_defconfig
+++ b/arch/tile/configs/tilegx_defconfig
@@ -409,5 +409,4 @@ CONFIG_CRYPTO_SEED=m
409CONFIG_CRYPTO_SERPENT=m 409CONFIG_CRYPTO_SERPENT=m
410CONFIG_CRYPTO_TEA=m 410CONFIG_CRYPTO_TEA=m
411CONFIG_CRYPTO_TWOFISH=m 411CONFIG_CRYPTO_TWOFISH=m
412CONFIG_CRYPTO_ZLIB=m
413CONFIG_CRYPTO_LZO=m 412CONFIG_CRYPTO_LZO=m
diff --git a/arch/tile/configs/tilepro_defconfig b/arch/tile/configs/tilepro_defconfig
index 149d8e8eacb8..1c5bd4f8ffca 100644
--- a/arch/tile/configs/tilepro_defconfig
+++ b/arch/tile/configs/tilepro_defconfig
@@ -189,7 +189,6 @@ CONFIG_IP_NF_MATCH_ECN=m
189CONFIG_IP_NF_MATCH_TTL=m 189CONFIG_IP_NF_MATCH_TTL=m
190CONFIG_IP_NF_FILTER=y 190CONFIG_IP_NF_FILTER=y
191CONFIG_IP_NF_TARGET_REJECT=y 191CONFIG_IP_NF_TARGET_REJECT=y
192CONFIG_IP_NF_TARGET_ULOG=m
193CONFIG_IP_NF_MANGLE=m 192CONFIG_IP_NF_MANGLE=m
194CONFIG_IP_NF_TARGET_ECN=m 193CONFIG_IP_NF_TARGET_ECN=m
195CONFIG_IP_NF_TARGET_TTL=m 194CONFIG_IP_NF_TARGET_TTL=m
@@ -521,7 +520,6 @@ CONFIG_CRYPTO_SEED=m
521CONFIG_CRYPTO_SERPENT=m 520CONFIG_CRYPTO_SERPENT=m
522CONFIG_CRYPTO_TEA=m 521CONFIG_CRYPTO_TEA=m
523CONFIG_CRYPTO_TWOFISH=m 522CONFIG_CRYPTO_TWOFISH=m
524CONFIG_CRYPTO_ZLIB=m
525CONFIG_CRYPTO_LZO=m 523CONFIG_CRYPTO_LZO=m
526CONFIG_CRC_CCITT=m 524CONFIG_CRC_CCITT=m
527CONFIG_CRC7=m 525CONFIG_CRC7=m
diff --git a/arch/tile/kernel/setup.c b/arch/tile/kernel/setup.c
index 6becb96c60a0..ad83c1e66dbd 100644
--- a/arch/tile/kernel/setup.c
+++ b/arch/tile/kernel/setup.c
@@ -140,7 +140,7 @@ static int __init setup_maxnodemem(char *str)
140{ 140{
141 char *endp; 141 char *endp;
142 unsigned long long maxnodemem; 142 unsigned long long maxnodemem;
143 long node; 143 unsigned long node;
144 144
145 node = str ? simple_strtoul(str, &endp, 0) : INT_MAX; 145 node = str ? simple_strtoul(str, &endp, 0) : INT_MAX;
146 if (node >= MAX_NUMNODES || *endp != ':') 146 if (node >= MAX_NUMNODES || *endp != ':')