From 812d6d2b8276763882807e1e3c31effdfbf6f040 Mon Sep 17 00:00:00 2001 From: Michael Holzheu Date: Tue, 19 Jun 2007 13:10:01 +0200 Subject: [PATCH] --- yaml --- r: 57867 b: refs/heads/master c: 0a71a312437d444e1a45317823fda8160df37ee4 h: refs/heads/master i: 57865: 56b2a68181e56fecb913d9f1da81322867db7295 57863: 1a402122bb8d2cc6bdfbdddf94d12ac71c7a8f1a v: v3 --- [refs] | 2 +- trunk/MAINTAINERS | 4 ++-- trunk/arch/s390/kernel/setup.c | 1 + trunk/fs/xfs/linux-2.6/xfs_lrw.c | 2 +- trunk/sound/ppc/pmac.c | 8 +++----- 5 files changed, 8 insertions(+), 9 deletions(-) diff --git a/[refs] b/[refs] index 3bd4f4715688..5cec82998fbc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a289bbe27785a5f47dc501fa2bc18edfec147117 +refs/heads/master: 0a71a312437d444e1a45317823fda8160df37ee4 diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS index 4ce895a4b5ba..bef79776b388 100644 --- a/trunk/MAINTAINERS +++ b/trunk/MAINTAINERS @@ -4022,11 +4022,11 @@ S: Supported XFS FILESYSTEM P: Silicon Graphics Inc -P: Tim Shimmin +P: Tim Shimmin, David Chatterton M: xfs-masters@oss.sgi.com L: xfs@oss.sgi.com W: http://oss.sgi.com/projects/xfs -T: git git://oss.sgi.com:8090/xfs/xfs-2.6.git +T: git git://oss.sgi.com:8090/xfs/xfs-2.6 S: Supported XILINX UARTLITE SERIAL DRIVER diff --git a/trunk/arch/s390/kernel/setup.c b/trunk/arch/s390/kernel/setup.c index 51d6309e7f3b..7e1bfb984064 100644 --- a/trunk/arch/s390/kernel/setup.c +++ b/trunk/arch/s390/kernel/setup.c @@ -300,6 +300,7 @@ static void __init setup_zfcpdump(unsigned int console_devno) else sprintf(str, "cio_ignore=all,!0.0.%04x", ipl_info.data.fcp.dev_id.devno); + strcat(COMMAND_LINE, " "); strcat(COMMAND_LINE, str); console_loglevel = 2; } diff --git a/trunk/fs/xfs/linux-2.6/xfs_lrw.c b/trunk/fs/xfs/linux-2.6/xfs_lrw.c index ed90403f0ee7..86fb671a8bcc 100644 --- a/trunk/fs/xfs/linux-2.6/xfs_lrw.c +++ b/trunk/fs/xfs/linux-2.6/xfs_lrw.c @@ -159,7 +159,7 @@ xfs_iozero( if (status) goto unlock; - zero_user_page(page, offset, bytes, KM_USER0); + memclear_highpage_flush(page, offset, bytes); status = mapping->a_ops->commit_write(NULL, page, offset, offset + bytes); diff --git a/trunk/sound/ppc/pmac.c b/trunk/sound/ppc/pmac.c index 7a22f0f3784a..5a2bef44a2f5 100644 --- a/trunk/sound/ppc/pmac.c +++ b/trunk/sound/ppc/pmac.c @@ -775,8 +775,7 @@ static int snd_pmac_free(struct snd_pmac *chip) out_le32(&chip->awacs->control, in_le32(&chip->awacs->control) & 0xfff); } - if (chip->node) - snd_pmac_sound_feature(chip, 0); + snd_pmac_sound_feature(chip, 0); /* clean up mixer if any */ if (chip->mixer_free) @@ -926,7 +925,6 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) } if (! sound) { of_node_put(chip->node); - chip->node = NULL; return -ENODEV; } prop = of_get_property(sound, "sub-frame", NULL); @@ -939,9 +937,7 @@ static int __init snd_pmac_detect(struct snd_pmac *chip) printk(KERN_INFO "snd-powermac no longer handles any " "machines with a layout-id property " "in the device-tree, use snd-aoa.\n"); - of_node_put(sound); of_node_put(chip->node); - chip->node = NULL; return -ENODEV; } /* This should be verified on older screamers */ @@ -1301,6 +1297,8 @@ int __init snd_pmac_new(struct snd_card *card, struct snd_pmac **chip_return) return 0; __error: + if (chip->pdev) + pci_dev_put(chip->pdev); snd_pmac_free(chip); return err; }