Messages in this thread | | | Date | Fri, 1 Aug 2008 08:51:23 +0900 | Subject | Re: [PATCH] Revert "Merge branch 'x86/iommu' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip into for-linus" | From | FUJITA Tomonori <> |
| |
On Fri, 1 Aug 2008 09:43:23 +1000 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> This reverts commit 29111f579f4f3f2a07385f931854ab0527ae7ea5. > > This undoes the hasty addition of a global version of iommu_num_pages() > that broke both the powerpc and sparc builds. This function can be > revisited later. > > Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au> > --- > arch/x86/kernel/amd_iommu.c | 13 ++++++++----- > arch/x86/kernel/pci-gart_64.c | 11 +++++++---- > include/linux/iommu-helper.h | 1 - > lib/iommu-helper.c | 8 -------- > 4 files changed, 15 insertions(+), 18 deletions(-) > > This patch comes from > git revert -m 1 29111f579f4f3f2a07385f931854ab0527ae7ea5 > > I have test built powerpc ppc64_defconfig and sparc64 defconfig. The only > references to iommu_num_pages() after this is applied are in the powerpc > and sparc code. > > Linus, please apply. This is impacting on both powerpc and sparc > development and even the author of the patches said that those patches > were not urgent.
Ingo has a patch to fix this problem in the x86 tree:
http://marc.info/?l=linux-kernel&m=121754062325903&w=2
| |