[arch-commits] CVS update of arch/build/kernels/kernel26 (4 files)

Thomas Baechler thomas at archlinux.org
Fri Jul 13 18:40:14 UTC 2007 

    Date: Friday, July 13, 2007 @ 14:40:14
  Author: thomas
    Path: /home/cvs-arch/arch/build/kernels/kernel26

   Added: acpi-asus-m6-battery-fix.patch (1.1)
Modified: PKGBUILD (1.240 -> 1.241) config (1.100 -> 1.101)
          config.x86_64 (1.30 -> 1.31)

upgpkg: kernel26 2.6.22.1-1


--------------------------------+
 PKGBUILD                       |   23 +++++++++------
 acpi-asus-m6-battery-fix.patch |   59 +++++++++++++++++++++++++++++++++++++++
 config                         |    4 +-
 config.x86_64                  |    4 +-
 4 files changed, 79 insertions(+), 11 deletions(-)


Index: arch/build/kernels/kernel26/PKGBUILD
diff -u arch/build/kernels/kernel26/PKGBUILD:1.240 arch/build/kernels/kernel26/PKGBUILD:1.241
--- arch/build/kernels/kernel26/PKGBUILD:1.240	Mon Jul  9 17:19:17 2007
+++ arch/build/kernels/kernel26/PKGBUILD	Fri Jul 13 14:40:14 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.240 2007/07/09 21:19:17 thomas Exp $
+# $Id: PKGBUILD,v 1.241 2007/07/13 18:40:14 thomas Exp $
 # Maintainer: judd <jvinet at zeroflux.org>
 pkgname=kernel26
 _basekernel=2.6.22
-pkgver=2.6.22
-pkgrel=6
+pkgver=2.6.22.1
+pkgrel=1
 pkgdesc="The Linux Kernel and modules"
 arch=(i686 x86_64)
 license=('GPL')
