From: Greg Kroah-Hartman Date: Tue, 26 Jan 2010 00:37:23 +0000 (-0800) Subject: another .32 patch X-Git-Tag: v2.6.32.7~14 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3a3f1c53d8b178d0a99ee11496a569fd520101fd;p=thirdparty%2Fkernel%2Fstable-queue.git another .32 patch --- diff --git a/queue-2.6.32/driver-core-fix-devtmpfs-crash-on-s390.patch b/queue-2.6.32/driver-core-fix-devtmpfs-crash-on-s390.patch new file mode 100644 index 00000000000..a440602fc69 --- /dev/null +++ b/queue-2.6.32/driver-core-fix-devtmpfs-crash-on-s390.patch @@ -0,0 +1,82 @@ +From f776c5ec4690b21b3668ad5956774a22c86f541a Mon Sep 17 00:00:00 2001 +From: Heiko Carstens +Date: Mon, 18 Jan 2010 14:36:12 +0100 +Subject: driver-core: fix devtmpfs crash on s390 + +From: Heiko Carstens + +commit f776c5ec4690b21b3668ad5956774a22c86f541a upstream. + +On Mon, Jan 18, 2010 at 05:26:20PM +0530, Sachin Sant wrote: +> Hello Heiko, +> +> Today while trying to boot next-20100118 i came across +> the following Oops : +> +> Brought up 4 CPUs +> Unable to handle kernel pointer dereference at virtual kernel address 0000000000 +> 543000 +> Oops: 0004 #1 SMP +> Modules linked in: +> CPU: 0 Not tainted 2.6.33-rc4-autotest-next-20100118-5-default #1 +> Process swapper (pid: 1, task: 00000000fd792038, ksp: 00000000fd797a30) +> Krnl PSW : 0704200180000000 00000000001eb0b8 (shmem_parse_options+0xc0/0x328) +> R:0 T:1 IO:1 EX:1 Key:0 M:1 W:0 P:0 AS:0 CC:2 PM:0 EA:3 +> Krnl GPRS: 000000000054388a 000000000000003d 0000000000543836 000000000000003d +> 0000000000000000 0000000000483f28 0000000000536112 00000000fd797d00 +> 00000000fd4ba100 0000000000000100 0000000000483978 0000000000543832 +> 0000000000000000 0000000000465958 00000000001eb0b0 00000000fd797c58 +> Krnl Code: 00000000001eb0aa: c0e5000994f1 brasl %r14,31da8c +> 00000000001eb0b0: b9020022 ltgr %r2,%r2 +> 00000000001eb0b4: a784010b brc 8,1eb2ca +> >00000000001eb0b8: 92002000 mvi 0(%r2),0 +> 00000000001eb0bc: a7080000 lhi %r0,0 +> 00000000001eb0c0: 41902001 la %r9,1(%r2) +> 00000000001eb0c4: b9040016 lgr %r1,%r6 +> 00000000001eb0c8: b904002b lgr %r2,%r11 +> Call Trace: +> (<00000000fd797c50> 0xfd797c50) +> <00000000001eb5da> shmem_fill_super+0x13a/0x25c +> <0000000000228cfa> get_sb_single+0xbe/0xdc +> <000000000034ffc0> dev_get_sb+0x2c/0x38 +> <000000000066c602> devtmpfs_init+0x46/0xc0 +> <000000000066c53e> driver_init+0x22/0x60 +> <000000000064d40a> kernel_init+0x24e/0x3d0 +> <000000000010a7ea> kernel_thread_starter+0x6/0xc +> <000000000010a7e4> kernel_thread_starter+0x0/0xc +> +> I never tried to boot a kernel with DEVTMPFS enabled on a s390 box. +> So am wondering if this is supported or not ? If you think this +> is supported i will send a mail to community on this. + +There is nothing arch specific to devtmpfs. This part crashes because the +kernel tries to modify the data read-only section which is write protected +on s390. + +Signed-off-by: Heiko Carstens +Acked-by: Kay Sievers +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/base/devtmpfs.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +--- a/drivers/base/devtmpfs.c ++++ b/drivers/base/devtmpfs.c +@@ -353,6 +353,7 @@ int __init devtmpfs_init(void) + { + int err; + struct vfsmount *mnt; ++ char options[] = "mode=0755"; + + err = register_filesystem(&dev_fs_type); + if (err) { +@@ -361,7 +362,7 @@ int __init devtmpfs_init(void) + return err; + } + +- mnt = kern_mount_data(&dev_fs_type, "mode=0755"); ++ mnt = kern_mount_data(&dev_fs_type, options); + if (IS_ERR(mnt)) { + err = PTR_ERR(mnt); + printk(KERN_ERR "devtmpfs: unable to create devtmpfs %i\n", err); diff --git a/queue-2.6.32/series b/queue-2.6.32/series index a57606ebdef..70436186db4 100644 --- a/queue-2.6.32/series +++ b/queue-2.6.32/series @@ -10,6 +10,7 @@ powerpc-fsl-add-pci-device-ids-for-new-qoirq-chips.patch davinci-dm646x-add-support-for-3.x-silicon-revision.patch input-alps-add-interleaved-protocol-support-dell-e6x00-series.patch driver-core-devtmpfs-set-root-directory-mode-to-0755.patch +driver-core-fix-devtmpfs-crash-on-s390.patch alsa-hda-add-pci-ids-for-nvidia-g2xx-series.patch v4l-dvb-13569-smsusb-add-autodetection-support-for-five-additional-hauppauge-usb-ids.patch usb-mos7840-add-device-ids-for-b-b-electronics-devices.patch