rpms/kernel/F-7 linux-2.6-cifs-fix-oops-on-second-mount.patch, NONE, 1.1 linux-2.6-modules-modalias-platform.patch, NONE, 1.1 linux-2.6-usb-autosuspend-default-disable.patch, 1.6, 1.7 linux-2.6-x86-setup-add-near-jump.patch, NONE, 1.1 kernel-2.6.spec, 1.3377, 1.3378 linux-2.6-usb-suspend-classes.patch, 1.1, NONE
Chuck Ebbert (cebbert)
fedora-extras-commits at redhat.com
Mon Nov 12 21:57:18 UTC 2007
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv30604
Modified Files:
kernel-2.6.spec
Added Files:
linux-2.6-cifs-fix-oops-on-second-mount.patch
linux-2.6-modules-modalias-platform.patch
linux-2.6-usb-autosuspend-default-disable.patch
linux-2.6-x86-setup-add-near-jump.patch
Removed Files:
linux-2.6-usb-suspend-classes.patch
Log Message:
* Mon Nov 12 2007 Chuck Ebbert <cebbert at redhat.com>
- Disable USB autosuspend by default.
- Fix oops in CIFS when mounting a filesystem a second time.
- Restore platform module autoloading, e.g. pcspkr.
- Fix failure to boot on 486DX4 (and possibily other CPUs.)
linux-2.6-cifs-fix-oops-on-second-mount.patch:
--- NEW FILE linux-2.6-cifs-fix-oops-on-second-mount.patch ---
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=9b8f5f573770f33b28c45255ac82e6457278c782
Commit: 9b8f5f573770f33b28c45255ac82e6457278c782
Parent: a6f8de3d9b124c95893054fd2a78bc7be5bb9000
Author: Jeff Layton <jlayton at redhat.com>
AuthorDate: Fri Nov 9 23:25:04 2007 +0000
Committer: Steve French <sfrench at us.ibm.com>
CommitDate: Fri Nov 9 23:25:04 2007 +0000
[CIFS] fix oops on second mount to same server when null auth is used
When a share is mounted using no username, cifs_mount sets
volume_info.username as a NULL pointer, and the sesInfo userName as an
empty string. The volume_info.username is passed to a couple of other
functions to see if there is an existing unc or tcp connection that can
be used. These functions assume that the username will be a valid
string that can be passed to strncmp. If the pointer is NULL, then the
kernel will oops if there's an existing session to which the string
can be compared.
This patch changes cifs_mount to set volume_info.username to an empty
string in this situation, which prevents the oops and should make it
so that the comparison to other null auth sessions match.
Signed-off-by: Jeff Layton <jlayton at redhat.com>
Signed-off-by: Steve French <sfrench at us.ibm.com>
[cebbert at redhat.com: removed update of CHANGES]
---
fs/cifs/connect.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/fs/cifs/connect.c b/fs/cifs/connect.c
index 380ee99..1102160 100644
--- a/fs/cifs/connect.c
+++ b/fs/cifs/connect.c
@@ -1790,7 +1790,7 @@ cifs_mount(struct super_block *sb, struct cifs_sb_info *cifs_sb,
if (volume_info.nullauth) {
cFYI(1, ("null user"));
- volume_info.username = NULL;
+ volume_info.username = "";
} else if (volume_info.username) {
/* BB fixme parse for domain name here */
cFYI(1, ("Username: %s", volume_info.username));
linux-2.6-modules-modalias-platform.patch:
--- NEW FILE linux-2.6-modules-modalias-platform.patch ---
From: Kay Sievers <kay.sievers at vrfy.org>
Date: Sat, 18 Aug 2007 02:40:39 +0000 (+0200)
Subject: platform: prefix MODALIAS with "platform:"
X-Git-Tag: v2.6.24-rc1~1394^2~74
X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=43cc71eed1250755986da4c0f9898f9a635cb3bf
platform: prefix MODALIAS with "platform:"
Prefix platform modalias strings with "platform:", which
modprobe config to blacklist alias resolving if userspace
configures it.
Send uevents for all platform devices.
Add MODULE_ALIAS's to: pxa2xx_pcmcia, ds1742 and pcspkr to trigger
module autoloading by userspace.
$ modinfo pcspkr
alias: platform:pcspkr
license: GPL
description: PC Speaker beeper driver
...
$ modprobe -n -v platform:pcspkr
insmod /lib/modules/2.6.23-rc3-g28e8351a-dirty/kernel/drivers/input/misc/pcspkr.ko
Signed-off-by: Kay Sievers <kay.sievers at vrfy.org>
Cc: David Brownell <david-b at pacbell.net>
Cc: Atsushi Nemoto <anemo at mba.ocn.ne.jp>
Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
---
diff --git a/drivers/base/platform.c b/drivers/base/platform.c
index 869ff8c..9bfc434 100644
--- a/drivers/base/platform.c
+++ b/drivers/base/platform.c
@@ -160,11 +160,6 @@ static void platform_device_release(struct device *dev)
*
* Create a platform device object which can have other objects attached
* to it, and which will have attached objects freed when it is released.
- *
- * This device will be marked as not supporting hotpluggable drivers; no
- * device add/remove uevents will be generated. In the unusual case that
- * the device isn't being dynamically allocated as a legacy "probe the
- * hardware" driver, infrastructure code should reverse this marking.
*/
struct platform_device *platform_device_alloc(const char *name, unsigned int id)
{
@@ -177,12 +172,6 @@ struct platform_device *platform_device_alloc(const char *name, unsigned int id)
pa->pdev.id = id;
device_initialize(&pa->pdev.dev);
pa->pdev.dev.release = platform_device_release;
-
- /* prevent hotplug "modprobe $(MODALIAS)" from causing trouble in
- * legacy probe-the-hardware drivers, which don't properly split
- * out device enumeration logic from drivers.
- */
- pa->pdev.dev.uevent_suppress = 1;
}
return pa ? &pa->pdev : NULL;
@@ -530,7 +519,7 @@ static ssize_t
modalias_show(struct device *dev, struct device_attribute *a, char *buf)
{
struct platform_device *pdev = to_platform_device(dev);
- int len = snprintf(buf, PAGE_SIZE, "%s\n", pdev->name);
+ int len = snprintf(buf, PAGE_SIZE, "platform:%s\n", pdev->name);
return (len >= PAGE_SIZE) ? (PAGE_SIZE - 1) : len;
}
@@ -546,7 +535,7 @@ static int platform_uevent(struct device *dev, char **envp, int num_envp,
struct platform_device *pdev = to_platform_device(dev);
envp[0] = buffer;
- snprintf(buffer, buffer_size, "MODALIAS=%s", pdev->name);
+ snprintf(buffer, buffer_size, "MODALIAS=platform:%s", pdev->name);
return 0;
}
diff --git a/drivers/input/misc/pcspkr.c b/drivers/input/misc/pcspkr.c
index 906bf5e..e1a4402 100644
--- a/drivers/input/misc/pcspkr.c
+++ b/drivers/input/misc/pcspkr.c
@@ -23,6 +23,7 @@
MODULE_AUTHOR("Vojtech Pavlik <vojtech at ucw.cz>");
MODULE_DESCRIPTION("PC Speaker beeper driver");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pcspkr");
#ifdef CONFIG_X86
/* Use the global PIT lock ! */
diff --git a/drivers/pcmcia/pxa2xx_mainstone.c b/drivers/pcmcia/pxa2xx_mainstone.c
index 383107b..f6722ba 100644
--- a/drivers/pcmcia/pxa2xx_mainstone.c
+++ b/drivers/pcmcia/pxa2xx_mainstone.c
@@ -175,7 +175,6 @@ static int __init mst_pcmcia_init(void)
if (!mst_pcmcia_device)
return -ENOMEM;
- mst_pcmcia_device->dev.uevent_suppress = 0;
mst_pcmcia_device->dev.platform_data = &mst_pcmcia_ops;
ret = platform_device_add(mst_pcmcia_device);
@@ -195,3 +194,4 @@ fs_initcall(mst_pcmcia_init);
module_exit(mst_pcmcia_exit);
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-pcmcia");
diff --git a/drivers/pcmcia/pxa2xx_sharpsl.c b/drivers/pcmcia/pxa2xx_sharpsl.c
index a2daa3f..d5c33bd 100644
--- a/drivers/pcmcia/pxa2xx_sharpsl.c
+++ b/drivers/pcmcia/pxa2xx_sharpsl.c
@@ -261,7 +261,6 @@ static int __init sharpsl_pcmcia_init(void)
if (!sharpsl_pcmcia_device)
return -ENOMEM;
- sharpsl_pcmcia_device->dev.uevent_suppress = 0;
sharpsl_pcmcia_device->dev.platform_data = &sharpsl_pcmcia_ops;
sharpsl_pcmcia_device->dev.parent = platform_scoop_config->devs[0].dev;
@@ -284,3 +283,4 @@ module_exit(sharpsl_pcmcia_exit);
MODULE_DESCRIPTION("Sharp SL Series PCMCIA Support");
MODULE_LICENSE("GPL");
+MODULE_ALIAS("platform:pxa2xx-pcmcia");
linux-2.6-usb-autosuspend-default-disable.patch:
Index: linux-2.6-usb-autosuspend-default-disable.patch
===================================================================
RCS file: linux-2.6-usb-autosuspend-default-disable.patch
diff -N linux-2.6-usb-autosuspend-default-disable.patch
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ linux-2.6-usb-autosuspend-default-disable.patch 12 Nov 2007 21:57:14 -0000 1.7
@@ -0,0 +1,11 @@
+--- linux-2.6.22.noarch/drivers/usb/core/usb.c~ 2007-07-10 12:18:12.000000000 -0400
++++ linux-2.6.22.noarch/drivers/usb/core/usb.c 2007-07-10 12:18:20.000000000 -0400
+@@ -52,7 +52,7 @@ static int nousb; /* Disable USB when bu
+ struct workqueue_struct *ksuspend_usb_wq;
+
+ #ifdef CONFIG_USB_SUSPEND
+-static int usb_autosuspend_delay = 2; /* Default delay value,
++static int usb_autosuspend_delay = -1; /* Default delay value,
+ * in seconds */
+ module_param_named(autosuspend, usb_autosuspend_delay, int, 0644);
+ MODULE_PARM_DESC(autosuspend, "default autosuspend delay");
linux-2.6-x86-setup-add-near-jump.patch:
--- NEW FILE linux-2.6-x86-setup-add-near-jump.patch ---
Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=7ed192906a2144ebc8ca2925a85d27b9c5355668
Commit: 7ed192906a2144ebc8ca2925a85d27b9c5355668
Parent: b55d1b1814c52463c11707f53dbdc223e09b2924
Author: H. Peter Anvin <hpa at zytor.com>
AuthorDate: Sun Nov 4 17:50:12 2007 -0800
Committer: H. Peter Anvin <hpa at zytor.com>
CommitDate: Sun Nov 4 19:47:46 2007 -0800
x86 setup: add a near jump to serialize %cr0 on 386/486
The 386 and 486 needs a jump immediately after setting %cr0 in order
to serialize the pipeline.
Signed-off-by: H. Peter Anvin <hpa at zytor.com>
---
arch/x86/boot/pmjump.S | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/boot/pmjump.S b/arch/x86/boot/pmjump.S
index 2e55923..26baeab 100644
--- a/arch/i386/boot/pmjump.S
+++ b/arch/i386/boot/pmjump.S
@@ -31,14 +31,14 @@ protected_mode_jump:
xorl %ebx, %ebx # Flag to indicate this is a boot
movl %edx, %esi # Pointer to boot_params table
movl %eax, 2f # Patch ljmpl instruction
- jmp 1f # Short jump to flush instruction q.
-1:
movw $__BOOT_DS, %cx
movl %cr0, %edx
orb $1, %dl # Protected mode (PE) bit
movl %edx, %cr0
+ jmp 1f # Short jump to serialize on 386/486
+1:
movw %cx, %ds
movw %cx, %es
-
Index: kernel-2.6.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-7/kernel-2.6.spec,v
retrieving revision 1.3377
retrieving revision 1.3378
diff -u -r1.3377 -r1.3378
--- kernel-2.6.spec 9 Nov 2007 23:18:17 -0000 1.3377
+++ kernel-2.6.spec 12 Nov 2007 21:57:14 -0000 1.3378
@@ -529,6 +529,7 @@
Patch70: linux-2.6-x86-tune-generic.patch
Patch71: linux-2.6-x86-tsc-calibration-1.patch
Patch72: linux-2.6-x86-tsc-calibration-2.patch
+Patch73: linux-2.6-x86-setup-add-near-jump.patch
Patch100: linux-2.6-g5-therm-shutdown.patch
Patch120: linux-2.6-ppc32-ucmpdi2.patch
@@ -545,6 +546,8 @@
Patch220: linux-2.6-modsign-core.patch
Patch230: linux-2.6-modsign-script.patch
+Patch240: linux-2.6-modules-modalias-platform.patch
+
Patch250: linux-2.6-debug-sizeof-structs.patch
Patch260: linux-2.6-debug-nmi-timeout.patch
Patch270: linux-2.6-debug-taint-vm.patch
@@ -565,7 +568,8 @@
Patch424: linux-2.6-cifs-fix-incomplete-rcv.patch
Patch425: linux-2.6-cifs-typo-in-cifs_reconnect-fix.patch
Patch426: linux-2.6-cifs-fix-bad-handling-of-EAGAIN.patch
-Patch428: linux-2.6-nfs-fix-writeback-race.patch
+Patch427: linux-2.6-cifs-fix-oops-on-second-mount.patch
+Patch429: linux-2.6-nfs-fix-writeback-race.patch
Patch430: linux-2.6-net-silence-noisy-printks.patch
Patch431: linux-2.6-net-fix-panic-removing-teql-devices.patch
@@ -628,13 +632,13 @@
Patch771: linux-2.6-acpi-suspend-wrong-order-of-GPE-restore.patch
Patch780: linux-2.6-usb-storage-initialize-huawei-e220-properly.patch
-Patch781: linux-2.6-usb-suspend-classes.patch
+Patch781: linux-2.6-usb-autosuspend-default-disable.patch
Patch800: linux-2.6-wakeups-hdaps.patch
Patch801: linux-2.6-wakeups.patch
Patch900: linux-2.6-md-raid5-fix-clearing-of-biofill-operations.patch
-patch901: linux-2.6-md-raid5-move-code-to-proper-place.patch
+Patch901: linux-2.6-md-raid5-move-code-to-proper-place.patch
# drm for bug 228414
Patch950: linux-2.6-drm-fix-i915-allocation.patch
@@ -1122,8 +1126,8 @@
# setuid /proc/self/maps fix. (dependent on utrace)
ApplyPatch linux-2.6-proc-self-maps-fix.patch
-# Some USB devices don't work after auto-suspend, disable by default.
-ApplyPatch linux-2.6-usb-suspend-classes.patch
+# Disable USb autosuspend by default.
+ApplyPatch linux-2.6-usb-autosuspend-default-disable.patch
# enable sysrq-c on all kernels, not only kexec
ApplyPatch linux-2.6-sysrq-c.patch
@@ -1137,6 +1141,8 @@
# Compile 686 kernels tuned for Pentium4.
ApplyPatch linux-2.6-x86-tune-generic.patch
+# x86: fix boot on 486
+ApplyPatch linux-2.6-x86-setup-add-near-jump.patch
# fix tsc calibration
ApplyPatch linux-2.6-x86-tsc-calibration-1.patch
ApplyPatch linux-2.6-x86-tsc-calibration-2.patch
@@ -1173,6 +1179,9 @@
ApplyPatch linux-2.6-modsign-core.patch
ApplyPatch linux-2.6-modsign-script.patch
+# re-enable platform drives module aliases
+ApplyPatch linux-2.6-modules-modalias-platform.patch
+
#
# bugfixes to drivers and filesystems
#
@@ -1224,6 +1233,8 @@
ApplyPatch linux-2.6-cifs-fix-incomplete-rcv.patch
ApplyPatch linux-2.6-cifs-typo-in-cifs_reconnect-fix.patch
ApplyPatch linux-2.6-cifs-fix-bad-handling-of-EAGAIN.patch
+# fix oops mounting filesystem a second time
+ApplyPatch linux-2.6-cifs-fix-oops-on-second-mount.patch
# fix nfs race
ApplyPatch linux-2.6-nfs-fix-writeback-race.patch
@@ -2298,6 +2309,12 @@
%endif
%changelog
+* Mon Nov 12 2007 Chuck Ebbert <cebbert at redhat.com>
+- Disable USB autosuspend by default.
+- Fix oops in CIFS when mounting a filesystem a second time.
+- Restore platform module autoloading, e.g. pcspkr.
+- Fix failure to boot on 486DX4 (and possibily other CPUs.)
+
* Fri Nov 09 2007 Chuck Ebbert <cebbert at redhat.com>
- Fix the earlier misapplied raid5 patch.
- Fix race in NFS that can cause data corruption.
--- linux-2.6-usb-suspend-classes.patch DELETED ---
More information about the fedora-extras-commits
mailing list