commit 2254c2e0184c603f92fc9b81016ff4bb53da622d Merge: a3aaabd... 7af0d6f... Author: Linus Torvalds Date: Tue Dec 4 09:37:39 2007 -0800 Merge branch 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6 * 'for-linus' of git://git390.osdl.marist.edu/pub/scm/linux-2.6: [S390] Make sure the restore psw masks are initialized. [S390] Fix compile error on 31bit without preemption [S390] dcssblk: prevent early access without own make_request function [S390] cio: add missing reprobe loop end statement [S390] cio: Issue SenseID per path. commit a3aaabd6b402d8b0ede5aa4a040e9fdbbfdf9116 Merge: 98f20fb... da54bec... Author: Linus Torvalds Date: Tue Dec 4 09:28:45 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86 * git://git.kernel.org/pub/scm/linux/kernel/git/x86/linux-2.6-x86: x86: arch_register_cpu() section fix x86: free_cache_attributes() section fix x86: add the word 'WARNING' in check_nmi_watchdog() output x86: revert CONFIG_X86_HT semantics change commit 98f20fb6a9b1db4ef6ab19e5eb0e41f04d38b4aa Merge: 2208210... db292ca... Author: Linus Torvalds Date: Tue Dec 4 09:28:23 2007 -0800 Merge git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched * git://git.kernel.org/pub/scm/linux/kernel/git/mingo/linux-2.6-sched: sched: default to more agressive yield for SCHED_BATCH tasks sched: fix crash in sys_sched_rr_get_interval() commit 220821028cd764c24e60485251c4d0bc1732bdfa Author: Adrian Bunk Date: Tue Dec 4 14:35:00 2007 +0100 MAINTAINERS: remove the MTRR entry I haven't seen Richard doing MTRR related work for quite some time, and the "X86 ARCHITECTURE" entry in MAINTAINERS already covers the people currently responsible for this code. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner Signed-off-by: Linus Torvalds commit 799b37b5ee6b4c197f38611eb7f02552e4f14e70 Author: Ingo Molnar Date: Tue Dec 4 11:32:38 2007 +0100 drivers/s390/net/ctcmain.c: fix build bug SET_MODULE_OWNER() is obsolete. Signed-off-by: Ingo Molnar Signed-off-by: Linus Torvalds commit da54becc7166b5fad70538acea5e93bdd83dd8a6 Author: Andrew Morton Date: Tue Dec 4 17:19:07 2007 +0100 x86: arch_register_cpu() section fix fix this on i386 allnoconfig: WARNING: vmlinux.o(.text+0x6f2e): Section mismatch: reference to .init.text:register_cpu (between 'arch_register_cpu' and 'text_poke') Signed-off-by: Andrew Morton Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit f22d9bc1e87270586610216084b00cb2fb09abba Author: Adrian Bunk Date: Tue Dec 4 17:19:07 2007 +0100 x86: free_cache_attributes() section fix free_cache_attributes() must be __cpuinit since it calls the __cpuinit cache_remove_shared_cpu_map(). This patch fixes the following section mismatch reported by Chris Clayton: ... WARNING: vmlinux.o(.text+0x90b6): Section mismatch: reference to .init.text:cache_remove_shared_cpu_map (between 'free_cache_attributes' and 'show_level') ... Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit 75bc122c2dc4d497909248e85d86139e54c8fd13 Author: Don Zickus Date: Tue Dec 4 17:19:07 2007 +0100 x86: add the word 'WARNING' in check_nmi_watchdog() output Our automated test suite looks for keywords like error, fail, warning in the boot log. In the case when the nmi watchdog is determined to be stuck in check_nmi_watchdog(), none of those keywords are displayed. This patch adds a keyword, "WARNING:", so it makes it easier to notice when the nmi watchdog isn't working correctly. Also add a proper KERN_WARNING mark to this printout. Signed-off-by: Don Zickus Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit ee0011a798ba0e9134506830c58323f2bfcd2443 Author: Adrian Bunk Date: Tue Dec 4 17:19:07 2007 +0100 x86: revert CONFIG_X86_HT semantics change The recent Kconfig changes in x86 resulted in CONFIG_X86_HT no longer being set if (X86_32 && MK8). After grep'ing through the tree I think the problem is that different places have different assumptions about the semantics of CONFIG_X86_HT, either: - hyperthreading or - multicore This should be sorted out properly, but until then we should keep the 2.6.23 status quo. Signed-off-by: Adrian Bunk Signed-off-by: Ingo Molnar Signed-off-by: Thomas Gleixner commit db292ca302e83534f5f0f7139e13d7e6976e51f9 Author: Ingo Molnar Date: Tue Dec 4 17:04:39 2007 +0100 sched: default to more agressive yield for SCHED_BATCH tasks do more agressive yield for SCHED_BATCH tuned tasks: they are all about throughput anyway. This allows a gentler migration path for any apps that relied on stronger yield. Signed-off-by: Ingo Molnar commit 77034937dc4575ca0a76bf209838ecd39e804089 Author: Ingo Molnar Date: Tue Dec 4 17:04:39 2007 +0100 sched: fix crash in sys_sched_rr_get_interval() Luiz Fernando N. Capitulino reported that sched_rr_get_interval() crashes for SCHED_OTHER tasks that are on an idle runqueue. The fix is to return a 0 timeslice for tasks that are on an idle runqueue. (and which are not running, obviously) this also shrinks the code a bit: text data bss dec hex filename 47903 3934 336 52173 cbcd sched.o.before 47885 3934 336 52155 cbbb sched.o.after Reported-by: Luiz Fernando N. Capitulino Signed-off-by: Ingo Molnar commit 7af0d6f753f5adf773f99470666b50490d3379f1 Author: Heiko Carstens Date: Tue Dec 4 16:09:05 2007 +0100 [S390] Make sure the restore psw masks are initialized. In case of TRACE_IRQFLAGS the restore psw masks will not be initialized if noexec is turned on. This will lead to an immediate system crash. Signed-off-by: Heiko Carstens Signed-off-by: Martin Schwidefsky commit ab1809b4ed9a3aaf3b34133a776a94f9fad54cc4 Author: Christian Borntraeger Date: Tue Dec 4 16:09:04 2007 +0100 [S390] Fix compile error on 31bit without preemption Commit b8e7a54cd06b0b0174029ef3a7f5a1415a2c28f2 introduced a compile error if CONFIG_PREEMPT is not set: arch/s390/kernel/built-in.o: In function `cleanup_io_leave_insn': /space/kvm/arch/s390/kernel/entry.S:(.text+0xbfce): undefined reference to `preempt_schedule_irq' This patch hides preempt_schedule_irq if CONFIG_PREEMPT is not set. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 436d1bc7fe6e78e37fe5f5022ea4d5c133d825eb Author: Christian Borntraeger Date: Tue Dec 4 16:09:03 2007 +0100 [S390] dcssblk: prevent early access without own make_request function When loading a dcss segment with the dcssblk driver, sometimes the following kind of message appears: bio too big device dcssblk0 (8 > 0) Buffer I/O error on device dcssblk0, logical block 172016 .. The fix is to move the disk registration after setting the make_request function, to avoid calls into generic_make_request for dcssblock without having the make_request function set up properly. Cc: Gerald Schaefer Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 671756162cfb0b3ccbb6a0047baa3010885561a2 Author: Peter Oberparleiter Date: Tue Dec 4 16:09:02 2007 +0100 [S390] cio: add missing reprobe loop end statement Add loop end statement to prevent looping over empty subchannel sets. Signed-off-by: Peter Oberparleiter Signed-off-by: Martin Schwidefsky commit c94dec99f9759c41cadf0f2781846da5b40a98f6 Author: Cornelia Huck Date: Tue Dec 4 16:09:01 2007 +0100 [S390] cio: Issue SenseID per path. We may receive a unit check for every path when we issue a SenseID. Unfortunately, the channel subsystem will try on a different path every time if we use a lpm of 0xff, which will exhaust our retry counter. Therefore, revert SenseID to its previous per-path behaviour and just leave out the suspend multipath reconnect. Signed-off-by: Cornelia Huck Signed-off-by: Martin Schwidefsky