* [PATCH] x86: rename arch/x86/kernel/pci-swiotlb_64.o => pci-swiotlb.o
@ 2009-01-23 10:56 Ian Campbell
2009-01-23 11:07 ` Ingo Molnar
0 siblings, 1 reply; 2+ messages in thread
From: Ian Campbell @ 2009-01-23 10:56 UTC (permalink / raw)
To: linux-kernel; +Cc: Ian Campbell, Ian Campbell, Jeremy Fitzhardinge, Ingo Molnar
The file is used for 32 and 64 bit since:
commit cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8
Author: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue Dec 16 12:17:36 2008 -0800
x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Cc: Ingo Molnar <mingo@elte.hu>
---
arch/x86/kernel/Makefile | 2 +-
.../x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} | 0
2 files changed, 1 insertions(+), 1 deletions(-)
rename arch/x86/kernel/{pci-swiotlb_64.c => pci-swiotlb.c} (100%)
diff --git a/arch/x86/kernel/Makefile b/arch/x86/kernel/Makefile
index d364df0..bb1eef6 100644
--- a/arch/x86/kernel/Makefile
+++ b/arch/x86/kernel/Makefile
@@ -109,7 +109,7 @@ obj-$(CONFIG_MICROCODE) += microcode.o
obj-$(CONFIG_X86_CHECK_BIOS_CORRUPTION) += check.o
-obj-$(CONFIG_SWIOTLB) += pci-swiotlb_64.o # NB rename without _64
+obj-$(CONFIG_SWIOTLB) += pci-swiotlb.o
###
# 64 bit specific files
diff --git a/arch/x86/kernel/pci-swiotlb_64.c b/arch/x86/kernel/pci-swiotlb.c
similarity index 100%
rename from arch/x86/kernel/pci-swiotlb_64.c
rename to arch/x86/kernel/pci-swiotlb.c
--
1.5.6.5
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH] x86: rename arch/x86/kernel/pci-swiotlb_64.o => pci-swiotlb.o
2009-01-23 10:56 [PATCH] x86: rename arch/x86/kernel/pci-swiotlb_64.o => pci-swiotlb.o Ian Campbell
@ 2009-01-23 11:07 ` Ingo Molnar
0 siblings, 0 replies; 2+ messages in thread
From: Ingo Molnar @ 2009-01-23 11:07 UTC (permalink / raw)
To: Ian Campbell; +Cc: linux-kernel, Jeremy Fitzhardinge
* Ian Campbell <Ian.Campbell@citrix.com> wrote:
> The file is used for 32 and 64 bit since:
>
> commit cfb80c9eae8c7ed8f2ee81090062d15ead51cbe8
> Author: Jeremy Fitzhardinge <jeremy@goop.org>
> Date: Tue Dec 16 12:17:36 2008 -0800
>
> x86: unify pci iommu setup and allow swiotlb to compile for 32 bit
>
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> Cc: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
> Cc: Ingo Molnar <mingo@elte.hu>
applied to tip/core/iommu, thanks Ian!
Ingo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2009-01-23 11:07 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-01-23 10:56 [PATCH] x86: rename arch/x86/kernel/pci-swiotlb_64.o => pci-swiotlb.o Ian Campbell
2009-01-23 11:07 ` Ingo Molnar
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®