Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 23:08:26 +0000 (16:08 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Mon, 13 Aug 2018 23:08:26 +0000 (16:08 -0700)
Pull x86 platform updates from Thomas Gleixner:
 "Trivial cleanups and improvements"

* 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/platform/UV: Remove redundant check of p == q
  x86/platform/olpc: Use PTR_ERR_OR_ZERO()
  x86/platform/UV: Mark memblock related init code and data correctly

arch/x86/kernel/apic/x2apic_uv_x.c
arch/x86/platform/olpc/olpc.c
arch/x86/platform/uv/tlb_uv.c

index d492752f79e1b9f120de025a9fa89b692e720705..391f358ebb4c6d823f0640e7c92d1d762538cf40 100644 (file)
@@ -394,10 +394,10 @@ extern int uv_hub_info_version(void)
 EXPORT_SYMBOL(uv_hub_info_version);
 
 /* Default UV memory block size is 2GB */
-static unsigned long mem_block_size = (2UL << 30);
+static unsigned long mem_block_size __initdata = (2UL << 30);
 
 /* Kernel parameter to specify UV mem block size */
-static int parse_mem_block_size(char *ptr)
+static int __init parse_mem_block_size(char *ptr)
 {
        unsigned long size = memparse(ptr, NULL);
 
index 7c3077e58fa02f340e21f901ea0315716574ac62..f0e920fb98ad01f8657fd58c519e00a54f09bc99 100644 (file)
@@ -311,10 +311,8 @@ static int __init add_xo1_platform_devices(void)
                return PTR_ERR(pdev);
 
        pdev = platform_device_register_simple("olpc-xo1", -1, NULL, 0);
-       if (IS_ERR(pdev))
-               return PTR_ERR(pdev);
 
-       return 0;
+       return PTR_ERR_OR_ZERO(pdev);
 }
 
 static int olpc_xo1_ec_probe(struct platform_device *pdev)
index ca446da48fd2872e262b789ebbfe12c2ec1d4976..e26dfad507c85a5a12300c3c058ee92ab13e63fa 100644 (file)
@@ -1607,8 +1607,6 @@ static int parse_tunables_write(struct bau_control *bcp, char *instr,
                                *tunables[cnt].tunp = val;
                        continue;
                }
-               if (q == p)
-                       break;
        }
        return 0;
 }