diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 13:02:54 -1000 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-09-22 13:02:54 -1000 |
commit | d21b8ea7d765166bf17da1ad8ab75e81b6087229 (patch) | |
tree | b858afa47664dcf1c9af056a772006d05231b233 /arch/tile/kernel | |
parent | 4d9af767418bf085e067bae905ce8675fc0f36eb (diff) | |
parent | 637f23abca87d26e091e0d6647ec878d97d2c6cd (diff) | |
download | linux-stable-d21b8ea7d765166bf17da1ad8ab75e81b6087229.tar.gz linux-stable-d21b8ea7d765166bf17da1ad8ab75e81b6087229.tar.bz2 linux-stable-d21b8ea7d765166bf17da1ad8ab75e81b6087229.zip |
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
Diffstat (limited to 'arch/tile/kernel')
-rw-r--r-- | arch/tile/kernel/setup.c | 2 |
1 files changed, 1 insertions, 1 deletions
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) { char *endp; unsigned long long maxnodemem; - long node; + unsigned long node; node = str ? simple_strtoul(str, &endp, 0) : INT_MAX; if (node >= MAX_NUMNODES || *endp != ':') |