From: "Németh Márton" <nm127@freemail.hu>
To: "H. Peter Anvin" <hpa@zytor.com>
Cc: Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@redhat.com>,
x86@kernel.org, Tony Luck <tony.luck@intel.com>,
Fenghua Yu <fenghua.yu@intel.com>,
linux-ia64@vger.kernel.org, Julia Lawall <julia@diku.dk>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] x86 pci acpi: rename struct pci_root_info
Date: Sun, 15 May 2011 21:09:33 +0200 [thread overview]
Message-ID: <4DD024ED.9000509@freemail.hu> (raw)
In-Reply-To: <4DCEC4EB.2050107@zytor.com>
From: Márton Németh <nm127@freemail.hu>
Rename struct pci_root_info to struct acpi_pci_root_info in
arch/x86/pci/acpi.c because there is already a struct
pci_root_info declared in arch/x86/pci/bus_numa.h . They both
belnog to x86 architecture and the two declarations differ,
so after rename each will have a unique name.
Signed-off-by: Márton Németh <nm127@freemail.hu>
---
--- linux-2.6.39-rc7/arch/x86/pci/acpi.c.orig 2011-05-10 04:33:54.000000000 +0200
+++ linux-2.6.39-rc7/arch/x86/pci/acpi.c 2011-05-15 17:02:52.000000000 +0200
@@ -7,7 +7,7 @@
#include <asm/numa.h>
#include <asm/pci_x86.h>
-struct pci_root_info {
+struct acpi_pci_root_info {
struct acpi_device *bridge;
char *name;
unsigned int res_num;
@@ -120,7 +120,7 @@ resource_to_addr(struct acpi_resource *r
static acpi_status
count_resource(struct acpi_resource *acpi_res, void *data)
{
- struct pci_root_info *info = data;
+ struct acpi_pci_root_info *info = data;
struct acpi_resource_address64 addr;
acpi_status status;
@@ -133,7 +133,7 @@ count_resource(struct acpi_resource *acp
static acpi_status
setup_resource(struct acpi_resource *acpi_res, void *data)
{
- struct pci_root_info *info = data;
+ struct acpi_pci_root_info *info = data;
struct resource *res;
struct acpi_resource_address64 addr;
acpi_status status;
@@ -188,7 +188,7 @@ static bool resource_contains(struct res
return false;
}
-static void coalesce_windows(struct pci_root_info *info, int type)
+static void coalesce_windows(struct acpi_pci_root_info *info, int type)
{
int i, j;
struct resource *res1, *res2;
@@ -223,7 +223,7 @@ static void coalesce_windows(struct pci_
}
}
-static void add_resources(struct pci_root_info *info)
+static void add_resources(struct acpi_pci_root_info *info)
{
int i;
struct resource *res, *root, *conflict;
@@ -259,7 +259,7 @@ static void
get_current_resources(struct acpi_device *device, int busnum,
int domain, struct pci_bus *bus)
{
- struct pci_root_info info;
+ struct acpi_pci_root_info info;
size_t size;
if (pci_use_crs)
prev parent reply other threads:[~2011-05-15 19:10 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-14 17:02 incompatible struct pci_root_info? Németh Márton
2011-05-14 18:07 ` H. Peter Anvin
2011-05-15 19:09 ` Németh Márton [this message]
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=4DD024ED.9000509@freemail.hu \
--to=nm127@freemail.hu \
--cc=fenghua.yu@intel.com \
--cc=hpa@zytor.com \
--cc=julia@diku.dk \
--cc=linux-ia64@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=tglx@linutronix.de \
--cc=tony.luck@intel.com \
--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