]> Git Repo - linux.git/commitdiff
Merge git://git.kernel.org/pub/scm/linux/kernel/git/cmetcalf/linux-tile
authorLinus Torvalds <[email protected]>
Fri, 22 Sep 2017 23:02:54 +0000 (13:02 -1000)
committerLinus Torvalds <[email protected]>
Fri, 22 Sep 2017 23:02:54 +0000 (13:02 -1000)
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

1  2 
arch/tile/kernel/setup.c

diff --combined arch/tile/kernel/setup.c
index 6becb96c60a03c5515cb443b5cdc7c683e259433,b1474e7d9afb3f564631cfffa22652014c9c5beb..ad83c1e66dbd23c5ba46e20c8e5deefdf6f3655e
@@@ -140,7 -140,7 +140,7 @@@ static int __init setup_maxnodemem(cha
  {
        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 != ':')
@@@ -1200,7 -1200,7 +1200,7 @@@ static void __init validate_hv(void
         * We use a struct cpumask for this, so it must be big enough.
         */
        if ((smp_height * smp_width) > nr_cpu_ids)
 -              early_panic("Hypervisor %d x %d grid too big for Linux NR_CPUS %d\n",
 +              early_panic("Hypervisor %d x %d grid too big for Linux NR_CPUS %u\n",
                            smp_height, smp_width, nr_cpu_ids);
  #endif
  
This page took 0.0618649999999999 seconds and 4 git commands to generate.