{"id":804996,"url":"http://patchwork.ozlabs.org/api/1.2/patches/804996/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503496584-21970-3-git-send-email-mpe@ellerman.id.au/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.2/projects/2/?format=json","name":"Linux PPC development","link_name":"linuxppc-dev","list_id":"linuxppc-dev.lists.ozlabs.org","list_email":"linuxppc-dev@lists.ozlabs.org","web_url":"https://github.com/linuxppc/wiki/wiki","scm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git","webscm_url":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/","list_archive_url":"https://lore.kernel.org/linuxppc-dev/","list_archive_url_format":"https://lore.kernel.org/linuxppc-dev/{}/","commit_url_format":"https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git/commit/?id={}"},"msgid":"<1503496584-21970-3-git-send-email-mpe@ellerman.id.au>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/1503496584-21970-3-git-send-email-mpe@ellerman.id.au/","date":"2017-08-23T13:56:22","name":"[3/5] powerpc/oops: Use IS_ENABLED() for oops markers","commit_ref":"1c56cd8ee945abdf955ad28a1f5c7576cd288be2","pull_url":null,"state":"accepted","archived":false,"hash":"3df72185e2e17e3efa500c4b83ea1bb47d23e1aa","submitter":{"id":46580,"url":"http://patchwork.ozlabs.org/api/1.2/people/46580/?format=json","name":"Michael Ellerman","email":"mpe@ellerman.id.au"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/1503496584-21970-3-git-send-email-mpe@ellerman.id.au/mbox/","series":[],"comments":"http://patchwork.ozlabs.org/api/patches/804996/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/804996/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@lists.ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby ozlabs.org (Postfix) with ESMTPS id 3xcpwh5xPJz9s8V\n\tfor ;\n\tThu, 24 Aug 2017 00:00:36 +1000 (AEST)","from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 3xcpwh3grQzDrJp\n\tfor ;\n\tThu, 24 Aug 2017 00:00:36 +1000 (AEST)","from ozlabs.org (ozlabs.org [IPv6:2401:3900:2:1::2])\n\t(using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 3xcpr430DhzDqZr\n\tfor ;\n\tWed, 23 Aug 2017 23:56:36 +1000 (AEST)","by ozlabs.org (Postfix)\n\tid 3xcpr40s7Tz9s82; Wed, 23 Aug 2017 23:56:36 +1000 (AEST)","by ozlabs.org (Postfix, from userid 1034)\n\tid 3xcpr36BF6z9sCZ; Wed, 23 Aug 2017 23:56:35 +1000 (AEST)"],"From":"Michael Ellerman ","To":"linuxppc-dev@ozlabs.org","Subject":"[PATCH 3/5] powerpc/oops: Use IS_ENABLED() for oops markers","Date":"Wed, 23 Aug 2017 23:56:22 +1000","Message-Id":"<1503496584-21970-3-git-send-email-mpe@ellerman.id.au>","X-Mailer":"git-send-email 2.7.4","In-Reply-To":"<1503496584-21970-1-git-send-email-mpe@ellerman.id.au>","References":"<1503496584-21970-1-git-send-email-mpe@ellerman.id.au>","X-BeenThere":"linuxppc-dev@lists.ozlabs.org","X-Mailman-Version":"2.1.23","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List\n\t","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org","Sender":"\"Linuxppc-dev\"\n\t"},"content":"Just because it looks less gross.\n\nSigned-off-by: Michael Ellerman \n---\n arch/powerpc/kernel/traps.c | 19 ++++++++++---------\n 1 file changed, 10 insertions(+), 9 deletions(-)","diff":"diff --git a/arch/powerpc/kernel/traps.c b/arch/powerpc/kernel/traps.c\nindex 5a54a6f54f70..f77d954f6622 100644\n--- a/arch/powerpc/kernel/traps.c\n+++ b/arch/powerpc/kernel/traps.c\n@@ -208,17 +208,18 @@ static int __die(const char *str, struct pt_regs *regs, long err)\n \telse\n \t\tprintk(\"BE \");\n \n-#ifdef CONFIG_PREEMPT\n-\tpr_cont(\"PREEMPT \");\n-#endif\n-#ifdef CONFIG_SMP\n-\tpr_cont(\"SMP NR_CPUS=%d \", NR_CPUS);\n-#endif\n+\tif (IS_ENABLED(CONFIG_PREEMPT))\n+\t\tpr_cont(\"PREEMPT \");\n+\n+\tif (IS_ENABLED(CONFIG_SMP))\n+\t\tpr_cont(\"SMP NR_CPUS=%d \", NR_CPUS);\n+\n \tif (debug_pagealloc_enabled())\n \t\tpr_cont(\"DEBUG_PAGEALLOC \");\n-#ifdef CONFIG_NUMA\n-\tpr_cont(\"NUMA \");\n-#endif\n+\n+\tif (IS_ENABLED(CONFIG_NUMA))\n+\t\tpr_cont(\"NUMA \");\n+\n \tpr_cont(\"%s\\n\", ppc_md.name ? ppc_md.name : \"\");\n \n \tif (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) == NOTIFY_STOP)\n","prefixes":["3/5"]}