@@ -16,12 +16,12 @@
 replaces=('kernel24' 'kernel24-scsi' 'kernel26-scsi'
           'alsa-driver' 'ieee80211' 'hostap-driver26'
           'pwc' 'nforce' 'squashfs' 'unionfs' 'ivtv'
-	  'zd1211')
+	  'zd1211' 'kvm-modules')
 install=kernel26.install
 source=(ftp://ftp.kernel.org/pub/linux/kernel/v2.6/linux-$_basekernel.tar.bz2
         #http://www.kernel.org/pub/linux/kernel/v2.6/testing/patch-2.6.22-rc7.bz2
 	#http://www.kernel.org/pub/linux/kernel/v2.6/snapshots/patch-2.6.22-rc7-git2.bz2
-	#ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
+	ftp://ftp.kernel.org/pub/linux/kernel/v2.6/patch-$pkgver.bz2
         config config.x86_64
         logo_linux_clut224.ppm
         logo_linux_mono.pbm
@@ -38,12 +38,14 @@
 	http://www.archlinux.org/~tpowa/alsa-patches/alsa-include-20070707.patch.bz2
 	acpi-buggy-bios.patch
 	bluetooth-alsa.patch
+	acpi-asus-m6-battery-fix.patch
 	#http://heanet.dl.sourceforge.net/sourceforge/squashfs/squashfs3.2-r2.tar.gz broken!
 	squashfs3.2-patch.bz2
 	ftp://ftp.fsl.cs.sunysb.edu/pub/unionfs/unionfs-2.x/linux-2.6.22-rc4-u1.diff.gz)
 md5sums=('2e230d005c002fb3d38a3ca07c0200d0'
-         'fabd78eb5a98163aba36d52d615ea2b8'
-         '351b0297c301e398ded6c35778732817'
+         'a29ac92cd688d591afd3fec48905e329'
+         '8f4d0fbb4d613a00d001e31cde154ffa'
+         'd02ebf6e840833e4326977774a5a6fd9'
          '5a62bcc7e96601052c7405459b483826'
          'ed6b42fea2f5d27f7eb920746ccc1ebb'
          'a995ec849ea43d3c89d607bbdd1e7d09'
@@ -58,6 +60,7 @@
          'da4c71ae4614ff9e07f323ec75a84862'
          'bbc730a590d4e09b3d937b257e5a4bfe'
          'f5bd3608306e0ede70c3b3bd8b5de53e'
+         '3ee74420f6f6a59b0c456f6a839434bf'
          '004c5d686dd70478f80fb6f075a6086b'
          'f68b3f80a9ecde21248efae29bfa91cd')
 
@@ -67,7 +70,7 @@
 
   cd $startdir/src/linux-$_basekernel
   # add upstream patch from 2.6.22 series
-  #patch -Np1 -i ../patch-$pkgver || return 1
+  patch -Np1 -i ../patch-$pkgver || return 1
   #patch -Np1 -i ../patch-$pkgver-rc7 || return 1
   #patch -Np1 -i ../patch-2.6.22-rc7-git2 || return 1
   # add acpi custom dsdt patch
@@ -88,8 +91,10 @@
   patch -Np0 -i ../alsa-include-20070707.patch || return 1
   # fix buggy bios acpi to get c states
   patch -Np1 -i ../acpi-buggy-bios.patch || return 1
-  #fix alsa bluetooth, http://bluetooth-alsa.cvs.sourceforge.net/bluetooth-alsa/plugz/patches/
+  # fix alsa bluetooth, http://bluetooth-alsa.cvs.sourceforge.net/bluetooth-alsa/plugz/patches/
   patch -Np1 -i ../bluetooth-alsa.patch || return 1
+  # fix bug #7599
+  patch -Np1 -i ../acpi-asus-m6-battery-fix.patch || return 1
   # add sqashfs
   patch -Np1 -i ../squashfs3.2-patch || return 1
   # add unionfs
Index: arch/build/kernels/kernel26/acpi-asus-m6-battery-fix.patch
diff -u /dev/null arch/build/kernels/kernel26/acpi-asus-m6-battery-fix.patch:1.1
--- /dev/null	Fri Jul 13 14:40:14 2007
+++ arch/build/kernels/kernel26/acpi-asus-m6-battery-fix.patch	Fri Jul 13 14:40:14 2007
@@ -0,0 +1,59 @@
+If ECDT is not found, look up EC in DSDT.
+
+From: Alexey Starikovskiy <aystarik at gmail.com>
+
+
+---
+
+ drivers/acpi/ec.c |   29 ++++++++++++++++-------------
+ 1 files changed, 16 insertions(+), 13 deletions(-)
+
+diff --git a/drivers/acpi/ec.c b/drivers/acpi/ec.c
+index 82f496c..5cae633 100644
+--- a/drivers/acpi/ec.c
++++ b/drivers/acpi/ec.c
+@@ -801,8 +801,8 @@ ec_parse_device(acpi_handle handle, u32 Level, void *context, void **retval)
+ 
+ 	ec->handle = handle;
+ 
+-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "GPE=0x%02lx, ports=0x%2lx, 0x%2lx",
+-			  ec->gpe, ec->command_addr, ec->data_addr));
++	printk(KERN_INFO PREFIX "GPE=0x%02lx, ports=0x%2lx, 0x%2lx\n",
++			  ec->gpe, ec->command_addr, ec->data_addr);
+ 
+ 	return AE_CTRL_TERMINATE;
+ }
+@@ -819,19 +819,22 @@ int __init acpi_ec_ecdt_probe(void)
+ 	/*
+ 	 * Generate a boot ec context
+ 	 */
+-
+ 	status = acpi_get_table(ACPI_SIG_ECDT, 1,
+ 				(struct acpi_table_header **)&ecdt_ptr);
+-	if (ACPI_FAILURE(status))
+-		goto error;
+-
+-	ACPI_DEBUG_PRINT((ACPI_DB_INFO, "Found ECDT"));
+-
+-	boot_ec->command_addr = ecdt_ptr->control.address;
+-	boot_ec->data_addr = ecdt_ptr->data.address;
+-	boot_ec->gpe = ecdt_ptr->gpe;
+-	boot_ec->handle = ACPI_ROOT_OBJECT;
+-
++	if (ACPI_SUCCESS(status)) {
++		printk(KERN_INFO PREFIX "Found ECDT\n");
++		boot_ec->command_addr = ecdt_ptr->control.address;
++		boot_ec->data_addr = ecdt_ptr->data.address;
++		boot_ec->gpe = ecdt_ptr->gpe;
++		boot_ec->handle = ACPI_ROOT_OBJECT;
++	} else {
++		printk(KERN_DEBUG PREFIX "Look up EC in DSDT\n");
++		status = acpi_get_devices(ACPI_EC_HID, ec_parse_device,
++						boot_ec, NULL);
++		if (ACPI_FAILURE(status))
++			goto error;
++	}
++	
+ 	ret = ec_install_handlers(boot_ec);
+ 	if (!ret) {
+ 		first_ec = boot_ec;
Index: arch/build/kernels/kernel26/config
diff -u arch/build/kernels/kernel26/config:1.100 arch/build/kernels/kernel26/config:1.101
--- arch/build/kernels/kernel26/config:1.100	Mon Jul  9 15:36:22 2007
+++ arch/build/kernels/kernel26/config	Fri Jul 13 14:40:14 2007
@@ -3077,7 +3077,9 @@
 #
 # Virtualization
 #
-# CONFIG_KVM is not set
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
 
 #
 # File systems
Index: arch/build/kernels/kernel26/config.x86_64
diff -u arch/build/kernels/kernel26/config.x86_64:1.30 arch/build/kernels/kernel26/config.x86_64:1.31
--- arch/build/kernels/kernel26/config.x86_64:1.30	Mon Jul  9 15:36:22 2007
+++ arch/build/kernels/kernel26/config.x86_64	Fri Jul 13 14:40:14 2007
@@ -2808,7 +2808,9 @@
 #
 # Virtualization
 #
-# CONFIG_KVM is not set
+CONFIG_KVM=m
+CONFIG_KVM_INTEL=m
+CONFIG_KVM_AMD=m
 
 #
 # Firmware Drivers

More information about the arch-commits mailing list