aboutsummaryrefslogtreecommitdiffstats
diff options
authorGreg Kroah-Hartman <gregkh@suse.de>2010-01-19 13:17:05 -0800
committerGreg Kroah-Hartman <gregkh@suse.de>2010-01-19 13:17:05 -0800
commit8da956789e1ceefdeb97ce1927e7c18be76e6a8c (patch)
tree2c9b3d56f64b2b52fd1c81e22678cfa2fb9867af
parente3d8ede9fb45981a1d013051f14610f98764eb6b (diff)
downloadpatches-8da956789e1ceefdeb97ce1927e7c18be76e6a8c.tar.gz
2.6.33-rc4-git7 resync and tweaks
Diffstat
-rw-r--r--driver-core.current/driver-core-fix-devtmpfs-crash-on-s390.patch83
-rw-r--r--driver-core/sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch2
-rw-r--r--series2
-rw-r--r--staging/staging-cx25821-fix-double-unlock-in-medusa_video_init.patch10
-rw-r--r--tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch31
-rw-r--r--version2
6 files changed, 91 insertions, 39 deletions
diff --git a/driver-core.current/driver-core-fix-devtmpfs-crash-on-s390.patch b/driver-core.current/driver-core-fix-devtmpfs-crash-on-s390.patch
new file mode 100644
index 00000000000000..6f2cfdd36323c4
--- /dev/null
+++ b/driver-core.current/driver-core-fix-devtmpfs-crash-on-s390.patch
@@ -0,0 +1,83 @@
+From heiko.carstens@de.ibm.com Tue Jan 19 13:12:53 2010
+From: Heiko Carstens <heiko.carstens@de.ibm.com>
+Date: Mon, 18 Jan 2010 14:36:12 +0100
+Subject: driver-core: fix devtmpfs crash on s390
+To: Sachin Sant <sachinp@in.ibm.com>
+Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>, Kay Sievers <kay.sievers@vrfy.org>, Greg Kroah-Hartman <gregkh@suse.de>
+Message-ID: <20100118133612.GA10906@osiris.boeblingen.de.ibm.com>
+Content-Disposition: inline
+
+
+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 <heiko.carstens@de.ibm.com>
+Acked-by: Kay Sievers <kay.sievers@vrfy.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+
+---
+ drivers/base/devtmpfs.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+--- a/drivers/base/devtmpfs.c
++++ b/drivers/base/devtmpfs.c
+@@ -354,6 +354,7 @@ int __init devtmpfs_init(void)
+ {
+ int err;
+ struct vfsmount *mnt;
++ char options[] = "mode=0755";
+
+ err = register_filesystem(&dev_fs_type);
+ if (err) {
+@@ -362,7 +363,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/driver-core/sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch b/driver-core/sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch
index a53a13217a817d..1baf4c72c5acda 100644
--- a/driver-core/sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch
+++ b/driver-core/sysdev-fix-type-of-sysdev-class-attribute-in-memory-driver.patch
@@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
+print_block_size(struct sysdev_class *class, struct sysdev_class_attribute *attr,
+ char *buf)
{
- return sprintf(buf, "%lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
+ return sprintf(buf, "%#lx\n", (unsigned long)PAGES_PER_SECTION * PAGE_SIZE);
}
-static CLASS_ATTR(block_size_bytes, 0444, print_block_size, NULL);
diff --git a/series b/series
index 3dbb9a84a843d2..033048d4b5abcb 100644
--- a/series
+++ b/series
@@ -10,6 +10,7 @@ gregkh/gkh-version.patch
# Driver core patches for 2.6.33
#################################
driver-core.current/revert-sysdev-fix-prototype-for-memory_sysdev_class-show-store-functions.patch
+driver-core.current/driver-core-fix-devtmpfs-crash-on-s390.patch
#################################
# TTY patches for 2.6.33
@@ -19,7 +20,6 @@ tty.current/serial-imx-bit-confusion.patch
tty.current/serial-core-resume-serial-hardware-with-no_console_suspend.patch
tty.current/tty-fix-race-in-tty_fasync.patch
tty.current/serial-8250_pnp-use-wildcard-for-serial-wacom-tablets.patch
-tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch
tty.current/serial-fix-crash-if-the-minimum-rate-of-the-device-is-9600-baud.patch
tty.current/nozomi-quick-fix-for-the-close-close-bug.patch
tty.current/compat_ioctl-supress-unknown-cmd-message-on-serial-dev-console.patch
diff --git a/staging/staging-cx25821-fix-double-unlock-in-medusa_video_init.patch b/staging/staging-cx25821-fix-double-unlock-in-medusa_video_init.patch
index 5842ea608d8b90..6383a5ae326e44 100644
--- a/staging/staging-cx25821-fix-double-unlock-in-medusa_video_init.patch
+++ b/staging/staging-cx25821-fix-double-unlock-in-medusa_video_init.patch
@@ -22,9 +22,9 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
--- a/drivers/staging/cx25821/cx25821-medusa-video.c
+++ b/drivers/staging/cx25821/cx25821-medusa-video.c
-@@ -860,10 +860,8 @@ int medusa_video_init(struct cx25821_dev
-
- ret_val = medusa_set_videostandard(dev);
+@@ -795,10 +795,8 @@ int medusa_video_init(struct cx25821_dev
+ value &= 0xFFFFFFDF;
+ ret_val = cx25821_i2c_write(&dev->i2c_bus[0], MON_A_CTRL, value);
- if (ret_val < 0) {
- mutex_unlock(&dev->lock);
@@ -32,5 +32,5 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
return -EINVAL;
- }
- return 1;
- }
+ mutex_unlock(&dev->lock);
+
diff --git a/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch b/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch
deleted file mode 100644
index 20c07a74c7b435..00000000000000
--- a/tty.current/serial-8250_pnp-add-a-new-fujitsu-wacom-tablet-pc-device.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From pinglinux@gmail.com Fri Jan 15 11:03:03 2010
-From: Ping <pinglinux@gmail.com>
-Date: Thu, 7 Jan 2010 16:49:59 -0800
-Subject: serial/8250_pnp: Add a new Fujitsu Wacom Tablet PC device
-To: Andrew Morton <akpm@linux-foundation.org>
-Cc: alan@lxorguk.ukuu.org.uk, greg@kroah.com, jkosina@suse.cz, mjg59@srcf.ucam.org, mjg@redhat.com
-Message-ID: <167e8a331001071649l3d8df335w2b2422984bb245e8@mail.gmail.com>
-
-From: Ping Cheng <pingc@wacom.com>
-
-This is a new two finger touch Fujitsu Wacom Tablet PC
-
-Signed-off-by: Ping Cheng <pingc@wacom.com>
-Cc: stable <stable@kernel.org>
-Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
-
----
- drivers/serial/8250_pnp.c | 2 ++
- 1 file changed, 2 insertions(+)
-
---- a/drivers/serial/8250_pnp.c
-+++ b/drivers/serial/8250_pnp.c
-@@ -346,6 +346,8 @@ static const struct pnp_device_id pnp_de
- { "FUJ02E5", 0 },
- /* Fujitsu P-series tablet PC device */
- { "FUJ02E6", 0 },
-+ /* Fujitsu Wacom 2FGT Tablet PC device */
-+ { "FUJ02E7", 0 },
- /*
- * LG C1 EXPRESS DUAL (C1-PB11A3) touch screen (actually a FUJ02E6 in
- * disguise)
diff --git a/version b/version
index 44a1056c6e9429..5faf80a5930b0b 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2.6.33-rc4
+2.6.33-rc4-git7
generated by cgit 1.2.3-korg (git 2.43.0) at 2025-07-04 06:01:20 +0000