From: Yinghai Lu <yinghai@kernel.org>
To: Bjorn Helgaas <bhelgaas@google.com>,
Benjamin Herrenschmidt <benh@kernel.crashing.org>,
Tony Luck <tony.luck@intel.com>,
David Miller <davem@davemloft.net>, x86 <x86@kernel.org>
Cc: Dominik Brodowski <linux@dominikbrodowski.net>,
Andrew Morton <akpm@linux-foundation.org>,
Linus Torvalds <torvalds@linux-foundation.org>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org,
linux-arch@vger.kernel.org, Yinghai Lu <yinghai@kernel.org>
Subject: [PATCH 05/21] resource: adjust_resource handle resource without parent
Date: Mon, 7 May 2012 13:29:50 -0700 [thread overview]
Message-ID: <1336422606-4244-6-git-send-email-yinghai@kernel.org> (raw)
In-Reply-To: <1336422606-4244-1-git-send-email-yinghai@kernel.org>
for no parent no siling case.
Signed-off-by: Yinghai Lu <yinghai@kernel.org>
---
kernel/resource.c | 13 ++++++++-----
1 files changed, 8 insertions(+), 5 deletions(-)
diff --git a/kernel/resource.c b/kernel/resource.c
index 7e8ea66..51ade23 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -722,14 +722,12 @@ int adjust_resource(struct resource *res, resource_size_t start, resource_size_t
write_lock(&resource_lock);
+ if (!parent)
+ goto skip;
+
if ((start < parent->start) || (end > parent->end))
goto out;
- for (tmp = res->child; tmp; tmp = tmp->sibling) {
- if ((tmp->start < start) || (tmp->end > end))
- goto out;
- }
-
if (res->sibling && (res->sibling->start <= end))
goto out;
@@ -741,6 +739,11 @@ int adjust_resource(struct resource *res, resource_size_t start, resource_size_t
goto out;
}
+skip:
+ for (tmp = res->child; tmp; tmp = tmp->sibling)
+ if ((tmp->start < start) || (tmp->end > end))
+ goto out;
+
res->start = start;
res->end = end;
result = 0;
--
1.7.7
next prev parent reply other threads:[~2012-05-07 20:30 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-07 20:29 [PATCH 00/21] PCI: use busn_res to replace bus secondary/subordinate Yinghai Lu
2012-05-07 20:29 ` [PATCH 01/21] PCI: add busn_res into struct pci_bus Yinghai Lu
2012-05-07 20:29 ` [PATCH 02/21] PCI: replace secondary/subordinate with busn_res Yinghai Lu
2012-05-07 20:29 ` [PATCH 03/21] PCI: Remove secondary/subordinate in struct ci_bus Yinghai Lu
2012-05-07 20:29 ` [PATCH 04/21] PCI: Add busn_res for pci domain Yinghai Lu
2012-05-07 20:29 ` Yinghai Lu [this message]
2012-05-18 17:12 ` [PATCH 05/21] resource: adjust_resource handle resource without parent Bjorn Helgaas
2012-05-18 17:54 ` Yinghai Lu
2012-05-18 18:06 ` Bjorn Helgaas
2012-05-07 20:29 ` [PATCH 06/21] PCI: Add busn_res operation functions Yinghai Lu
2012-05-07 20:29 ` [PATCH 07/21] PCI: print conflicting entry in busn_res inserting Yinghai Lu
2012-05-07 20:29 ` [PATCH 08/21] PCI: release busn_res when removing bus Yinghai Lu
2012-05-07 20:29 ` [PATCH 09/21] PCI: Insert busn_res in pci_create_root_bus() Yinghai Lu
2012-05-07 20:29 ` [PATCH 10/21] PCI: checking busn_res in pci_scan_root_bus() Yinghai Lu
2012-05-07 20:29 ` [PATCH 11/21] PCI: Add default busn_resource Yinghai Lu
2012-05-07 20:29 ` [PATCH 12/21] PCI: Add default busn_res for pci_scan_bus() Yinghai Lu
2012-05-07 20:29 ` [PATCH 13/21] x86/PCI: add busn_res into resources list for ACPI path Yinghai Lu
2012-05-07 20:29 ` [PATCH 14/21] x86/PCI: put busn resource in pci_root_info for native host bridge drivers Yinghai Lu
2012-05-07 20:30 ` [PATCH 15/21] ia64/PCI: register busn_res for root buses Yinghai Lu
2012-05-07 20:30 ` [PATCH 16/21] sparc/PCI: " Yinghai Lu
2012-05-07 20:43 ` David Miller
2012-05-07 20:30 ` [PATCH 17/21] powerpc/PCI: " Yinghai Lu
2012-05-07 20:30 ` [PATCH 18/21] parisc/PCI: " Yinghai Lu
2012-05-07 20:30 ` [PATCH 19/21] tile/PCI: Use pci_scan_root_bus instead pci_scan_bus Yinghai Lu
2012-05-09 19:32 ` Chris Metcalf
2012-05-09 19:45 ` Yinghai Lu
2012-05-07 20:30 ` [PATCH 20/21] PCI: Register busn_res for iov bus Yinghai Lu
2012-05-07 20:30 ` [PATCH 21/21] PCI: insert busn_res for child bus Yinghai Lu
2012-05-17 22:19 ` [PATCH 00/21] PCI: use busn_res to replace bus secondary/subordinate Bjorn Helgaas
2012-05-18 2:13 ` Yinghai Lu
2012-05-18 23:32 ` Bjorn Helgaas
2012-05-19 4:38 ` Yinghai Lu
2012-05-21 20:06 ` Bjorn Helgaas
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1336422606-4244-6-git-send-email-yinghai@kernel.org \
--to=yinghai@kernel.org \
--cc=akpm@linux-foundation.org \
--cc=benh@kernel.crashing.org \
--cc=bhelgaas@google.com \
--cc=davem@davemloft.net \
--cc=gregkh@linuxfoundation.org \
--cc=linux-arch@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
--cc=linux@dominikbrodowski.net \
--cc=tony.luck@intel.com \
--cc=torvalds@linux-foundation.org \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).