{"id":951,"url":"http://patchwork.ozlabs.org/api/1.0/patches/951/?format=json","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/1.0/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/"},"msgid":"<200809222141.m8MLfVHX031273@imap1.linux-foundation.org>","date":"2008-09-22T21:41:31","name":"[1/1] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for legacy io checks","commit_ref":null,"pull_url":null,"state":"accepted","archived":true,"hash":"72ba1a6c061e4ea4ca771a94d36fd4af99ce8e9d","submitter":{"id":107,"url":"http://patchwork.ozlabs.org/api/1.0/people/107/?format=json","name":"Andrew Morton","email":"akpm@linux-foundation.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/200809222141.m8MLfVHX031273@imap1.linux-foundation.org/mbox/","series":[],"check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/951/checks/","tags":{},"headers":{"Return-Path":"","X-Original-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@ozlabs.org"],"Delivered-To":["patchwork-incoming@ozlabs.org","linuxppc-dev@ozlabs.org"],"Received":["from ozlabs.org (localhost [127.0.0.1])\n\tby ozlabs.org (Postfix) with ESMTP id 009C4DE1A7\n\tfor ;\n\tTue, 23 Sep 2008 07:42:29 +1000 (EST)","from smtp1.linux-foundation.org (smtp1.linux-foundation.org\n\t[140.211.169.13])\n\t(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))\n\t(Client CN \"smtp.linux-foundation.org\",\n\tIssuer \"CA Cert Signing Authority\" (verified OK))\n\tby ozlabs.org (Postfix) with ESMTPS id 33924DDF3F\n\tfor ; Tue, 23 Sep 2008 07:42:07 +1000 (EST)","from imap1.linux-foundation.org (imap1.linux-foundation.org\n\t[140.211.169.55])\n\tby smtp1.linux-foundation.org (8.14.2/8.13.5/Debian-3ubuntu1.1) with\n\tESMTP id m8MLfVtt016950\n\t(version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO);\n\tMon, 22 Sep 2008 14:41:32 -0700","from localhost.localdomain (localhost [127.0.0.1])\n\tby imap1.linux-foundation.org\n\t(8.13.5.20060308/8.13.5/Debian-3ubuntu1.1) with ESMTP id\n\tm8MLfVHX031273; Mon, 22 Sep 2008 14:41:31 -0700"],"Message-Id":"<200809222141.m8MLfVHX031273@imap1.linux-foundation.org>","Subject":"[patch 1/1] powerpc: convert CONFIG_PPC_MERGE to CONFIG_PPC for\n\tlegacy io checks","To":"benh@kernel.crashing.org","From":"akpm@linux-foundation.org","Date":"Mon, 22 Sep 2008 14:41:31 -0700","X-Spam-Status":"No, hits=-3.359 required=5 tests=AWL, BAYES_00,\n\tOSDL_HEADER_SUBJECT_BRACKETED","X-Spam-Checker-Version":"SpamAssassin 3.2.4-osdl_revision__1.47__","X-MIMEDefang-Filter":"lf$Revision: 1.188 $","X-Scanned-By":"MIMEDefang 2.63 on 140.211.169.13","Cc":"linuxppc-dev@ozlabs.org, akpm@linux-foundation.org, paulus@samba.org","X-BeenThere":"linuxppc-dev@ozlabs.org","X-Mailman-Version":"2.1.11","Precedence":"list","List-Id":"Linux on PowerPC Developers Mail List ","List-Unsubscribe":",\n\t","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n\t","MIME-Version":"1.0","Content-Type":"text/plain; charset=\"us-ascii\"","Content-Transfer-Encoding":"7bit","Sender":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org","Errors-To":"linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@ozlabs.org"},"content":"From: Kumar Gala \n\nNow that arch/ppc is dead CONFIG_PPC_MERGE is always defined for all\npowerpc platforms and we want to get rid of CONFIG_PPC_MERGE use\nCONFIG_PPC instead.\n\nSigned-off-by: Kumar Gala \nCc: Benjamin Herrenschmidt \nCc: Paul Mackerras \nSigned-off-by: Andrew Morton \n---\n\n drivers/block/floppy.c | 2 +-\n drivers/char/ipmi/ipmi_si_intf.c | 2 +-\n drivers/i2c/busses/i2c-pca-isa.c | 2 +-\n drivers/input/serio/i8042-io.h | 2 +-\n drivers/pnp/isapnp/core.c | 2 +-\n drivers/pnp/pnpbios/core.c | 4 ++--\n 6 files changed, 7 insertions(+), 7 deletions(-)","diff":"diff -puN drivers/block/floppy.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/block/floppy.c\n--- a/drivers/block/floppy.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/block/floppy.c\n@@ -4165,7 +4165,7 @@ static int __init floppy_init(void)\n \tint i, unit, drive;\n \tint err, dr;\n \n-#if defined(CONFIG_PPC_MERGE)\n+#if defined(CONFIG_PPC)\n \tif (check_legacy_ioport(FDC1))\n \t\treturn -ENODEV;\n #endif\ndiff -puN drivers/char/ipmi/ipmi_si_intf.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/char/ipmi/ipmi_si_intf.c\n--- a/drivers/char/ipmi/ipmi_si_intf.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/char/ipmi/ipmi_si_intf.c\n@@ -2695,7 +2695,7 @@ static __devinit void default_find_bmc(v\n \tfor (i = 0; ; i++) {\n \t\tif (!ipmi_defaults[i].port)\n \t\t\tbreak;\n-#ifdef CONFIG_PPC_MERGE\n+#ifdef CONFIG_PPC\n \t\tif (check_legacy_ioport(ipmi_defaults[i].port))\n \t\t\tcontinue;\n #endif\ndiff -puN drivers/i2c/busses/i2c-pca-isa.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/i2c/busses/i2c-pca-isa.c\n--- a/drivers/i2c/busses/i2c-pca-isa.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/i2c/busses/i2c-pca-isa.c\n@@ -126,7 +126,7 @@ static int __devinit pca_isa_probe(struc\n \n \tdev_info(dev, \"i/o base %#08lx. irq %d\\n\", base, irq);\n \n-#ifdef CONFIG_PPC_MERGE\n+#ifdef CONFIG_PPC\n \tif (check_legacy_ioport(base)) {\n \t\tdev_err(dev, \"I/O address %#08lx is not available\\n\", base);\n \t\tgoto out;\ndiff -puN drivers/input/serio/i8042-io.h~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/input/serio/i8042-io.h\n--- a/drivers/input/serio/i8042-io.h~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/input/serio/i8042-io.h\n@@ -67,7 +67,7 @@ static inline int i8042_platform_init(vo\n * On some platforms touching the i8042 data register region can do really\n * bad things. Because of this the region is always reserved on such boxes.\n */\n-#if defined(CONFIG_PPC_MERGE)\n+#if defined(CONFIG_PPC)\n \tif (check_legacy_ioport(I8042_DATA_REG))\n \t\treturn -ENODEV;\n #endif\ndiff -puN drivers/pnp/isapnp/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/pnp/isapnp/core.c\n--- a/drivers/pnp/isapnp/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/pnp/isapnp/core.c\n@@ -1012,7 +1012,7 @@ static int __init isapnp_init(void)\n \t\tprintk(KERN_INFO \"isapnp: ISA Plug & Play support disabled\\n\");\n \t\treturn 0;\n \t}\n-#ifdef CONFIG_PPC_MERGE\n+#ifdef CONFIG_PPC\n \tif (check_legacy_ioport(_PIDXR) || check_legacy_ioport(_PNPWRP))\n \t\treturn -EINVAL;\n #endif\ndiff -puN drivers/pnp/pnpbios/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks drivers/pnp/pnpbios/core.c\n--- a/drivers/pnp/pnpbios/core.c~powerpc-convert-config_ppc_merge-to-config_ppc-for-legacy-io-checks\n+++ a/drivers/pnp/pnpbios/core.c\n@@ -519,7 +519,7 @@ static int __init pnpbios_init(void)\n {\n \tint ret;\n \n-#if defined(CONFIG_PPC_MERGE)\n+#if defined(CONFIG_PPC)\n \tif (check_legacy_ioport(PNPBIOS_BASE))\n \t\treturn -ENODEV;\n #endif\n@@ -577,7 +577,7 @@ static int __init pnpbios_thread_init(vo\n {\n \tstruct task_struct *task;\n \n-#if defined(CONFIG_PPC_MERGE)\n+#if defined(CONFIG_PPC)\n \tif (check_legacy_ioport(PNPBIOS_BASE))\n \t\treturn 0;\n #endif\n","prefixes":["1/1"]}