x86/pci: Renaming numa into numaq
cover x86/pci: Renaming numa into numaq
This patch series renames numa into numaq for x86/pci code.
-Robert
--
Advanced Micro Devices, Inc.
Operating System Research Center
email: [email protected]
PATCH 1/2 x86/pci: renamed: numa.c -> numaq_32.c
--- arch/x86/pci/Makefile | 2 +- arch/x86/pci/numa.c | 178 ----------------------------------------------- arch/x86/pci/numaq_32.c | 178 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 179 insertions(+), 179 deletions(-) delete mode 100644 arch/x86/pci/numa.c create mode 100644 arch/x86/pci/numaq_32.c
arch/x86/pci/Makefile +1 -1
@@ -11,7 +11,7 @@ obj-y += legacy.o irq.o obj-$(CONFIG_X86_VISWS) += visws.o -obj-$(CONFIG_X86_NUMAQ) += numa.o +obj-$(CONFIG_X86_NUMAQ) += numaq_32.o obj-y += common.o early.o obj-y += amd_bus.o
arch/x86/pci/numa.c deleted +0 -178
178 lines not on this page · raw message
arch/x86/pci/numaq_32.c new file +178 -0
178 lines not on this page · raw message
Signature · 1 line
1.5.5.4
Re: [PATCH 1/2] x86/pci: renamed: numa.c -> numaq_32.c
Hi!
arch/x86/pci/numaq_32.c line 4
Quoted 7 lines · Robert Richter
arch/x86/pci/numaq_32.c new file +4
-0@@ -0,0 +1,178 @@ +/* +* numa.c - Low-level PCI access for NUMA-Q machines +*/ +
Either fix the filename or just drop it completely.
Gabor
Signature · 4 lines
---------------------------------------------------------
MTA SZTAKI Computer and Automation Research Institute
Hungarian Academy of Sciences
---------------------------------------------------------Re: [PATCH 1/2] x86/pci: renamed: numa.c -> numaq_32.c
Quoted 11 lines · Gabor Gombas
arch/x86/pci/numaq_32.c line 4
Quoted 7 lines · Robert Richter
arch/x86/pci/numaq_32.c new file +4
-0@@ -0,0 +1,178 @@ +/* +* numa.c - Low-level PCI access for NUMA-Q machines +*/ +Either fix the filename or just drop it completely.
Next patch in this series. This is only the git-mv.
-Robert
Signature · 3 lines
Advanced Micro Devices, Inc. Operating System Research Center email: [email protected]
Re: [PATCH 1/2] x86/pci: renamed: numa.c -> numaq_32.c
Quoted 3 lines · Robert Richter
Quoted 1 line
Either fix the filename or just drop it completely.
Next patch in this series. This is only the git-mv.
Oh, sorry, I just realized that too. But wouldn't it be better to just omit the file name?
Gabor
Signature · 4 lines
---------------------------------------------------------
MTA SZTAKI Computer and Automation Research Institute
Hungarian Academy of Sciences
---------------------------------------------------------Re: [PATCH 1/2] x86/pci: renamed: numa.c -> numaq_32.c
Quoted 8 lines · Gabor Gombas
Quoted 3 lines · Robert Richter
Quoted 1 line
Either fix the filename or just drop it completely.
Next patch in this series. This is only the git-mv.
Oh, sorry, I just realized that too. But wouldn't it be better to just omit the file name?
Maybe. My only intention was to rename the files and keep the rest including the comments as it is.
-Robert
Signature · 3 lines
Advanced Micro Devices, Inc. Operating System Research Center email: [email protected]
PATCH 2/2 x86/pci: renaming numa into numaq
In reply to Robert Richter--- arch/x86/pci/legacy.c | 2 +- arch/x86/pci/numaq_32.c | 4 ++-- arch/x86/pci/pci.h | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)
arch/x86/pci/legacy.c +1 -1
@@ -58,7 +58,7 @@ static int __init pci_legacy_init(void)int __init pci_subsys_init (void ) {#ifdef CONFIG_X86_NUMAQ -pci_numa_init (); +pci_numaq_init ();#endif #ifdef CONFIG_ACPI pci_acpi_init ();
arch/x86/pci/numaq_32.c +2 -2
@@ -1,5 +1,5 @@/* -* numa.c - Low-level PCI access for NUMA-Q machines +* numaq_32.c - Low-level PCI access for NUMA-Q machines */ #include <linux/pci.h>
@@ -151,7 +151,7 @@ static void __devinit pci_fixup_i450nx(struct pci_dev *d) }DECLARE_PCI_FIXUP_HEADER (PCI_VENDOR_ID_INTEL ,PCI_DEVICE_ID_INTEL_82451NX , pci_fixup_i450nx); -int __init pci_numa_init (void ) +int __init pci_numaq_init (void ) {int quad;
arch/x86/pci/pci.h +1 -1
@@ -107,7 +107,7 @@ extern void __init dmi_check_skip_isa_align(void);/* some common used subsys_initcalls */ extern int __init pci_acpi_init (void );extern int __init pcibios_irq_init (void ); -extern int __init pci_numa_init (void ); +extern int __init pci_numaq_init (void );extern int __init pcibios_init (void );/* pci-mmconfig.c */
Signature · 1 line
1.5.5.4
Ingo Molnar
AppliedQuoted 1 line · Robert Richter
This patch series renames numa into numaq for x86/pci code.
applied to tip/x86/unify-pci:
Robert Richter (5):
x86/pci: Removing pci-y in Makefile
x86/pci: Changing subsystem initialization order for NUMA x86/pci: renamed: numa.c -> numaq_32.c
x86/pci: renaming numa into numaq
x86/pci: Changing subsystem init for visws
thanks Robert.
Jesse, do you give us a general Ack for this direction and these commits? The changes are way too intermixed with other x86 bits to be cleanly separable at this stage, so it would be nice if we merged this via the x86 tree. Find below a list of commit IDs that change arch/x86/pci/ - all but the last few ones are in linux-next as well.
Ingo
3cabf37: x86/pci: Changing subsystem init for visws
e27cf3a: x86/pci: renaming numa into numaq
9314d30: x86/pci: renamed: numa.c -> numaq_32.c
060b970: x86/pci: Changing subsystem initialization order for NUMA 2510495: x86/pci: Removing pci-y in Makefile
f361a45: x86: introduce max_low_pfn_mapped for 64-bit
3a62ed7: x86/pci: fix warnings in subsys_initcall functions 3f68f7d: x86/pci merge: fixing numaq initialization
62fa572: x86, VisWS: turn into generic arch, remove leftover files
b4b8641: x86, VisWS: turn into generic arch, create include/asm-x86/visws/ 5548ed1: x86, VisWS: turn into generic arch, install proper PCI quirk 31ac409: x86, VisWS: turn into generic arch, add early init quirks 22d5c67: x86, VisWS: turn into generic arch, make VisWS boot on a regular PC 8dd779b: x86/pci: removing subsys_initcall ordering dependencies
ae28d70: x86/pci: visws: renaming pcibios_init()
f4d994b: x86/pci: Makefile merge: coalescing 32 and 64 bit
d199a04: x86/pci: merge: moving mp_bus_to_node.c to amd_bus.c 42a4b42: x86/pci: mp_bus_to_node merge: moving code in amd_bus.c 8eefc66: x86/pci: Makefile merge: creating pci-y for 64 bit 8043c7b: x86/pci: Makefile merge: changing 64bit ordering
a5d4fb9: x86/pci: Makefile merge: decoupling options for mp_bus_to_node.o 0b40e84: x86/pci: Makefile merge: whitespace changes only 7fa71c0: x86/pci: Makefile merge: removing include dir flag 6d8566a: x86/pci: Makefile merge: Removing Makefile_*
9197979: x86, pci: introduce pci=ioapicreroute kernel cmdline option
a9322f6: x86, pci: introduce pci=noioapicquirk kernel cmdline option 7d5e406: generic-ipi: x86-tree merge fixes
dbb6152: x86: don't call pxm_to_node again
b755de8: x86: make dev_to_node return online node
0715650: x86: move pci_routirq declaration to pci.h
3a27dd1: x86: Move PCI IO ECS code to x86/pci
24bfdca: x86/pci: Renaming k8-bus_64.c to amd_bus.c
499f8f8: x86: rename pat_wc_enabled to pat_enabled
7058b06: x86: coding style fixes to arch/x86/pci/irq.
d49c428: x86: make generic arch support NUMAQ
831d991: x86: add PCI extended config space access for AMD Barcelona 8004dd9: x86: amd opteron TOM2 mask val fix
968cbfa: x86: make __pci_mmcfg_init static in mmconfig-shared.c
Quoted 12 lines · Ingo Molnar
Quoted 1 line · Robert Richter
This patch series renames numa into numaq for x86/pci code.
applied to tip/x86/unify-pci:
Robert Richter (5):
x86/pci: Removing pci-y inMakefile
x86/pci: Changing subsystem initialization order for NUMA x86/pci: renamed:numa.c->numaq_32.c
x86/pci: renaming numa into numaq
x86/pci: Changing subsystem init for visws
Quoted 7 lines
thanks Robert.
Jesse, do you give us a general Ack for this direction and these commits? The changes are way too intermixed with other x86 bits to be cleanly separable at this stage, so it would be nice if we merged this via the x86 tree. Find below a list of commit IDs that change
arch/x86/pci/- all but the last few ones are in linux-next as well.
Yeah, no problem with the general direction. I'll re-review Robert's latest stuff when I get a chance, but it looked pretty good to me in the first pass.
Thanks,
Jesse