[kernel] r18335 - in dists/trunk/linux-2.6: . debian debian/config debian/config/kernelarch-x86 debian/installer/armel debian/patches/bugfix/all debian/patches/debian debian/patches/features/all debian/patches/features/x86 debian/patches/series debian/templates/image.plain.bug
Ben Hutchings
benh at alioth.debian.org
Thu Dec 1 04:23:15 UTC 2011
Author: benh
Date: Thu Dec 1 04:23:13 2011
New Revision: 18335
Log:
Merge changes from sid up to 3.1.4-1
Added:
dists/trunk/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch
- copied, changed from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch
- copied, changed from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch
- copied, changed from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch
- copied, changed from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch
dists/trunk/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch
- copied, changed from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch
dists/trunk/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
- copied unchanged from r18334, dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
dists/trunk/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
- copied unchanged from r18334, dists/sid/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
Modified:
dists/trunk/linux-2.6/ (props changed)
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/config/config
dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
dists/trunk/linux-2.6/debian/installer/armel/package-list
dists/trunk/linux-2.6/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
dists/trunk/linux-2.6/debian/patches/series/base
dists/trunk/linux-2.6/debian/rules.real
dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-modules
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/changelog Thu Dec 1 04:23:13 2011 (r18335)
@@ -17,6 +17,34 @@
-- Ben Hutchings <ben at decadent.org.uk> Mon, 14 Nov 2011 15:21:10 +0000
+linux-2.6 (3.1.4-1) unstable; urgency=low
+
+ * New upstream stable updates:
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.2
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.3
+ - TTY: ldisc, wait for ldisc infinitely in hangup (Closes: #645071)
+ http://www.kernel.org/pub/linux/kernel/v3.x/ChangeLog-3.1.4
+
+ [ Martin Michlmayr ]
+ * [armel] Set the priority of pata-modules to standard since the
+ GLAN Tank uses PATA.
+
+ [ Ben Hutchings ]
+ * Enable BCMA as module, BCMA_HOST_PCI and B43_BCMA (Closes: #649567)
+ but limit these to devices not supported by brcmsmac
+ * brcmsmac: Enable as module for all architectures
+ * Include module taint flags in bug reports
+ * lirc_serial: Fix various bugs that may result in a crash, deadlock or
+ other failure (Closes: #645811)
+ * amilo-rfkill: Use proper functions to write to the i8042 safely
+ * topology: Provide CPU topology in sysfs in !SMP configurations
+ (Closes: #649216)
+
+ [ Bastian Blank ]
+ * Include generated headers. (closes: #650085)
+
+ -- Bastian Blank <waldi at debian.org> Tue, 29 Nov 2011 14:14:14 +0100
+
linux-2.6 (3.1.1-1) unstable; urgency=high
* New upstream stable update:
Modified: dists/trunk/linux-2.6/debian/config/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/config Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/config/config Thu Dec 1 04:23:13 2011 (r18335)
@@ -202,7 +202,10 @@
##
## file: drivers/bcma/Kconfig
##
-# CONFIG_BCMA is not set
+CONFIG_BCMA=m
+CONFIG_BCMA_HOST_PCI=y
+# CONFIG_BCMA_DRIVER_PCI_HOSTMODE is not set
+# CONFIG_BCMA_DEBUG is not set
##
## file: drivers/block/Kconfig
@@ -2176,6 +2179,7 @@
## file: drivers/net/wireless/b43/Kconfig
##
CONFIG_B43=m
+CONFIG_B43_BCMA=y
CONFIG_B43_PCMCIA=y
CONFIG_B43_SDIO=y
CONFIG_B43_PHY_N=y
@@ -2725,6 +2729,13 @@
# CONFIG_ASUS_OLED is not set
##
+## file: drivers/staging/brcm80211/Kconfig
+##
+CONFIG_BRCMSMAC=m
+# CONFIG_BRCMFMAC is not set
+# CONFIG_BRCMDBG is not set
+
+##
## file: drivers/staging/comedi/Kconfig
##
# CONFIG_COMEDI is not set
Modified: dists/trunk/linux-2.6/debian/config/kernelarch-x86/config
==============================================================================
--- dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/config/kernelarch-x86/config Thu Dec 1 04:23:13 2011 (r18335)
@@ -1165,13 +1165,6 @@
CONFIG_SFI=y
##
-## file: drivers/staging/brcm80211/Kconfig
-##
-CONFIG_BRCMSMAC=m
-# CONFIG_BRCMFMAC is not set
-# CONFIG_BRCMDBG is not set
-
-##
## file: drivers/staging/comedi/Kconfig
##
CONFIG_COMEDI=m
Modified: dists/trunk/linux-2.6/debian/installer/armel/package-list
==============================================================================
--- dists/trunk/linux-2.6/debian/installer/armel/package-list Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/installer/armel/package-list Thu Dec 1 04:23:13 2011 (r18335)
@@ -26,7 +26,7 @@
Package: pata-modules
Depends: kernel-image, ata-modules
-Priority: extra
+Priority: standard
Package: nbd-modules
Depends: kernel-image
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch (from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch Wed Nov 30 22:44:38 2011 (r18334, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -16,15 +16,14 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
-[bwh: Adjust filename for 3.1]
---
- drivers/staging/lirc/lirc_serial.c | 56 +++++++++++------------------
+ drivers/staging/media/lirc/lirc_serial.c | 56 +++++++++++------------------
1 files changed, 21 insertions(+), 35 deletions(-)
-diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 8a060a8..8637631 100644
---- a/drivers/staging/lirc/lirc_serial.c
-+++ b/drivers/staging/lirc/lirc_serial.c
+--- a/drivers/staging/media/lirc/lirc_serial.c
++++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -836,7 +836,7 @@ static int hardware_init_port(void)
return 0;
}
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch (from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch Wed Nov 30 22:44:38 2011 (r18334, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -11,15 +11,14 @@
Reported-by: Torsten Crass <torsten.crass at eBiology.de>
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
-[bwh: Adjust filename for 3.1]
---
- drivers/staging/lirc/lirc_serial.c | 19 ++++++++++++++++---
+ drivers/staging/media/lirc/lirc_serial.c | 19 ++++++++++++++++---
1 files changed, 16 insertions(+), 3 deletions(-)
-diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 8637631..d833772 100644
---- a/drivers/staging/lirc/lirc_serial.c
-+++ b/drivers/staging/lirc/lirc_serial.c
+--- a/drivers/staging/media/lirc/lirc_serial.c
++++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -875,11 +875,14 @@ static int __devinit lirc_serial_probe(struct platform_device *dev)
": or compile the serial port driver as module and\n");
printk(KERN_WARNING LIRC_DRIVER_NAME
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch (from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch Wed Nov 30 22:44:38 2011 (r18334, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -9,15 +9,14 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
-[bwh: Adjust filename for 3.1]
---
- drivers/staging/lirc/lirc_serial.c | 4 +---
+ drivers/staging/media/lirc/lirc_serial.c | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
-diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index d833772..befe626 100644
---- a/drivers/staging/lirc/lirc_serial.c
-+++ b/drivers/staging/lirc/lirc_serial.c
+--- a/drivers/staging/media/lirc/lirc_serial.c
++++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -1127,10 +1127,8 @@ static int lirc_serial_resume(struct platform_device *dev)
{
unsigned long flags;
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch (from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch Wed Nov 30 22:44:38 2011 (r18334, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -12,15 +12,14 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
-[bwh: Adjust filename for 3.1]
---
- drivers/staging/lirc/lirc_serial.c | 23 ++++++++++++-----------
+ drivers/staging/media/lirc/lirc_serial.c | 23 ++++++++++++-----------
1 files changed, 12 insertions(+), 11 deletions(-)
-diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index befe626..6f5257e 100644
---- a/drivers/staging/lirc/lirc_serial.c
-+++ b/drivers/staging/lirc/lirc_serial.c
+--- a/drivers/staging/media/lirc/lirc_serial.c
++++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -773,7 +773,7 @@ static int hardware_init_port(void)
/* we fail, there's nothing here */
printk(KERN_ERR LIRC_DRIVER_NAME ": port existence test "
Copied and modified: dists/trunk/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch (from r18334, dists/sid/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch)
==============================================================================
--- dists/sid/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch Wed Nov 30 22:44:38 2011 (r18334, copy source)
+++ dists/trunk/linux-2.6/debian/patches/bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -10,18 +10,17 @@
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
Signed-off-by: Mauro Carvalho Chehab <mchehab at redhat.com>
-[bwh: Adjust filename for 3.1]
---
- drivers/staging/lirc/lirc_serial.c | 21 +++++++++------------
+ drivers/staging/media/lirc/lirc_serial.c | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
-diff --git a/drivers/staging/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
+diff --git a/drivers/staging/media/lirc/lirc_serial.c b/drivers/staging/media/lirc/lirc_serial.c
index 6f5257e..0ca308a 100644
---- a/drivers/staging/lirc/lirc_serial.c
-+++ b/drivers/staging/lirc/lirc_serial.c
+--- a/drivers/staging/media/lirc/lirc_serial.c
++++ b/drivers/staging/media/lirc/lirc_serial.c
@@ -843,18 +843,15 @@ static int __devinit lirc_serial_probe(struct platform_device *dev)
result = request_irq(irq, irq_handler,
- IRQF_DISABLED | (share_irq ? IRQF_SHARED : 0),
+ (share_irq ? IRQF_SHARED : 0),
LIRC_DRIVER_NAME, (void *)&hardware);
-
- switch (result) {
Copied: dists/trunk/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch (from r18334, dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch Thu Dec 1 04:23:13 2011 (r18335, copy of r18334, dists/sid/linux-2.6/debian/patches/debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch)
@@ -0,0 +1,31 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 24 Nov 2011 07:45:52 +0000
+Subject: [PATCH] bcma: Do not claim PCI device IDs also claimed by brcmsmac
+
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+---
+ drivers/bcma/host_pci.c | 4 +++-
+ 1 files changed, 3 insertions(+), 1 deletions(-)
+
+diff --git a/drivers/bcma/host_pci.c b/drivers/bcma/host_pci.c
+index ac4bc62..e75e78d 100644
+--- a/drivers/bcma/host_pci.c
++++ b/drivers/bcma/host_pci.c
+@@ -224,11 +224,13 @@ static void bcma_host_pci_remove(struct pci_dev *dev)
+ }
+
+ static DEFINE_PCI_DEVICE_TABLE(bcma_pci_bridge_tbl) = {
++#if !IS_ENABLED(CONFIG_BRCMSMAC)
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x0576) },
+- { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4353) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4357) },
+ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4727) },
++#endif
++ { PCI_DEVICE(PCI_VENDOR_ID_BROADCOM, 0x4331) },
+ { 0, },
+ };
+ MODULE_DEVICE_TABLE(pci, bcma_pci_bridge_tbl);
+--
+1.7.7.3
+
Copied: dists/trunk/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch (from r18334, dists/sid/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch Thu Dec 1 04:23:13 2011 (r18335, copy of r18334, dists/sid/linux-2.6/debian/patches/features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch)
@@ -0,0 +1,44 @@
+From: Ben Hutchings <ben at decadent.org.uk>
+Date: Thu, 24 Nov 2011 07:04:39 +0000
+Subject: [PATCH] topology: Provide CPU topology in sysfs in !SMP
+ configurations
+
+commit ccbc60d3e19a1b6ae66ca0d89b3da02dde62088b upstream.
+
+We should provide topology information to userland even if it's not
+very interesting. The current code appears to work properly for !SMP
+(tested on i386).
+
+Reference: http://bugs.debian.org/649216
+Reported-by: Marcus Osdoba <marcus.osdoba at googlemail.com>
+Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
+Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
+---
+ drivers/base/Makefile | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/drivers/base/Makefile b/drivers/base/Makefile
+index 99a375a..1334d89 100644
+--- a/drivers/base/Makefile
++++ b/drivers/base/Makefile
+@@ -3,7 +3,8 @@
+ obj-y := core.o sys.o bus.o dd.o syscore.o \
+ driver.o class.o platform.o \
+ cpu.o firmware.o init.o map.o devres.o \
+- attribute_container.o transport_class.o
++ attribute_container.o transport_class.o \
++ topology.o
+ obj-$(CONFIG_DEVTMPFS) += devtmpfs.o
+ obj-y += power/
+ obj-$(CONFIG_HAS_DMA) += dma-mapping.o
+@@ -12,7 +13,6 @@ obj-$(CONFIG_ISA) += isa.o
+ obj-$(CONFIG_FW_LOADER) += firmware_class.o
+ obj-$(CONFIG_NUMA) += node.o
+ obj-$(CONFIG_MEMORY_HOTPLUG_SPARSE) += memory.o
+-obj-$(CONFIG_SMP) += topology.o
+ ifeq ($(CONFIG_SYSFS),y)
+ obj-$(CONFIG_MODULES) += module.o
+ endif
+--
+1.7.7.3
+
Modified: dists/trunk/linux-2.6/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/patches/features/x86/x86-Add-amilo-rfkill-driver-for-some-Fujitsu-Siemens.patch Thu Dec 1 04:23:13 2011 (r18335)
@@ -9,15 +9,15 @@
http://sourceforge.net/projects/fsaa1655g/
http://sourceforge.net/projects/fsam7440/
-This adds DMI matching and replaces the procfs files with rfkill
-devices.
+This adds DMI matching, replaces the procfs files with rfkill devices,
+and uses the proper function to write to the i8042 safely.
Signed-off-by: Ben Hutchings <ben at decadent.org.uk>
---
drivers/platform/x86/Kconfig | 7 ++
drivers/platform/x86/Makefile | 1 +
- drivers/platform/x86/amilo-rfkill.c | 180 +++++++++++++++++++++++++++++++++++
- 3 files changed, 188 insertions(+), 0 deletions(-)
+ drivers/platform/x86/amilo-rfkill.c | 173 +++++++++++++++++++++++++++++++++++
+ 3 files changed, 181 insertions(+), 0 deletions(-)
create mode 100644 drivers/platform/x86/amilo-rfkill.c
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
@@ -52,10 +52,10 @@
obj-$(CONFIG_IDEAPAD_LAPTOP) += ideapad-laptop.o
diff --git a/drivers/platform/x86/amilo-rfkill.c b/drivers/platform/x86/amilo-rfkill.c
new file mode 100644
-index 0000000..028d3ec
+index 0000000..19170bb
--- /dev/null
+++ b/drivers/platform/x86/amilo-rfkill.c
-@@ -0,0 +1,180 @@
+@@ -0,0 +1,173 @@
+/*
+ * Support for rfkill on some Fujitsu-Siemens Amilo laptops.
+ * Copyright 2011 Ben Hutchings.
@@ -73,6 +73,7 @@
+
+#include <linux/module.h>
+#include <linux/dmi.h>
++#include <linux/i8042.h>
+#include <linux/io.h>
+#include <linux/moduleparam.h>
+#include <linux/platform_device.h>
@@ -82,27 +83,19 @@
+ * These values were obtained from disassembling and debugging the
+ * PM.exe program installed in the Fujitsu-Siemens AMILO A1655G
+ */
-+#define A1655_STATE_PORT 0x64
-+#define A1655_COMMAND_PORT 0x64
-+#define A1655_DATA_PORT 0x60
-+#define A1655_WIFI_COMMAND 0xC5
++#define A1655_WIFI_COMMAND 0x10C5
+#define A1655_WIFI_ON 0x25
+#define A1655_WIFI_OFF 0x45
+
+static int amilo_a1655_rfkill_set_block(void *data, bool blocked)
+{
-+ u8 val;
-+
-+ do
-+ val = inb(A1655_STATE_PORT);
-+ while ((val & 2) == 2);
-+ outb(A1655_WIFI_COMMAND, A1655_COMMAND_PORT);
-+ do
-+ val = inb(A1655_STATE_PORT);
-+ while ((val & 2) == 2);
-+ outb(blocked ? A1655_WIFI_OFF : A1655_WIFI_ON, A1655_DATA_PORT);
++ u8 param = blocked ? A1655_WIFI_OFF : A1655_WIFI_ON;
++ int rc;
+
-+ return 0;
++ i8042_lock_chip();
++ rc = i8042_command(¶m, A1655_WIFI_COMMAND);
++ i8042_unlock_chip();
++ return rc;
+}
+
+static const struct rfkill_ops amilo_a1655_rfkill_ops = {
@@ -237,5 +230,5 @@
+module_init(amilo_rfkill_init);
+module_exit(amilo_rfkill_exit);
--
-1.7.7.2
+1.7.7.3
Modified: dists/trunk/linux-2.6/debian/patches/series/base
==============================================================================
--- dists/trunk/linux-2.6/debian/patches/series/base Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/patches/series/base Thu Dec 1 04:23:13 2011 (r18335)
@@ -46,3 +46,13 @@
#+ bugfix/ia64/ia64-Add-accept4-syscall.patch
+ bugfix/arm/ixp4xx_iobe.patch
+ bugfix/all/netdev-Revert-ARCNET-and-PHYLIB-to-tristate-options.patch
+
++ debian/bcma-Do-not-claim-PCI-device-IDs-also-claimed-by-brc.patch
+
++ bugfix/all/0001-media-staging-lirc_serial-Fix-init-exit-order.patch
++ bugfix/all/0002-media-staging-lirc_serial-Free-resources-on-failure-.patch
++ bugfix/all/0003-media-staging-lirc_serial-Fix-deadlock-on-resume-fai.patch
++ bugfix/all/0004-media-staging-lirc_serial-Fix-bogus-error-codes.patch
++ bugfix/all/0005-media-staging-lirc_serial-Do-not-assume-error-codes-.patch
+
++ features/all/topology-Provide-CPU-topology-in-sysfs-in-SMP-configura.patch
Modified: dists/trunk/linux-2.6/debian/rules.real
==============================================================================
--- dists/trunk/linux-2.6/debian/rules.real Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/rules.real Thu Dec 1 04:23:13 2011 (r18335)
@@ -242,6 +242,7 @@
mkdir -p $(DIR)/arch/$(KERNEL_ARCH)/kernel
cp -a $(SOURCE_DIR)/{.config,.kernel*,Module.symvers,include} $(DIR)
+ cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/include $(DIR)/arch/$(KERNEL_ARCH)
cp -a $(SOURCE_DIR)/arch/$(KERNEL_ARCH)/kernel/asm-offsets.s $(DIR)/arch/$(KERNEL_ARCH)/kernel
ifneq ($(filter powerpc ppc64,$(ARCH)),)
Modified: dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-modules
==============================================================================
--- dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-modules Wed Nov 30 22:44:38 2011 (r18334)
+++ dists/trunk/linux-2.6/debian/templates/image.plain.bug/include-modules Thu Dec 1 04:23:13 2011 (r18335)
@@ -1,6 +1,7 @@
add_modules() {
echo '** Loaded modules:' >&3
- lsmod >&3
+ # List modules along with any taint flags
+ cut -d' ' --output-delimiter='' -f1,7 /proc/modules >&3
echo >&3
}
More information about the Kernel-svn-changes
mailing list