Thread (6 messages) 6 messages, 4 authors, 2008-08-01

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: Joerg Roedel <hidden>
Date: 2008-08-01 07:03:50
Also in: lkml, sparclinux

On Fri, Aug 01, 2008 at 08:51:23AM +0900, FUJITA Tomonori wrote:
On Fri, 1 Aug 2008 09:43:23 +1000
Stephen Rothwell [off-list ref] wrote:
quoted
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 <redacted>
---
 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
FUJITA,

can you send your fix directly to Linus again please? Andrew mentioned
that the x86 maintainers are on vacation. That may be the reason that
your fix is not yet upstream.

Joerg

-- 
           |           AMD Saxony Limited Liability Company & Co. KG
 Operating |         Wilschdorfer Landstr. 101, 01109 Dresden, Germany
 System    |                  Register Court Dresden: HRA 4896
 Research  |              General Partner authorized to represent:
 Center    |             AMD Saxony LLC (Wilmington, Delaware, US)
           | General Manager of AMD Saxony LLC: Dr. Hans-R. Deppe, Thomas McCoy
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help