{"id":2215462,"url":"http://patchwork.ozlabs.org/api/patches/2215462/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260324165633.4583-3-ilpo.jarvinen@linux.intel.com/","project":{"id":2,"url":"http://patchwork.ozlabs.org/api/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":"<20260324165633.4583-3-ilpo.jarvinen@linux.intel.com>","list_archive_url":"https://lore.kernel.org/linuxppc-dev/20260324165633.4583-3-ilpo.jarvinen@linux.intel.com/","date":"2026-03-24T16:56:25","name":"[02/10] resource: Pass full extent of empty space to resource_alignf CB","commit_ref":null,"pull_url":null,"state":"handled-elsewhere","archived":false,"hash":"22973c3173f209f4306312093ce9076c47b802d0","submitter":{"id":83553,"url":"http://patchwork.ozlabs.org/api/people/83553/?format=json","name":"Ilpo Järvinen","email":"ilpo.jarvinen@linux.intel.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/linuxppc-dev/patch/20260324165633.4583-3-ilpo.jarvinen@linux.intel.com/mbox/","series":[{"id":497317,"url":"http://patchwork.ozlabs.org/api/series/497317/?format=json","web_url":"http://patchwork.ozlabs.org/project/linuxppc-dev/list/?series=497317","date":"2026-03-24T16:56:23","name":"PCI: Improve head free space usage","version":1,"mbox":"http://patchwork.ozlabs.org/series/497317/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2215462/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2215462/checks/","tags":{},"related":[],"headers":{"Return-Path":"\n ","X-Original-To":["incoming@patchwork.ozlabs.org","linuxppc-dev@lists.ozlabs.org"],"Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=h/yQw/T6;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=lists.ozlabs.org\n (client-ip=112.213.38.117; helo=lists.ozlabs.org;\n envelope-from=linuxppc-dev+bounces-18728-incoming=patchwork.ozlabs.org@lists.ozlabs.org;\n receiver=patchwork.ozlabs.org)","lists.ozlabs.org;\n arc=none smtp.remote-ip=198.175.65.13","lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.intel.com","lists.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=h/yQw/T6;\n\tdkim-atps=neutral","lists.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=linux.intel.com\n (client-ip=198.175.65.13; helo=mgamail.intel.com;\n envelope-from=ilpo.jarvinen@linux.intel.com; receiver=lists.ozlabs.org)"],"Received":["from lists.ozlabs.org (lists.ozlabs.org [112.213.38.117])\n\t(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)\n\t key-exchange x25519)\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4fgGTn4RW3z1y1g\n\tfor ; Wed, 25 Mar 2026 03:59:09 +1100 (AEDT)","from boromir.ozlabs.org (localhost [127.0.0.1])\n\tby lists.ozlabs.org (Postfix) with ESMTP id 4fgGTn3T05z2ypW;\n\tWed, 25 Mar 2026 03:59:09 +1100 (AEDT)","from mgamail.intel.com (mgamail.intel.com [198.175.65.13])\n\t(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby lists.ozlabs.org (Postfix) with ESMTPS id 4fgGTm2B6kz2ynv\n\tfor ; Wed, 25 Mar 2026 03:59:07 +1100 (AEDT)","from orviesa007.jf.intel.com ([10.64.159.147])\n by orvoesa105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Mar 2026 09:59:06 -0700","from ijarvine-mobl1.ger.corp.intel.com (HELO localhost)\n ([10.245.244.217])\n by orviesa007-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;\n 24 Mar 2026 09:58:46 -0700"],"ARC-Seal":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707; t=1774371549;\n\tcv=none;\n b=GXUZUeHzxpkljGc12uQIypA1OLzK7SEJllRX1EL9rAFcMEZZjHgV8QFlfAhwJGpYiaNR+auOUnJo+3v8Y8Q8rzCSAD0lLG8cjux76EbC1YAj/BIs84YVHCrGV8tWhs8DTDmr/wL0gSbXW5gtG5aS9+SwsIq2TQ1B7cX/jWNZamLt+Pok7zw3O54m7Z83MenRDmqaS3in7FXzYWq1dGCUR9UJ0Cmpb2IlFhyquNcyQrv8QSjvA3Uz4Xk7o31G+j/t4xLTmgZeX13RYDFjOEJ0RXq/kLXdc1/hDaDqqtvVvKr9PMlWOmeG7zSrfJxYao7TUTrx7KZKYDdJN3eW8TEwoA==","ARC-Message-Signature":"i=1; a=rsa-sha256; d=lists.ozlabs.org; s=201707;\n\tt=1774371549; c=relaxed/relaxed;\n\tbh=Iz+cFKp0cOuPVnSI/ZbHfsfZ1tcuBjhlVwnrvif2J6s=;\n\th=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References:\n\t MIME-Version:Content-Type;\n b=h677MahN0aheS0+mI04SZBf7J7Ll53VGetzNysgBo2zkcpSUejf3RpVjqkrHB2geUh6FQeemad4KuYKU+5FrLo08mUehmI4HzgVhP+SrE3jwVLecaGDNurwiG+5liah3uuk3y7MQx1D++QWov23STyD2cSVe1PgIeNUEAExg6k0hRTjnZI6tWk3U/2acEeRYd9e730RvMEi6312Anclni7OvCXye+iRHbI8JNgfmzWxT94XPwgCQHCL80txmiVP2/bZLmobA+YhBHCeXy5w0wzIKd8TDB7rqcSgE9saQspva8IXmq0HiAMn2gYzyApnTFrJMBp6dqJuPGolgHivU5w==","ARC-Authentication-Results":"i=1; lists.ozlabs.org;\n dmarc=pass (p=none dis=none) header.from=linux.intel.com;\n dkim=pass (2048-bit key;\n unprotected) header.d=intel.com header.i=@intel.com header.a=rsa-sha256\n header.s=Intel header.b=h/yQw/T6; dkim-atps=neutral;\n spf=pass (client-ip=198.175.65.13; helo=mgamail.intel.com;\n envelope-from=ilpo.jarvinen@linux.intel.com;\n receiver=lists.ozlabs.org) smtp.mailfrom=linux.intel.com","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/simple;\n d=intel.com; i=@intel.com; q=dns/txt; s=Intel;\n t=1774371549; x=1805907549;\n h=from:to:cc:subject:date:message-id:in-reply-to:\n references:mime-version:content-transfer-encoding;\n bh=WCR3Q80GUH+QkmAMmzfR2ddGucv9DgzL69WXspRX/jg=;\n b=h/yQw/T6mHLOdAOkWzG/yCdenMlYB1SuK2bOvMk8UzxmdlvwrDT2SCLf\n PM8EV7bwyd/xG+GRyFtX/QuiQi+g03szDjVBuuIB+4iDw1LjXm4SvpD7o\n WLaT1pGaN9LujGHtOGEqda3W4UdcU7s7+dhziRbmqUrd3FLMze5vFQQ7h\n uyjp59TODi1hFeibZ48JyzBFptCYux/6H7XE3yKJaGwLFSYgEkM/AeyLE\n klret5hymD+aaYwjiBSmrUW/7daDY0J5qA9t6+DnB23uh9hyjqjFj/J+1\n YhzfepchKQ3d0kId2atgdTz/Pd+g0mPFv1Ze5igB/tyjIkpi8IckX8Orm\n g==;","X-CSE-ConnectionGUID":["VoSECytZSvSbqE12/zrJ6A==","WtnV/loaRsCO4KMKean0ww=="],"X-CSE-MsgGUID":["15S6ri/XTz6eEgvdqfsfkw==","ZxEF/K58SR25QVPpKDYMzA=="],"X-IronPort-AV":["E=McAfee;i=\"6800,10657,11739\"; a=\"86471715\"","E=Sophos;i=\"6.23,138,1770624000\";\n d=\"scan'208\";a=\"86471715\"","E=Sophos;i=\"6.23,138,1770624000\";\n d=\"scan'208\";a=\"224666153\""],"X-ExtLoop1":"1","From":"=?utf-8?q?Ilpo_J=C3=A4rvinen?= ","To":"linux-pci@vger.kernel.org,\n\tBjorn Helgaas ,\n\tGuenter Roeck ,\n\tlinux-alpha@vger.kernel.org,\n\tlinux-arm-kernel@lists.infradead.org,\n\tlinux-m68k@lists.linux-m68k.org,\n\tlinux-mips@vger.kernel.org,\n\tlinux-parisc@vger.kernel.org,\n\tlinuxppc-dev@lists.ozlabs.org,\n\tlinux-s390@vger.kernel.org,\n\tlinux-sh@vger.kernel.org,\n\tRussell King ,\n\tGeert Uytterhoeven ,\n\tThomas Bogendoerfer ,\n\t\"James E.J. Bottomley\" ,\n\tHelge Deller ,\n\tMichael Ellerman ,\n\tThomas Gleixner ,\n\tIngo Molnar ,\n\tBorislav Petkov ,\n\tDave Hansen ,\n\t\"H. Peter Anvin\" ,\n\tChris Zankel ,\n\tMax Filippov ,\n\tMadhavan Srinivasan ,\n\tYoshinori Sato ,\n\tRich Felker ,\n\tJohn Paul Adrian Glaubitz ,\n\tRichard Henderson ,\n\tMatt Turner ,\n\tMagnus Lindholm ,\n\tNicholas Piggin ,\n\t\"Christophe Leroy (CS GROUP)\" ,\n\tNiklas Schnelle ,\n\tGerald Schaefer ,\n\tHeiko Carstens ,\n\tVasily Gorbik ,\n\tAlexander Gordeev ,\n\tChristian Borntraeger ,\n\tSven Schnelle ,\n\tx86@kernel.org,\n\tDominik Brodowski ,\n\tlinux-kernel@vger.kernel.org","Cc":"=?utf-8?q?Ilpo_J=C3=A4rvinen?= ","Subject":"[PATCH 02/10] resource: Pass full extent of empty space to\n resource_alignf CB","Date":"Tue, 24 Mar 2026 18:56:25 +0200","Message-Id":"<20260324165633.4583-3-ilpo.jarvinen@linux.intel.com>","X-Mailer":"git-send-email 2.39.5","In-Reply-To":"<20260324165633.4583-1-ilpo.jarvinen@linux.intel.com>","References":"<20260324165633.4583-1-ilpo.jarvinen@linux.intel.com>","X-Mailing-List":"linuxppc-dev@lists.ozlabs.org","List-Id":"","List-Help":"","List-Owner":"","List-Post":"","List-Archive":",\n ","List-Subscribe":",\n ,\n ","List-Unsubscribe":"","Precedence":"list","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","X-Spam-Status":"No, score=-2.3 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED,\n\tDKIM_VALID,RCVD_IN_DNSWL_MED,SPF_HELO_NONE,SPF_PASS autolearn=disabled\n\tversion=4.0.1 OzLabs 8","X-Spam-Checker-Version":"SpamAssassin 4.0.1 (2024-03-25) on lists.ozlabs.org"},"content":"__find_resource_space() calculates the full extent of empty space but\nonly passes the aligned space to resource_alignf callback. In some\nsituations, the callback may choose take advantage of the free space\nbefore the requested alignment.\n\nPass the full extent of the calculated empty space to resource_alignf\ncallback as an additional parameter.\n\nSigned-off-by: Ilpo Järvinen \n---\n arch/alpha/kernel/pci.c | 1 +\n arch/arm/kernel/bios32.c | 4 +++-\n arch/m68k/kernel/pcibios.c | 4 +++-\n arch/mips/pci/pci-generic.c | 3 ++-\n arch/mips/pci/pci-legacy.c | 1 +\n arch/parisc/kernel/pci.c | 4 +++-\n arch/powerpc/kernel/pci-common.c | 4 +++-\n arch/s390/pci/pci.c | 1 +\n arch/sh/drivers/pci/pci.c | 4 +++-\n arch/x86/pci/i386.c | 3 ++-\n arch/xtensa/kernel/pci.c | 1 +\n drivers/pci/setup-res.c | 3 ++-\n drivers/pcmcia/rsrc_nonstatic.c | 3 ++-\n include/linux/ioport.h | 2 ++\n include/linux/pci.h | 7 ++++---\n kernel/resource.c | 3 ++-\n 16 files changed, 35 insertions(+), 13 deletions(-)","diff":"diff --git a/arch/alpha/kernel/pci.c b/arch/alpha/kernel/pci.c\nindex 51a8a4c4572a..11df411b1d18 100644\n--- a/arch/alpha/kernel/pci.c\n+++ b/arch/alpha/kernel/pci.c\n@@ -125,6 +125,7 @@ DECLARE_PCI_FIXUP_FINAL(PCI_ANY_ID, PCI_ANY_ID, pcibios_fixup_final);\n \n resource_size_t\n pcibios_align_resource(void *data, const struct resource *res,\n+\t\t const struct resource *empty_res,\n \t\t resource_size_t size, resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\ndiff --git a/arch/arm/kernel/bios32.c b/arch/arm/kernel/bios32.c\nindex b5793e8fbdc1..5b9b4fcd0e54 100644\n--- a/arch/arm/kernel/bios32.c\n+++ b/arch/arm/kernel/bios32.c\n@@ -560,7 +560,9 @@ char * __init pcibios_setup(char *str)\n * which might be mirrored at 0x0100-0x03ff..\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\t\tresource_size_t size, resource_size_t align)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\n \tresource_size_t start = res->start;\ndiff --git a/arch/m68k/kernel/pcibios.c b/arch/m68k/kernel/pcibios.c\nindex e6ab3f9ff5d8..1415f6e4e5ce 100644\n--- a/arch/m68k/kernel/pcibios.c\n+++ b/arch/m68k/kernel/pcibios.c\n@@ -27,7 +27,9 @@\n * which might be mirrored at 0x0100-0x03ff..\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\tresource_size_t size, resource_size_t align)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t align)\n {\n \tresource_size_t start = res->start;\n \ndiff --git a/arch/mips/pci/pci-generic.c b/arch/mips/pci/pci-generic.c\nindex d2d68bac3d25..f4957c26efc7 100644\n--- a/arch/mips/pci/pci-generic.c\n+++ b/arch/mips/pci/pci-generic.c\n@@ -22,7 +22,8 @@\n * which might have be mirrored at 0x0100-0x03ff..\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\t\tresource_size_t size, resource_size_t align)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size, resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\n \tresource_size_t start = res->start;\ndiff --git a/arch/mips/pci/pci-legacy.c b/arch/mips/pci/pci-legacy.c\nindex d04b7c1294b6..817e97402afe 100644\n--- a/arch/mips/pci/pci-legacy.c\n+++ b/arch/mips/pci/pci-legacy.c\n@@ -52,6 +52,7 @@ unsigned long pci_address_to_pio(phys_addr_t address)\n */\n resource_size_t\n pcibios_align_resource(void *data, const struct resource *res,\n+\t\t const struct resource *empty_res,\n \t\t resource_size_t size, resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\ndiff --git a/arch/parisc/kernel/pci.c b/arch/parisc/kernel/pci.c\nindex cf285b17a5ae..f99b20795d5a 100644\n--- a/arch/parisc/kernel/pci.c\n+++ b/arch/parisc/kernel/pci.c\n@@ -196,7 +196,9 @@ void __ref pcibios_init_bridge(struct pci_dev *dev)\n * than res->start.\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\t\tresource_size_t size, resource_size_t alignment)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t alignment)\n {\n \tresource_size_t mask, align, start = res->start;\n \ndiff --git a/arch/powerpc/kernel/pci-common.c b/arch/powerpc/kernel/pci-common.c\nindex a7a2fb605971..e7bfa15da043 100644\n--- a/arch/powerpc/kernel/pci-common.c\n+++ b/arch/powerpc/kernel/pci-common.c\n@@ -1132,7 +1132,9 @@ static int skip_isa_ioresource_align(struct pci_dev *dev)\n * which might have be mirrored at 0x0100-0x03ff..\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\t\tresource_size_t size, resource_size_t align)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\n \tresource_size_t start = res->start;\ndiff --git a/arch/s390/pci/pci.c b/arch/s390/pci/pci.c\nindex 2a430722cbe4..39bd2adfc240 100644\n--- a/arch/s390/pci/pci.c\n+++ b/arch/s390/pci/pci.c\n@@ -266,6 +266,7 @@ static int zpci_cfg_store(struct zpci_dev *zdev, int offset, u32 val, u8 len)\n }\n \n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n+\t\t\t\t const struct resource *empty_res,\n \t\t\t\t resource_size_t size,\n \t\t\t\t resource_size_t align)\n {\ndiff --git a/arch/sh/drivers/pci/pci.c b/arch/sh/drivers/pci/pci.c\nindex a3903304f33f..7a0522316ee3 100644\n--- a/arch/sh/drivers/pci/pci.c\n+++ b/arch/sh/drivers/pci/pci.c\n@@ -168,7 +168,9 @@ subsys_initcall(pcibios_init);\n * modulo 0x400.\n */\n resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\t\tresource_size_t size, resource_size_t align)\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\n \tstruct pci_channel *hose = dev->sysdata;\ndiff --git a/arch/x86/pci/i386.c b/arch/x86/pci/i386.c\nindex c4ec39ad276b..6fbd4b34c3f7 100644\n--- a/arch/x86/pci/i386.c\n+++ b/arch/x86/pci/i386.c\n@@ -153,7 +153,8 @@ skip_isa_ioresource_align(struct pci_dev *dev) {\n */\n resource_size_t\n pcibios_align_resource(void *data, const struct resource *res,\n-\t\t\tresource_size_t size, resource_size_t align)\n+\t\t const struct resource *empty_res,\n+\t\t resource_size_t size, resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\n \tresource_size_t start = res->start;\ndiff --git a/arch/xtensa/kernel/pci.c b/arch/xtensa/kernel/pci.c\nindex 62c900e400d6..64ccb7e0d92f 100644\n--- a/arch/xtensa/kernel/pci.c\n+++ b/arch/xtensa/kernel/pci.c\n@@ -39,6 +39,7 @@\n */\n resource_size_t\n pcibios_align_resource(void *data, const struct resource *res,\n+\t\t const struct resource *empty_res,\n \t\t resource_size_t size, resource_size_t align)\n {\n \tstruct pci_dev *dev = data;\ndiff --git a/drivers/pci/setup-res.c b/drivers/pci/setup-res.c\nindex bb2aef373d6f..c375e255c509 100644\n--- a/drivers/pci/setup-res.c\n+++ b/drivers/pci/setup-res.c\n@@ -251,10 +251,11 @@ static int pci_revert_fw_address(struct resource *res, struct pci_dev *dev,\n */\n resource_size_t __weak pcibios_align_resource(void *data,\n \t\t\t\t\t const struct resource *res,\n+\t\t\t\t\t const struct resource *empty_res,\n \t\t\t\t\t resource_size_t size,\n \t\t\t\t\t resource_size_t align)\n {\n- return res->start;\n+\treturn res->start;\n }\n \n static int __pci_assign_resource(struct pci_bus *bus, struct pci_dev *dev,\ndiff --git a/drivers/pcmcia/rsrc_nonstatic.c b/drivers/pcmcia/rsrc_nonstatic.c\nindex 0679dd434719..949e69921fe9 100644\n--- a/drivers/pcmcia/rsrc_nonstatic.c\n+++ b/drivers/pcmcia/rsrc_nonstatic.c\n@@ -602,7 +602,8 @@ static resource_size_t pcmcia_common_align(struct pcmcia_align_data *align_data,\n \n static resource_size_t\n pcmcia_align(void *align_data, const struct resource *res,\n-\tresource_size_t size, resource_size_t align)\n+\t const struct resource *empty_res,\n+\t resource_size_t size, resource_size_t align)\n {\n \tstruct pcmcia_align_data *data = align_data;\n \tstruct resource_map *m;\ndiff --git a/include/linux/ioport.h b/include/linux/ioport.h\nindex 19d5e04564d9..3c73c9c0d4f7 100644\n--- a/include/linux/ioport.h\n+++ b/include/linux/ioport.h\n@@ -202,6 +202,7 @@ enum {\n * typedef resource_alignf - Resource alignment callback\n * @data:\tPrivate data used by the callback\n * @res:\tResource candidate range (an empty resource space)\n+ * @empty_res:\tEmpty resource range without alignment applied\n * @size:\tThe minimum size of the empty space\n * @align:\tAlignment from the constraints\n *\n@@ -212,6 +213,7 @@ enum {\n */\n typedef resource_size_t (*resource_alignf)(void *data,\n \t\t\t\t\t const struct resource *res,\n+\t\t\t\t\t const struct resource *empty_res,\n \t\t\t\t\t resource_size_t size,\n \t\t\t\t\t resource_size_t align);\n \ndiff --git a/include/linux/pci.h b/include/linux/pci.h\nindex 1c270f1d5123..ac332ff9da9f 100644\n--- a/include/linux/pci.h\n+++ b/include/linux/pci.h\n@@ -1206,9 +1206,10 @@ int __must_check pcibios_enable_device(struct pci_dev *, int mask);\n char *pcibios_setup(char *str);\n \n /* Used only when drivers/pci/setup.c is used */\n-resource_size_t pcibios_align_resource(void *, const struct resource *,\n-\t\t\t\tresource_size_t,\n-\t\t\t\tresource_size_t);\n+resource_size_t pcibios_align_resource(void *data, const struct resource *res,\n+\t\t\t\t const struct resource *empty_res,\n+\t\t\t\t resource_size_t size,\n+\t\t\t\t resource_size_t align);\n \n /* Generic PCI functions used internally */\n \ndiff --git a/kernel/resource.c b/kernel/resource.c\nindex 1e2f1dfc0edd..1b8d3101bdc6 100644\n--- a/kernel/resource.c\n+++ b/kernel/resource.c\n@@ -759,7 +759,8 @@ static int __find_resource_space(struct resource *root, struct resource *old,\n \t\t\talloc.flags = avail.flags;\n \t\t\tif (alignf) {\n \t\t\t\talloc.start = alignf(constraint->alignf_data,\n-\t\t\t\t\t\t &avail, size, constraint->align);\n+\t\t\t\t\t\t &avail, &tmp,\n+\t\t\t\t\t\t size, constraint->align);\n \t\t\t} else {\n \t\t\t\talloc.start = avail.start;\n \t\t\t}\n","prefixes":["02/10"]}