commit 701dfbe71903413d10caf2790259bccbabbedcf5 Merge: d1526e2... e42734e... Author: Linus Torvalds Date: Fri Dec 15 10:22:22 2006 -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] cio: css_register_subchannel race. [S390] Save prefix register for dump on panic [S390] Fix reboot hang [S390] Fix reboot hang on LPARs [S390] sclp_cpi module license. [S390] zcrypt: module unload fixes. [S390] Hipersocket multicast queue: make sure outbound handler is called [S390] hypfs fixes [S390] update default configuration commit d1526e2cda64d5a1de56aef50bad9e5df14245c2 Author: Linus Torvalds Date: Fri Dec 15 08:43:13 2006 -0800 Remove stack unwinder for now It has caused more problems than it ever really solved, and is apparently not getting cleaned up and fixed. We can put it back when it's stable and isn't likely to make warning or bug events worse. In the meantime, enable frame pointers for more readable stack traces. Signed-off-by: Linus Torvalds commit e42734e270b9e5ada83188d73b733533ce11ee4a Author: Stefan Bader Date: Fri Dec 15 17:18:30 2006 +0100 [S390] cio: css_register_subchannel race. Asynchronous probe can release memory of a subchannel before css_get_ssd_info is called. To fix this call css_get_ssd_info before registering with driver core. Signed-off-by: Stefan Bader Signed-off-by: Martin Schwidefsky commit da1cf23efe0c067ef95e4702b386e6e1baab10c7 Author: Michael Holzheu Date: Fri Dec 15 17:18:27 2006 +0100 [S390] Save prefix register for dump on panic The dump tools expect that the saved prefix register points to the lowcore of the dump cpu. Since we set the prefix register to 0 during reipl/dump, we have to save the original prefix register. Before we start the dump program, we copy the original prefix register to the designated location in the lowcore. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit 58be944127be80bd947dd72d69523b3d4b17781f Author: Michael Holzheu Date: Fri Dec 15 17:18:25 2006 +0100 [S390] Fix reboot hang We use printks after shutting down all other cpus. This is not allowed and can lead to deadlocks. Therefore the printks have to be removed. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit a45e14148fb34175cba042df8979e7982758635f Author: Michael Holzheu Date: Fri Dec 15 17:18:22 2006 +0100 [S390] Fix reboot hang on LPARs Reboot hangs on LPARs without diag308 support. The reason for this is, that before the reboot is done, the channel subsystem is shut down. During the reset on each possible subchannel a "store subchannel" is done. This operation can end in a program check interruption, if the specified subchannel set is not implemented by the hardware. During the reset, currently we do not have a program check handler, which leads to the described kernel bug. We install now a new program check handler for the reboot code to fix this problem. Signed-off-by: Michael Holzheu Signed-off-by: Martin Schwidefsky commit b3c14d0bfd1739b930f26df90552a4d8cdcca0a6 Author: Christian Borntraeger Date: Fri Dec 15 17:18:20 2006 +0100 [S390] sclp_cpi module license. sclp_cpi is GPL. Make the module not taint the kernel Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 13e742babda8cda7df55b8d1ca67d46b4f8dea84 Author: Ralph Wuerthner Date: Fri Dec 15 17:18:17 2006 +0100 [S390] zcrypt: module unload fixes. Add code to reset all queues for a domain and add missing tasklet_kill call to ap bus module exit code. Signed-off-by: Ralph Wuerthner Signed-off-by: Martin Schwidefsky commit 028cf917b258b11286437a1b96e64030f94fd46d Author: Ursula Braun Date: Fri Dec 15 17:18:14 2006 +0100 [S390] Hipersocket multicast queue: make sure outbound handler is called A HiperSocket multicast queue works asynchronously. When sending buffers, the buffer state change from PRIMED to EMPTY may happen delayed. Reschedule the checking for changes in the outbound queue, if there are still PRIMED buffers. Signed-off-by: Ursula Braun Signed-off-by: Martin Schwidefsky commit 86b22470f68528c68cb25dbd58886040e1917494 Author: Christian Borntraeger Date: Fri Dec 15 17:18:10 2006 +0100 [S390] hypfs fixes Correct typo to make hypfs work on systems that support only diag204 subcode 4 and fix error handling in hypfs_diag_init. Signed-off-by: Christian Borntraeger Signed-off-by: Martin Schwidefsky commit 240bfbef67e9ae174190b231e63ee3c0f9f02d8a Author: Martin Schwidefsky Date: Fri Dec 15 17:17:57 2006 +0100 [S390] update default configuration Signed-off-by: Martin Schwidefsky commit d1998ef38a13c4e74c69df55ccd38b0440c429b2 Author: Ben Collins Date: Wed Dec 13 22:10:05 2006 -0500 [PATCH] ib_verbs: Use explicit if-else statements to avoid errors with do-while macros At least on PPC, the "op ? op : dma" construct causes a compile failure because the dma_* is a do{}while(0) macro. This turns all of them into proper if/else to avoid this problem. Signed-off-by: Ben Collins Signed-off-by: Linus Torvalds