Skip to contentSkip to conversation

x86 fixes

GIT PULL Ingo Molnar 3 participants 5 messages Dec 31, 2009 – Jan 4, 2010 Library code

lore
Share & tools
lore
#0 lore raw

Linus,

Please pull the latest x86-fixes-for-linus git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus

You'll get a conflict in arch/x86/include/asm/uv/uv_hub.h (you merged a v1

version of the patch from email - the conflicts are trivial, please pick my

version).

Thanks,

Ingo

---

 arch/x86/boot/compressed/Makefile  |    1 +
 arch/x86/include/asm/uv/uv_hub.h   |   86 ++++++++++++++++++++----------------
 arch/x86/kernel/amd_iommu_init.c   |   10 ++++
 arch/x86/kernel/apic/x2apic_uv_x.c |   12 +++---
 arch/x86/kernel/process.c          |    4 +-
 arch/x86/kernel/process_32.c       |   14 +++---
 arch/x86/kernel/process_64.c       |   24 +++++-----
 arch/x86/mm/kmemcheck/error.c      |   19 ++++----
 arch/x86/tools/chkobjdump.awk      |   16 +++++-
 drivers/char/agp/amd64-agp.c       |    9 ++--
 lib/dma-debug.c                    |    5 ++
 11 files changed, 118 insertions(+), 82 deletions(-)

FUJITA Tomonori (1):

x86/agp: Fix agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled

H. Peter Anvin (1):

x86, compress: Force i386 instructions for the decompressor

Ingo Molnar (1):

Merge branch 'iommu/fixes' of git://git.kernel.org/.../joro/linux-2.6-iommu into x86/urgent

Joerg Roedel (2):

x86/amd-iommu: Fix initialization failure panic

Merge branches 'dma-debug/fixes' and 'amd-iommu/fixes' into iommu/fixes

Masami Hiramatsu (1):

x86: Fix objdump version check in chkobjdump.awk for different formats.

Mike Travis (1):

x86: SGI UV: Fix writes to led registers on remote uv hubs

Pekka Enberg (2):

x86: Use KERN_DEFAULT log-level in __show_regs()

x86, kmemcheck: Use KERN_WARNING for error reporting

Shaun Ruffell (1):

dma-debug: Do not add notifier when dma debugging is disabled.

#2 lore raw
Quoted 8 lines · Borislav Petkov
Quoted 3 lines · Ingo Molnar

Shaun Ruffell (1):

dma-debug: Do not add notifier when dma debugging is disabled.

Looks like that last one breaks powerpc allyesconfig builds:

http://marc.info/?l=linux-next&m=126221673819746&w=2

It's a build warning, not a broken build. Updated (v2) pull request below, with the fix for this. [diffstat manually constructed - i hope i got that right.]

Thanks and a happy new year,

Ingo

Linus,

Please pull the latest x86-fixes-for-linus-2 git tree from:

git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip.git x86-fixes-for-linus-2

Thanks,

Ingo

------------------>

 arch/x86/boot/compressed/Makefile |    1 +
 arch/x86/include/asm/uv/uv_hub.h  |   74 ++++++++++++++++--------------------
 arch/x86/kernel/amd_iommu_init.c  |   10 +++++
 arch/x86/kernel/process.c         |    4 +-
 arch/x86/kernel/process_32.c      |   14 +++---
 arch/x86/kernel/process_64.c      |   24 ++++++------
 arch/x86/mm/kmemcheck/error.c     |   19 ++++-----
 arch/x86/tools/chkobjdump.awk     |   16 ++++++-
 drivers/char/agp/amd64-agp.c      |    9 ++--
 lib/dma-debug.c                   |    8 +++-
 10 files changed, 98 insertions(+), 81 deletions(-)

FUJITA Tomonori (1):
x86/agp: Fix agp_amd64_init() initialization with CONFIG_GART_IOMMU enabled

H. Peter Anvin (1):
x86, compress: Force i386 instructions for the decompressor

Ingo Molnar (1):
dma-debug: Fix bug causing build warning

Joerg Roedel (1):
x86/amd-iommu: Fix initialization failure panic

Masami Hiramatsu (1):
x86: Fix objdump version check in chkobjdump.awk for different formats.

Mike Travis (1):
x86: SGI UV: Fix writes to led registers on remote uv hubs

Pekka Enberg (2):
x86: Use KERN_DEFAULT log-level in __show_regs() x86, kmemcheck: Use KERN_WARNING for error reporting

Shaun Ruffell (1):
dma-debug: Do not add notifier when dma debugging is disabled.

#3 lore raw

[tip:x86/urgent] dma-debug: Fix bug causing build warning

In reply to Borislav Petkov
Commit-ID:  a8fe9ea200ea21421ea750423d1d4d4f7ce037cf
Gitweb:     http://git.kernel.org/tip/a8fe9ea200ea21421ea750423d1d4d4f7ce037cf
Author:     Ingo Molnar <[email protected]>
AuthorDate: Thu, 31 Dec 2009 15:16:23 +0100
Committer:  Ingo Molnar <[email protected]>
CommitDate: Thu, 31 Dec 2009 15:16:23 +0100

dma-debug: Fix bug causing build warning

Stephen Rothwell reported the following build warning:

lib/dma-debug.c: In function 'dma_debug_device_change':
lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void

Introduced by commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa ("dma-debug: Do not add notifier when dma debugging is disabled").

Return 0 [notify-done] when disabled. (this is standard bus notifier behavior.)

LKML-Reference: <[email protected]>

---
 lib/dma-debug.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)
lib/dma-debug.c +2 -3
index 7399744..cf90620 100644
@@ -670,14 +670,13 @@ static int device_dma_allocations(struct device *dev)
 	return count;
 }
 
-static int dma_debug_device_change(struct notifier_block *nb,
-				    unsigned long action, void *data)
+static int dma_debug_device_change(struct notifier_block *nb, unsigned long action, void *data)
 {
 	struct device *dev = data;
 	int count;
 
 	if (global_disable)
-		return;
+		return 0;
 
 	switch (action) {
 	case BUS_NOTIFY_UNBOUND_DRIVER:
#4 lore raw

Re: [tip:x86/urgent] dma-debug: Fix bug causing build warning

Quoted 7 lines · tip-bot for Ingo Molnar

Stephen Rothwell reported the following build warning:

lib/dma-debug.c: In function 'dma_debug_device_change':
lib/dma-debug.c:680: warning: 'return' with no value, in function returning non-void

Introduced by commit f797d9881b62c2ddb1d2e7bd80d87141949c84aa ("dma-debug: Do not add notifier when dma debugging is disabled").

Oops, sorry. Stupid mistake :-(

Joerg