rpms/kernel/F-9 linux-2.6.27-acpi-ec-drizzle.patch, NONE, 1.1 linux-2.6.27-pci-hush-allocation-failures.patch, NONE, 1.1 linux-2.6.27-sony-laptop-suspend-fix.patch, NONE, 1.1 kernel.spec, 1.814, 1.815
Chuck Ebbert
cebbert at fedoraproject.org
Thu Oct 30 05:43:56 UTC 2008
- Previous message: rpms/kernel/devel linux-2.6.27-drm-i915-fix-ioctl-security.patch, 1.1, NONE linux-2.6.27-net-r8169-2.6.28.patch, 1.1, NONE linux-2.6.27-xfs-remount-fix.patch, 1.2, NONE
- Next message: rpms/scummvm-tools/F-9 .cvsignore, 1.2, 1.3 scummvm-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cebbert
Update of /cvs/pkgs/rpms/kernel/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25438
Modified Files:
kernel.spec
Added Files:
linux-2.6.27-acpi-ec-drizzle.patch
linux-2.6.27-pci-hush-allocation-failures.patch
linux-2.6.27-sony-laptop-suspend-fix.patch
Log Message:
Copy 3 patches from rawhide:
linux-2.6.27-acpi-ec-drizzle.patch
linux-2.6.27-pci-hush-allocation-failures
linux-2.6.27-sony-laptop-suspend-fix
linux-2.6.27-acpi-ec-drizzle.patch:
--- NEW FILE linux-2.6.27-acpi-ec-drizzle.patch ---
diff -up linux-2.6.27.noarch/drivers/acpi/ec.c.jx linux-2.6.27.noarch/drivers/acpi/ec.c
--- linux-2.6.27.noarch/drivers/acpi/ec.c.jx 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch/drivers/acpi/ec.c 2008-10-21 17:19:03.000000000 -0400
@@ -520,7 +520,7 @@ static u32 acpi_ec_gpe_handler(void *dat
pr_debug(PREFIX "~~~> interrupt\n");
atomic_inc(&ec->irq_count);
if (atomic_read(&ec->irq_count) > 5) {
- pr_err(PREFIX "GPE storm detected, disabling EC GPE\n");
+ pr_info(PREFIX "GPE storm detected, disabling EC GPE\n");
ec_switch_to_poll_mode(ec);
goto end;
}
linux-2.6.27-pci-hush-allocation-failures.patch:
--- NEW FILE linux-2.6.27-pci-hush-allocation-failures.patch ---
diff -up linux-2.6.27.noarch/drivers/pci/setup-res.c.jx linux-2.6.27.noarch/drivers/pci/setup-res.c
--- linux-2.6.27.noarch/drivers/pci/setup-res.c.jx 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch/drivers/pci/setup-res.c 2008-10-16 14:12:13.000000000 -0400
@@ -138,10 +138,10 @@ int pci_assign_resource(struct pci_dev *
align = resource_alignment(res);
if (!align) {
- dev_err(&dev->dev, "BAR %d: can't allocate resource (bogus "
- "alignment) [%#llx-%#llx] flags %#lx\n",
- resno, (unsigned long long)res->start,
- (unsigned long long)res->end, res->flags);
+ dev_info(&dev->dev, "BAR %d: can't allocate resource (bogus "
+ "alignment) [%#llx-%#llx] flags %#lx\n",
+ resno, (unsigned long long)res->start,
+ (unsigned long long)res->end, res->flags);
return -EINVAL;
}
@@ -162,11 +162,11 @@ int pci_assign_resource(struct pci_dev *
}
if (ret) {
- dev_err(&dev->dev, "BAR %d: can't allocate %s resource "
- "[%#llx-%#llx]\n", resno,
- res->flags & IORESOURCE_IO ? "I/O" : "mem",
- (unsigned long long)res->start,
- (unsigned long long)res->end);
+ dev_info(&dev->dev, "BAR %d: can't allocate %s resource "
+ "[%#llx-%#llx]\n", resno,
+ res->flags & IORESOURCE_IO ? "I/O" : "mem",
+ (unsigned long long)res->start,
+ (unsigned long long)res->end);
} else {
res->flags &= ~IORESOURCE_STARTALIGN;
if (resno < PCI_BRIDGE_RESOURCES)
diff -up linux-2.6.27.noarch/arch/x86/pci/i386.c.jx linux-2.6.27.noarch/arch/x86/pci/i386.c
--- linux-2.6.27.noarch/arch/x86/pci/i386.c.jx 2008-10-09 18:13:53.000000000 -0400
+++ linux-2.6.27.noarch/arch/x86/pci/i386.c 2008-10-23 10:21:14.000000000 -0400
@@ -128,7 +128,7 @@ static void __init pcibios_allocate_bus_
pr = pci_find_parent_resource(dev, r);
if (!r->start || !pr ||
request_resource(pr, r) < 0) {
- dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
+ dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);
/*
* Something is wrong with the region.
* Invalidate the resource to prevent
@@ -169,7 +169,7 @@ static void __init pcibios_allocate_reso
r->flags, disabled, pass);
pr = pci_find_parent_resource(dev, r);
if (!pr || request_resource(pr, r) < 0) {
- dev_err(&dev->dev, "BAR %d: can't allocate resource\n", idx);
+ dev_info(&dev->dev, "BAR %d: can't allocate resource\n", idx);
/* We'll assign a new address later */
r->end -= r->start;
r->start = 0;
linux-2.6.27-sony-laptop-suspend-fix.patch:
--- NEW FILE linux-2.6.27-sony-laptop-suspend-fix.patch ---
>From 5eca50f39d16cfcd565c83ef42e83ef7f80a1c65 Mon Sep 17 00:00:00 2001
From: Matthew Garrett <mjg59 at srcf.ucam.org>
Date: Thu, 16 Oct 2008 17:26:20 -0400
Subject: [PATCH] sony-laptop: Ignore missing _DIS method on pic device
At least the Vaio VGN-Z540N doesn't have this method, so let's not fail
to suspend just because it doesn't exist.
Signed-off-by: Adam Jackson <ajax at redhat.com>
---
drivers/misc/sony-laptop.c | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/drivers/misc/sony-laptop.c b/drivers/misc/sony-laptop.c
index 60775be..b35eb92 100644
--- a/drivers/misc/sony-laptop.c
+++ b/drivers/misc/sony-laptop.c
@@ -2315,8 +2315,10 @@ end:
*/
static int sony_pic_disable(struct acpi_device *device)
{
- if (ACPI_FAILURE(acpi_evaluate_object(device->handle,
- "_DIS", NULL, NULL)))
+ acpi_status ret = acpi_evaluate_object(device->handle, "_DIS", NULL,
+ NULL);
+
+ if (ACPI_FAILURE(ret) && ret != AE_NOT_FOUND)
return -ENXIO;
dprintk("Device disabled\n");
--
1.6.0.1
Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-9/kernel.spec,v
retrieving revision 1.814
retrieving revision 1.815
diff -u -r1.814 -r1.815
--- kernel.spec 30 Oct 2008 04:41:11 -0000 1.814
+++ kernel.spec 30 Oct 2008 05:43:25 -0000 1.815
@@ -631,6 +631,11 @@
Patch452: linux-2.6.27-hwmon-applesmc-2.6.28.patch
Patch460: linux-2.6-serial-460800.patch
Patch510: linux-2.6-silence-noise.patch
+# hush pci bar allocation failures
+Patch520: linux-2.6.27-pci-hush-allocation-failures.patch
+# EC storms aren't anything you can fix, shut up already
+Patch530: linux-2.6.27-acpi-ec-drizzle.patch
+
Patch570: linux-2.6-selinux-mprotect-checks.patch
Patch580: linux-2.6-sparc-selinux-mprotect-checks.patch
Patch610: linux-2.6-defaults-fat-utf8.patch
@@ -686,6 +691,10 @@
Patch2902: linux-2.6.27-ext-dir-corruption-fix.patch
Patch2903: linux-2.6.27-delay-ext4-free-block-cap-check.patch
+# Sony Vaio suspend fix
+Patch3100: linux-2.6.27-sony-laptop-suspend-fix.patch
+
+
%endif
BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1073,6 +1082,8 @@
#
# bugfixes to drivers and filesystems
#
+# Sony Vaio suspend fix
+ApplyPatch linux-2.6.27-sony-laptop-suspend-fix.patch
# USB
# actually honor the nousb parameter
@@ -1136,6 +1147,10 @@
ApplyPatch linux-2.6-serial-460800.patch
# Silence some useless messages that still get printed with 'quiet'
ApplyPatch linux-2.6-silence-noise.patch
+# hush pci bar allocation failures
+ApplyPatch linux-2.6.27-pci-hush-allocation-failures.patch
+# EC storms aren't anything you can fix, shut up already
+ApplyPatch linux-2.6.27-acpi-ec-drizzle.patch
# Fix the SELinux mprotect checks on executable mappings
ApplyPatch linux-2.6-selinux-mprotect-checks.patch
@@ -1802,6 +1817,12 @@
%kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL}.xen -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.xen.conf %{with_xen} xen
%changelog
+* Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-2
+- Copy 3 patches from rawhide:
+ linux-2.6.27-acpi-ec-drizzle.patch
+ linux-2.6.27-pci-hush-allocation-failures
+ linux-2.6.27-sony-laptop-suspend-fix
+
* Thu Oct 30 2008 Chuck Ebbert <cebbert at redhat.com> 2.6.27.4-1
- Linux 2.6.27.4
- Previous message: rpms/kernel/devel linux-2.6.27-drm-i915-fix-ioctl-security.patch, 1.1, NONE linux-2.6.27-net-r8169-2.6.28.patch, 1.1, NONE linux-2.6.27-xfs-remount-fix.patch, 1.2, NONE
- Next message: rpms/scummvm-tools/F-9 .cvsignore, 1.2, 1.3 scummvm-tools.spec, 1.1, 1.2 sources, 1.2, 1.3
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list