* [PATCH] x86, amd-nb: Rename CPU PCI id define for F4
@ 2011-03-30 18:34 Borislav Petkov
2011-03-31 7:04 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
0 siblings, 1 reply; 6+ messages in thread
From: Borislav Petkov @ 2011-03-30 18:34 UTC (permalink / raw)
To: Ingo Molnar, H. Peter Anvin, Thomas Gleixner; +Cc: Jesse Barnes, LKML
With increasing number of PCI function ids, add the PCI function id
in the define name instead of its symbolic name in the BKDG for more
clarity. This renames function 4 define.
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
---
arch/x86/kernel/amd_nb.c | 2 +-
include/linux/pci_ids.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 6801959..4c39baa 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
EXPORT_SYMBOL(amd_nb_misc_ids);
static struct pci_device_id amd_nb_link_ids[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
{}
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 11fd381..4e2c915 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -518,7 +518,7 @@
#define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
#define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603
-#define PCI_DEVICE_ID_AMD_15H_NB_LINK 0x1604
+#define PCI_DEVICE_ID_AMD_15H_NB_F4 0x1604
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
--
1.7.4.rc2
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
^ permalink raw reply related [flat|nested] 6+ messages in thread* [tip:x86/urgent] x86, amd-nb: Rename CPU PCI id define for F4
2011-03-30 18:34 [PATCH] x86, amd-nb: Rename CPU PCI id define for F4 Borislav Petkov
@ 2011-03-31 7:04 ` tip-bot for Borislav Petkov
2011-03-31 16:00 ` Jesse Barnes
0 siblings, 1 reply; 6+ messages in thread
From: tip-bot for Borislav Petkov @ 2011-03-31 7:04 UTC (permalink / raw)
To: linux-tip-commits
Cc: linux-kernel, hpa, mingo, bp, jbarnes, tglx, borislav.petkov,
mingo
Commit-ID: cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Gitweb: http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
Author: Borislav Petkov <bp@amd64.org>
AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
Committer: Ingo Molnar <mingo@elte.hu>
CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
x86, amd-nb: Rename CPU PCI id define for F4
With increasing number of PCI function ids, add the PCI function
id in the define name instead of its symbolic name in the BKDG
for more clarity. This renames function 4 define.
Signed-off-by: Borislav Petkov <borislav.petkov@amd.com>
Cc: Jesse Barnes <jbarnes@virtuousgeek.org>
LKML-Reference: <20110330183447.GA3668@aftab>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/amd_nb.c | 2 +-
include/linux/pci_ids.h | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/kernel/amd_nb.c b/arch/x86/kernel/amd_nb.c
index 6801959..4c39baa 100644
--- a/arch/x86/kernel/amd_nb.c
+++ b/arch/x86/kernel/amd_nb.c
@@ -21,7 +21,7 @@ const struct pci_device_id amd_nb_misc_ids[] = {
EXPORT_SYMBOL(amd_nb_misc_ids);
static struct pci_device_id amd_nb_link_ids[] = {
- { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_LINK) },
+ { PCI_DEVICE(PCI_VENDOR_ID_AMD, PCI_DEVICE_ID_AMD_15H_NB_F4) },
{}
};
diff --git a/include/linux/pci_ids.h b/include/linux/pci_ids.h
index 11fd381..4e2c915 100644
--- a/include/linux/pci_ids.h
+++ b/include/linux/pci_ids.h
@@ -518,7 +518,7 @@
#define PCI_DEVICE_ID_AMD_11H_NB_MISC 0x1303
#define PCI_DEVICE_ID_AMD_11H_NB_LINK 0x1304
#define PCI_DEVICE_ID_AMD_15H_NB_F3 0x1603
-#define PCI_DEVICE_ID_AMD_15H_NB_LINK 0x1604
+#define PCI_DEVICE_ID_AMD_15H_NB_F4 0x1604
#define PCI_DEVICE_ID_AMD_CNB17H_F3 0x1703
#define PCI_DEVICE_ID_AMD_LANCE 0x2000
#define PCI_DEVICE_ID_AMD_LANCE_HOME 0x2001
^ permalink raw reply related [flat|nested] 6+ messages in thread* Re: [tip:x86/urgent] x86, amd-nb: Rename CPU PCI id define for F4
2011-03-31 7:04 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
@ 2011-03-31 16:00 ` Jesse Barnes
2011-03-31 16:05 ` Ingo Molnar
0 siblings, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2011-03-31 16:00 UTC (permalink / raw)
To: mingo, hpa, linux-kernel, bp, jbarnes, tglx, borislav.petkov,
mingo
Cc: linux-tip-commits
On Thu, 31 Mar 2011 07:04:41 GMT
tip-bot for Borislav Petkov <bp@amd64.org> wrote:
> Commit-ID: cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> Gitweb: http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> Author: Borislav Petkov <bp@amd64.org>
> AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
> Committer: Ingo Molnar <mingo@elte.hu>
> CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
>
> x86, amd-nb: Rename CPU PCI id define for F4
>
> With increasing number of PCI function ids, add the PCI function
> id in the define name instead of its symbolic name in the BKDG
> for more clarity. This renames function 4 define.
>
I guess I don't see how a rename is urgent, but you can add my
Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:x86/urgent] x86, amd-nb: Rename CPU PCI id define for F4
2011-03-31 16:00 ` Jesse Barnes
@ 2011-03-31 16:05 ` Ingo Molnar
2011-03-31 16:14 ` Jesse Barnes
0 siblings, 1 reply; 6+ messages in thread
From: Ingo Molnar @ 2011-03-31 16:05 UTC (permalink / raw)
To: Jesse Barnes
Cc: mingo, hpa, linux-kernel, bp, tglx, borislav.petkov,
linux-tip-commits
* Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
> On Thu, 31 Mar 2011 07:04:41 GMT
> tip-bot for Borislav Petkov <bp@amd64.org> wrote:
>
> > Commit-ID: cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> > Gitweb: http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> > Author: Borislav Petkov <bp@amd64.org>
> > AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
> > Committer: Ingo Molnar <mingo@elte.hu>
> > CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
> >
> > x86, amd-nb: Rename CPU PCI id define for F4
> >
> > With increasing number of PCI function ids, add the PCI function
> > id in the define name instead of its symbolic name in the BKDG
> > for more clarity. This renames function 4 define.
> >
>
> I guess I don't see how a rename is urgent, but you can add my
> Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
The new ID went upstream via cb293250c71f in the merge window, so i wanted to
shorten the life-time of the obsoleted name - that will also reduce the chance
of any conflicts.
Thanks,
Ingo
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:x86/urgent] x86, amd-nb: Rename CPU PCI id define for F4
2011-03-31 16:05 ` Ingo Molnar
@ 2011-03-31 16:14 ` Jesse Barnes
2011-03-31 16:28 ` Borislav Petkov
0 siblings, 1 reply; 6+ messages in thread
From: Jesse Barnes @ 2011-03-31 16:14 UTC (permalink / raw)
To: Ingo Molnar
Cc: mingo, hpa, linux-kernel, bp, tglx, borislav.petkov,
linux-tip-commits
On Thu, 31 Mar 2011 18:05:52 +0200
Ingo Molnar <mingo@elte.hu> wrote:
>
> * Jesse Barnes <jbarnes@virtuousgeek.org> wrote:
>
> > On Thu, 31 Mar 2011 07:04:41 GMT
> > tip-bot for Borislav Petkov <bp@amd64.org> wrote:
> >
> > > Commit-ID: cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> > > Gitweb: http://git.kernel.org/tip/cb6c8520f6f6bba7b7e1a6de3360a8edfd8243b6
> > > Author: Borislav Petkov <bp@amd64.org>
> > > AuthorDate: Wed, 30 Mar 2011 20:34:47 +0200
> > > Committer: Ingo Molnar <mingo@elte.hu>
> > > CommitDate: Thu, 31 Mar 2011 08:51:38 +0200
> > >
> > > x86, amd-nb: Rename CPU PCI id define for F4
> > >
> > > With increasing number of PCI function ids, add the PCI function
> > > id in the define name instead of its symbolic name in the BKDG
> > > for more clarity. This renames function 4 define.
> > >
> >
> > I guess I don't see how a rename is urgent, but you can add my
> > Acked-by: Jesse Barnes <jbarnes@virtuousgeek.org>
>
> The new ID went upstream via cb293250c71f in the merge window, so i wanted to
> shorten the life-time of the obsoleted name - that will also reduce the chance
> of any conflicts.
Sounds good, thanks.
--
Jesse Barnes, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [tip:x86/urgent] x86, amd-nb: Rename CPU PCI id define for F4
2011-03-31 16:14 ` Jesse Barnes
@ 2011-03-31 16:28 ` Borislav Petkov
0 siblings, 0 replies; 6+ messages in thread
From: Borislav Petkov @ 2011-03-31 16:28 UTC (permalink / raw)
To: Jesse Barnes
Cc: Ingo Molnar, mingo@redhat.com, hpa@zytor.com,
linux-kernel@vger.kernel.org, bp@amd64.org, tglx@linutronix.de,
linux-tip-commits@vger.kernel.org
On Thu, Mar 31, 2011 at 12:14:01PM -0400, Jesse Barnes wrote:
> > The new ID went upstream via cb293250c71f in the merge window, so i wanted to
> > shorten the life-time of the obsoleted name - that will also reduce the chance
> > of any conflicts.
>
> Sounds good, thanks.
Yep, definitely a good idea since I have a couple of patches coming up
for the next merge window and they use this particular #define. That's
why I sent it out now, thinking it is trivial enough to go in and thus
to avoid conflicts at merge window time.
Thanks.
--
Regards/Gruss,
Boris.
Advanced Micro Devices GmbH
Einsteinring 24, 85609 Dornach
General Managers: Alberto Bozzo, Andrew Bowd
Registration: Dornach, Gemeinde Aschheim, Landkreis Muenchen
Registergericht Muenchen, HRB Nr. 43632
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-03-31 16:28 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-03-30 18:34 [PATCH] x86, amd-nb: Rename CPU PCI id define for F4 Borislav Petkov
2011-03-31 7:04 ` [tip:x86/urgent] " tip-bot for Borislav Petkov
2011-03-31 16:00 ` Jesse Barnes
2011-03-31 16:05 ` Ingo Molnar
2011-03-31 16:14 ` Jesse Barnes
2011-03-31 16:28 ` Borislav Petkov
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox