From 0221b2bbc29ed9925db447e5f77d0aa067e9212f Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Mon, 2 Aug 2010 01:30:37 +0000 Subject: [PATCH] Update to 2.6.35 svn path=/dists/trunk/linux-2.6/; revision=16034 --- debian/changelog | 8 ++ ...ame-get_current-to-fix-build-failure.patch | 102 ------------------ ...base-for-several-PCI-bridges-lacking.patch | 85 --------------- debian/patches/series/base | 2 - 4 files changed, 8 insertions(+), 189 deletions(-) delete mode 100644 debian/patches/bugfix/all/ds2782_battery-Rename-get_current-to-fix-build-failure.patch delete mode 100644 debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch diff --git a/debian/changelog b/debian/changelog index 0bfd9f70c..0a7328f1c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +linux-2.6 (2.6.35-1~experimental.1) UNRELEASED; urgency=low + + * New upstream release: http://kernelnewbies.org/Linux_2_6_35 + - [ia64] Fix crash when gcore reads gate area (Closes: #588574) + - tpm_tis: fix subsequent suspend failures (Closes: #591031) + + -- Ben Hutchings Mon, 02 Aug 2010 02:21:32 +0100 + linux-2.6 (2.6.35~rc6-1~experimental.1) experimental; urgency=low * New upstream release candidate diff --git a/debian/patches/bugfix/all/ds2782_battery-Rename-get_current-to-fix-build-failure.patch b/debian/patches/bugfix/all/ds2782_battery-Rename-get_current-to-fix-build-failure.patch deleted file mode 100644 index ae866d96d..000000000 --- a/debian/patches/bugfix/all/ds2782_battery-Rename-get_current-to-fix-build-failure.patch +++ /dev/null @@ -1,102 +0,0 @@ -From: Peter Huewe -Date: Thu, 13 May 2010 01:54:57 +0200 -Subject: [PATCH] ds2782_battery: Rename get_current to fix build failure / name conflict - -commit eb9650d6d989f24f21232a055d8fd45f1a9dcf99 upstream. - -This patch changes the name of get_current function pointer to -get_battery_current to resolve a name conflict with the get_current -macro defined in current.h. - -This conflict resulted in a build-failure[1] for the sh4 arch -allyesconfig: - - drivers/power/ds2782_battery.c:216:48: error: macro "get_current" - passed 2 arguments, but takes just - -This patch fixes the issue. To be consistent the other function pointers -(_voltage,_capacity) were renamed too. - -Signed-off-by: Peter Huewe -Acked-by: Ryan Mallon -Acked-by: Mike Rapoport -Signed-off-by: Anton Vorontsov ---- - drivers/power/ds2782_battery.c | 29 ++++++++++++++--------------- - 1 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/drivers/power/ds2782_battery.c b/drivers/power/ds2782_battery.c -index d762a0c..9b3b4b7 100644 ---- a/drivers/power/ds2782_battery.c -+++ b/drivers/power/ds2782_battery.c -@@ -43,10 +43,9 @@ - struct ds278x_info; - - struct ds278x_battery_ops { -- int (*get_current)(struct ds278x_info *info, int *current_uA); -- int (*get_voltage)(struct ds278x_info *info, int *voltage_uA); -- int (*get_capacity)(struct ds278x_info *info, int *capacity_uA); -- -+ int (*get_battery_current)(struct ds278x_info *info, int *current_uA); -+ int (*get_battery_voltage)(struct ds278x_info *info, int *voltage_uA); -+ int (*get_battery_capacity)(struct ds278x_info *info, int *capacity_uA); - }; - - #define to_ds278x_info(x) container_of(x, struct ds278x_info, battery) -@@ -213,11 +212,11 @@ static int ds278x_get_status(struct ds278x_info *info, int *status) - int current_uA; - int capacity; - -- err = info->ops->get_current(info, ¤t_uA); -+ err = info->ops->get_battery_current(info, ¤t_uA); - if (err) - return err; - -- err = info->ops->get_capacity(info, &capacity); -+ err = info->ops->get_battery_capacity(info, &capacity); - if (err) - return err; - -@@ -246,15 +245,15 @@ static int ds278x_battery_get_property(struct power_supply *psy, - break; - - case POWER_SUPPLY_PROP_CAPACITY: -- ret = info->ops->get_capacity(info, &val->intval); -+ ret = info->ops->get_battery_capacity(info, &val->intval); - break; - - case POWER_SUPPLY_PROP_VOLTAGE_NOW: -- ret = info->ops->get_voltage(info, &val->intval); -+ ret = info->ops->get_battery_voltage(info, &val->intval); - break; - - case POWER_SUPPLY_PROP_CURRENT_NOW: -- ret = info->ops->get_current(info, &val->intval); -+ ret = info->ops->get_battery_current(info, &val->intval); - break; - - case POWER_SUPPLY_PROP_TEMP: -@@ -307,14 +306,14 @@ enum ds278x_num_id { - - static struct ds278x_battery_ops ds278x_ops[] = { - [DS2782] = { -- .get_current = ds2782_get_current, -- .get_voltage = ds2782_get_voltage, -- .get_capacity = ds2782_get_capacity, -+ .get_battery_current = ds2782_get_current, -+ .get_battery_voltage = ds2782_get_voltage, -+ .get_battery_capacity = ds2782_get_capacity, - }, - [DS2786] = { -- .get_current = ds2786_get_current, -- .get_voltage = ds2786_get_voltage, -- .get_capacity = ds2786_get_capacity, -+ .get_battery_current = ds2786_get_current, -+ .get_battery_voltage = ds2786_get_voltage, -+ .get_battery_capacity = ds2786_get_capacity, - } - }; - --- -1.7.1 - diff --git a/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch b/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch deleted file mode 100644 index d4f1e0cb3..000000000 --- a/debian/patches/bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 75841ebf0d47558653b21d6cc88942c397d40a98 Mon Sep 17 00:00:00 2001 -From: Ben Hutchings -Date: Sun, 13 Jun 2010 21:23:29 +0100 -Subject: [PATCH] mips: Set io_map_base for several PCI bridges lacking it - -Several MIPS platforms don't set pci_controller::io_map_base for their -PCI bridges. This results in a panic in pci_iomap(). (The panic is -conditional on CONFIG_PCI_DOMAINS, but that is now enabled for all PCI -MIPS systems.) - -I have tested the change to Malta in qemu; the other platforms not at -all. ---- - arch/mips/mti-malta/malta-pci.c | 2 ++ - arch/mips/nxp/pnx8550/common/pci.c | 1 + - arch/mips/nxp/pnx8550/common/setup.c | 2 +- - arch/mips/pci/ops-pmcmsp.c | 1 + - arch/mips/pci/pci-yosemite.c | 1 + - 5 files changed, 6 insertions(+), 1 deletions(-) - -diff --git a/arch/mips/mti-malta/malta-pci.c b/arch/mips/mti-malta/malta-pci.c -index 2fbfa1a..bf80921 100644 ---- a/arch/mips/mti-malta/malta-pci.c -+++ b/arch/mips/mti-malta/malta-pci.c -@@ -247,6 +247,8 @@ void __init mips_pcibios_init(void) - iomem_resource.end &= 0xfffffffffULL; /* 64 GB */ - ioport_resource.end = controller->io_resource->end; - -+ controller->io_map_base = mips_io_port_base; -+ - register_pci_controller(controller); - } - -diff --git a/arch/mips/nxp/pnx8550/common/pci.c b/arch/mips/nxp/pnx8550/common/pci.c -index eee4f3d..98e86dd 100644 ---- a/arch/mips/nxp/pnx8550/common/pci.c -+++ b/arch/mips/nxp/pnx8550/common/pci.c -@@ -44,6 +44,7 @@ extern struct pci_ops pnx8550_pci_ops; - - static struct pci_controller pnx8550_controller = { - .pci_ops = &pnx8550_pci_ops, -+ .io_map_base = PNX8550_PORT_BASE, - .io_resource = &pci_io_resource, - .mem_resource = &pci_mem_resource, - }; -diff --git a/arch/mips/nxp/pnx8550/common/setup.c b/arch/mips/nxp/pnx8550/common/setup.c -index 2aed50f..64246c9 100644 ---- a/arch/mips/nxp/pnx8550/common/setup.c -+++ b/arch/mips/nxp/pnx8550/common/setup.c -@@ -113,7 +113,7 @@ void __init plat_mem_setup(void) - PNX8550_GLB2_ENAB_INTA_O = 0; - - /* IO/MEM resources. */ -- set_io_port_base(KSEG1); -+ set_io_port_base(PNX8550_PORT_BASE); - ioport_resource.start = 0; - ioport_resource.end = ~0; - iomem_resource.start = 0; -diff --git a/arch/mips/pci/ops-pmcmsp.c b/arch/mips/pci/ops-pmcmsp.c -index 04b3147..b7c03d8 100644 ---- a/arch/mips/pci/ops-pmcmsp.c -+++ b/arch/mips/pci/ops-pmcmsp.c -@@ -944,6 +944,7 @@ static struct pci_controller msp_pci_controller = { - .pci_ops = &msp_pci_ops, - .mem_resource = &pci_mem_resource, - .mem_offset = 0, -+ .io_map_base = MSP_PCI_IOSPACE_BASE, - .io_resource = &pci_io_resource, - .io_offset = 0 - }; -diff --git a/arch/mips/pci/pci-yosemite.c b/arch/mips/pci/pci-yosemite.c -index 0357946..cf5e1a2 100644 ---- a/arch/mips/pci/pci-yosemite.c -+++ b/arch/mips/pci/pci-yosemite.c -@@ -54,6 +54,7 @@ static int __init pmc_yosemite_setup(void) - panic(ioremap_failed); - - set_io_port_base(io_v_base); -+ py_controller.io_map_base = io_v_base; - TITAN_WRITE(RM9000x2_OCD_LKM7, TITAN_READ(RM9000x2_OCD_LKM7) | 1); - - ioport_resource.end = TITAN_IO_SIZE - 1; --- -1.7.1 - diff --git a/debian/patches/series/base b/debian/patches/series/base index 91140b48b..0c7daa6d2 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -46,7 +46,6 @@ #+ bugfix/all/thinkpad-acpi-fix-backlight.patch + features/all/revert-ipv4-Make-INET_LRO-a-bool-instead-of-tristate.patch + bugfix/all/ipr-add-writeq-definition-if-needed.patch -+ bugfix/mips/mips-Set-io_map_base-for-several-PCI-bridges-lacking.patch + bugfix/all/mantis-Select-correct-frontends.patch + features/arm/openrd-ultimate.patch + features/arm/ts219-mpp44.patch @@ -59,4 +58,3 @@ + bugfix/all/rtl8192su-Clean-up-in-case-of-an-error-in-mo.patch + bugfix/all/rtl8192su-Fix-procfs-code-for-interfaces-not.patch + bugfix/all/viafb-Depends-on-X86.patch -+ bugfix/all/ds2782_battery-Rename-get_current-to-fix-build-failure.patch