From patchwork Fri Aug 18 11:26:21 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 110377 Delivered-To: patch@linaro.org Received: by 10.140.95.78 with SMTP id h72csp781386qge; Fri, 18 Aug 2017 04:27:58 -0700 (PDT) X-Received: by 10.84.231.206 with SMTP id g14mr9481038pln.394.1503055678060; Fri, 18 Aug 2017 04:27:58 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1503055678; cv=none; d=google.com; s=arc-20160816; b=iRMarTxfkdNHRWsGP7frryr7WuFuBWD0ELs81huBp7Qb+i8gwtxQh8cPE1Wp2dbZ02 qvrK0YQl5erk96N8NFnKNEEF5nlWpcv0JFZR3BWNRnZEz9+QObc3a1mX2ug3WuRbNExA ot0VLIVamtymxScn86Q5AU32nuBS2y/m6Lvc69sGF8BVrR0QHvMmKpHozGAUaaG67vfr E7/kENTlCtB84eAP3PPUZXmGoqNf3NZvL6rxKvaQGv7Ifjiq1xeM80xM+Ko+kDG63yzP k3NjP+oyP0IGTr2TuTl/miLKIhaQPsTTVehZ6i3PuekupzwxrQgCViGERFLUBSqZeE4l hyxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=PkEJvp4YAwG7ObOv3lYsdyRlvlNMbFjavxLS4X/roJk=; b=zZiKh3+7gISAT+q0hG72l0YHx5UmZmePKKH/7OEuQ7AWfx2SSFqwKSjhtWYna7s1NS Fera4PYaJslnzUR/0xcxDZ/U95ELrO3n5rzWjObG4ggD4orTOt/q1MU6t6VS9DKb0D3i 0sEF3VYNwR2rg3b39/YTHy6gDVSzcbfcMY0HGZ1odyK2S4KeVEnRHenl5Btk7spPcLWg MVxK1bNdGKTTzilDhhPFwYXnpHPCSYiWsCvLNn2RbMNPlQVuBBWPINyE5BuhLJ0HCCX1 hnKot0KCedpz7oUZ+H2Ft+f9ZYHvWK2mhSMKr1b2YEIeKsZyH+27GWPrlUDMU/Z9VVqn HVUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QjbKZGkc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x188si3352751pgb.776.2017.08.18.04.27.57; Fri, 18 Aug 2017 04:27:58 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=QjbKZGkc; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752185AbdHRL1y (ORCPT + 26 others); Fri, 18 Aug 2017 07:27:54 -0400 Received: from mail-wr0-f178.google.com ([209.85.128.178]:38090 "EHLO mail-wr0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751740AbdHRL07 (ORCPT ); Fri, 18 Aug 2017 07:26:59 -0400 Received: by mail-wr0-f178.google.com with SMTP id 5so43967100wrz.5 for ; Fri, 18 Aug 2017 04:26:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=PkEJvp4YAwG7ObOv3lYsdyRlvlNMbFjavxLS4X/roJk=; b=QjbKZGkc2W91skA6bXXbAQqLmZswGrLdiQAfL2Lu1ELW5yr6crY2SKHhbPM65et4db s1djjzYtmYIzKeycpD9TaekMovPTJ5EySUeFDjhEi3LVpvh+KndCHs7aPUXFNL5c7No1 24G/sN2chsYcDslT/WW0p5/2T1B5Sy1rebP+I= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=PkEJvp4YAwG7ObOv3lYsdyRlvlNMbFjavxLS4X/roJk=; b=ebwftDyc6u0jQEJUzk76+JeTGf96fwe53XngOykRO8IJ0rRdIRc3n6Lo2tgyyHicCf l4nTEyer5//dvNHgBeXFfNTw/NvOHKyowC/i7rXmPtRWub0LKQWNimjqle5GOBmsheZi vDT+EjtbdEL8Dv6tp0SylGDReI+W/7vkcvLcIXq4foTFcHXf2JkKOz9iLvE/J4WT/Bz1 2xAVgjdoHut4+Mo4UJodRLXLah5tM0GMjlHGy9fdPU9eGikDRfvxSUTMJ2XLE7JL2O/H Q10OkoAnLyj21zYRQoo8l/o2gVXTvv1bZ3fsf/AI4gV6Lokz1K7+LFtK2Gj893sGDTWP Stvg== X-Gm-Message-State: AHYfb5iY/tKmXnMsoNKX9iiiw9w3iThzR31Z4brUk689P+VBfgJMKqrC O8svaYoz6MXslo+IwK5w4g== X-Received: by 10.28.221.86 with SMTP id u83mr1541786wmg.143.1503055618048; Fri, 18 Aug 2017 04:26:58 -0700 (PDT) Received: from localhost.localdomain ([154.146.161.128]) by smtp.gmail.com with ESMTPSA id f4sm1047111wmh.28.2017.08.18.04.26.52 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2017 04:26:57 -0700 (PDT) From: Ard Biesheuvel To: linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Cc: Ard Biesheuvel , "H. Peter Anvin" , Arnd Bergmann , Heiko Carstens , Kees Cook , Will Deacon , Michael Ellerman , Thomas Garnier , Thomas Gleixner , "Serge E. Hallyn" , Bjorn Helgaas , Benjamin Herrenschmidt , Paul Mackerras , Catalin Marinas , Petr Mladek , Ingo Molnar , James Morris , Andrew Morton , Joe Perches , Nicolas Pitre , Steven Rostedt , Martin Schwidefsky , Sergey Senozhatsky , Linus Torvalds , Andy Whitcroft , Jessica Yu Subject: [PATCH v2 3/6] treewide: add missing trailing semicolons to initcall() invocations Date: Fri, 18 Aug 2017 12:26:21 +0100 Message-Id: <20170818112624.24991-4-ard.biesheuvel@linaro.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20170818112624.24991-1-ard.biesheuvel@linaro.org> References: <20170818112624.24991-1-ard.biesheuvel@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Before modifying the initcall() code to add support for relative references in the initcall sections, fix the existing code that lacks the required trailing semicolon so we can remove it from the macros. Signed-off-by: Ard Biesheuvel --- arch/arm64/kernel/perf_event.c | 2 +- arch/s390/hypfs/inode.c | 2 +- arch/x86/events/intel/core.c | 2 +- drivers/net/cris/eth_v10.c | 2 +- drivers/net/dsa/dsa_loop_bdinfo.c | 2 +- drivers/parport/procfs.c | 4 ++-- drivers/perf/arm_pmu_acpi.c | 2 +- drivers/platform/x86/intel_turbo_max_3.c | 2 +- fs/hugetlbfs/inode.c | 2 +- mm/compaction.c | 2 +- mm/oom_kill.c | 2 +- mm/page_alloc.c | 2 +- mm/page_owner.c | 2 +- net/core/lwt_bpf.c | 2 +- net/sched/sch_blackhole.c | 2 +- sound/core/seq_device.c | 4 ++-- 16 files changed, 18 insertions(+), 18 deletions(-) -- 2.11.0 diff --git a/arch/arm64/kernel/perf_event.c b/arch/arm64/kernel/perf_event.c index b5798ba21189..b8e866f08d27 100644 --- a/arch/arm64/kernel/perf_event.c +++ b/arch/arm64/kernel/perf_event.c @@ -1172,4 +1172,4 @@ static int __init armv8_pmu_driver_init(void) else return arm_pmu_acpi_probe(armv8_pmuv3_init); } -device_initcall(armv8_pmu_driver_init) +device_initcall(armv8_pmu_driver_init); diff --git a/arch/s390/hypfs/inode.c b/arch/s390/hypfs/inode.c index cf8a2d92467f..0876f49ff6e9 100644 --- a/arch/s390/hypfs/inode.c +++ b/arch/s390/hypfs/inode.c @@ -498,4 +498,4 @@ static int __init hypfs_init(void) pr_err("Initialization of hypfs failed with rc=%i\n", rc); return rc; } -device_initcall(hypfs_init) +device_initcall(hypfs_init); diff --git a/arch/x86/events/intel/core.c b/arch/x86/events/intel/core.c index 98b0f0729527..2510b00aa152 100644 --- a/arch/x86/events/intel/core.c +++ b/arch/x86/events/intel/core.c @@ -4340,4 +4340,4 @@ static __init int fixup_ht_bug(void) pr_info("PMU erratum BJ122, BV98, HSD29 workaround disabled, HT off\n"); return 0; } -subsys_initcall(fixup_ht_bug) +subsys_initcall(fixup_ht_bug); diff --git a/drivers/net/cris/eth_v10.c b/drivers/net/cris/eth_v10.c index 017f48cdcab9..2494b2d47210 100644 --- a/drivers/net/cris/eth_v10.c +++ b/drivers/net/cris/eth_v10.c @@ -408,7 +408,7 @@ etrax_ethernet_init(void) led_next_time = jiffies; return 0; } -device_initcall(etrax_ethernet_init) +device_initcall(etrax_ethernet_init); /* set MAC address of the interface. called from the core after a * SIOCSIFADDR ioctl, and from the bootup above. diff --git a/drivers/net/dsa/dsa_loop_bdinfo.c b/drivers/net/dsa/dsa_loop_bdinfo.c index fb8d5dc71013..62c2c2d60752 100644 --- a/drivers/net/dsa/dsa_loop_bdinfo.c +++ b/drivers/net/dsa/dsa_loop_bdinfo.c @@ -29,6 +29,6 @@ static int __init dsa_loop_bdinfo_init(void) { return mdiobus_register_board_info(&bdinfo, 1); } -arch_initcall(dsa_loop_bdinfo_init) +arch_initcall(dsa_loop_bdinfo_init); MODULE_LICENSE("GPL"); diff --git a/drivers/parport/procfs.c b/drivers/parport/procfs.c index 8ee44a104ac4..ae7ecc27da97 100644 --- a/drivers/parport/procfs.c +++ b/drivers/parport/procfs.c @@ -617,5 +617,5 @@ static void __exit parport_default_proc_unregister (void) } #endif -subsys_initcall(parport_default_proc_register) -module_exit(parport_default_proc_unregister) +subsys_initcall(parport_default_proc_register); +module_exit(parport_default_proc_unregister); diff --git a/drivers/perf/arm_pmu_acpi.c b/drivers/perf/arm_pmu_acpi.c index 0a9b78705ee8..3798bc2461f8 100644 --- a/drivers/perf/arm_pmu_acpi.c +++ b/drivers/perf/arm_pmu_acpi.c @@ -264,4 +264,4 @@ static int arm_pmu_acpi_init(void) return ret; } -subsys_initcall(arm_pmu_acpi_init) +subsys_initcall(arm_pmu_acpi_init); diff --git a/drivers/platform/x86/intel_turbo_max_3.c b/drivers/platform/x86/intel_turbo_max_3.c index 4f60d8e32a0a..fbcface26d94 100644 --- a/drivers/platform/x86/intel_turbo_max_3.c +++ b/drivers/platform/x86/intel_turbo_max_3.c @@ -148,4 +148,4 @@ static int __init itmt_legacy_init(void) return 0; } -late_initcall(itmt_legacy_init) +late_initcall(itmt_legacy_init); diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c index 28d2753be094..501481383ec7 100644 --- a/fs/hugetlbfs/inode.c +++ b/fs/hugetlbfs/inode.c @@ -1423,4 +1423,4 @@ static int __init init_hugetlbfs_fs(void) out2: return error; } -fs_initcall(init_hugetlbfs_fs) +fs_initcall(init_hugetlbfs_fs); diff --git a/mm/compaction.c b/mm/compaction.c index fb548e4c7bd4..9d456d62c6ef 100644 --- a/mm/compaction.c +++ b/mm/compaction.c @@ -2125,6 +2125,6 @@ static int __init kcompactd_init(void) kcompactd_run(nid); return 0; } -subsys_initcall(kcompactd_init) +subsys_initcall(kcompactd_init); #endif /* CONFIG_COMPACTION */ diff --git a/mm/oom_kill.c b/mm/oom_kill.c index 9e8b4f030c1c..5e82359cb58f 100644 --- a/mm/oom_kill.c +++ b/mm/oom_kill.c @@ -634,7 +634,7 @@ static int __init oom_init(void) } return 0; } -subsys_initcall(oom_init) +subsys_initcall(oom_init); #else static inline void wake_oom_reaper(struct task_struct *tsk) { diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 6d00f746c2fd..5fc71b3155dd 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -7073,7 +7073,7 @@ int __meminit init_per_zone_wmark_min(void) return 0; } -core_initcall(init_per_zone_wmark_min) +core_initcall(init_per_zone_wmark_min); /* * min_free_kbytes_sysctl_handler - just a wrapper around proc_dointvec() so diff --git a/mm/page_owner.c b/mm/page_owner.c index 0fd9dcf2c5dc..dfc22d5e3dba 100644 --- a/mm/page_owner.c +++ b/mm/page_owner.c @@ -624,4 +624,4 @@ static int __init pageowner_init(void) return 0; } -late_initcall(pageowner_init) +late_initcall(pageowner_init); diff --git a/net/core/lwt_bpf.c b/net/core/lwt_bpf.c index 1307731ddfe4..6e416c781682 100644 --- a/net/core/lwt_bpf.c +++ b/net/core/lwt_bpf.c @@ -396,4 +396,4 @@ static int __init bpf_lwt_init(void) return lwtunnel_encap_add_ops(&bpf_encap_ops, LWTUNNEL_ENCAP_BPF); } -subsys_initcall(bpf_lwt_init) +subsys_initcall(bpf_lwt_init); diff --git a/net/sched/sch_blackhole.c b/net/sched/sch_blackhole.c index c98a61e980ba..3fe322bd1e05 100644 --- a/net/sched/sch_blackhole.c +++ b/net/sched/sch_blackhole.c @@ -42,4 +42,4 @@ static int __init blackhole_init(void) { return register_qdisc(&blackhole_qdisc_ops); } -device_initcall(blackhole_init) +device_initcall(blackhole_init); diff --git a/sound/core/seq_device.c b/sound/core/seq_device.c index c4acf17e9f5e..4e859e4a0356 100644 --- a/sound/core/seq_device.c +++ b/sound/core/seq_device.c @@ -311,5 +311,5 @@ static void __exit alsa_seq_device_exit(void) bus_unregister(&snd_seq_bus_type); } -subsys_initcall(alsa_seq_device_init) -module_exit(alsa_seq_device_exit) +subsys_initcall(alsa_seq_device_init); +module_exit(alsa_seq_device_exit);