From fdfd689c352215d0c10b86042bb00f930756c6bb Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 24 Oct 2009 16:56:36 +0000 Subject: [PATCH 01/12] * debian/changelog: Update. * debian/config/defines: Set abiname to 1. svn path=/dists/sid/linux-2.6/; revision=14442 --- debian/changelog | 5 ++++- debian/config/defines | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0ddaa1472..5a155510a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low +linux-2.6 (2.6.31-1) UNRELEASED; urgency=low [ Ben Hutchings ] * Include aufs2, marked as staging (Closes: #541828) @@ -19,6 +19,9 @@ linux-2.6 (2.6.31-1~experimental.3) UNRELEASED; urgency=low ia64 and x86_64 to 65536 otherwise default to 32768. * Unset UEVENT_HELPER_PATH to save some boot cycles. + [ Bastian Blank ] + * Set ABI to 1. + -- Ben Hutchings Tue, 13 Oct 2009 02:18:40 +0100 linux-2.6 (2.6.31-1~experimental.2) experimental; urgency=low diff --git a/debian/config/defines b/debian/config/defines index 412b03e2e..7ce10e813 100644 --- a/debian/config/defines +++ b/debian/config/defines @@ -1,5 +1,5 @@ [abi] -abiname: trunk +abiname: 1 [base] arches: From 9bd93b7e0145ae7c0b5ce6a2d29e8dcd778dbc89 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 24 Oct 2009 17:14:21 +0000 Subject: [PATCH 02/12] * debian/changelog: Update. * debian/config/powerpc/config: Enable BATTERY_PMU. svn path=/dists/sid/linux-2.6/; revision=14443 --- debian/changelog | 1 + debian/config/powerpc/config | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/debian/changelog b/debian/changelog index 5a155510a..ccfd3f040 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ linux-2.6 (2.6.31-1) UNRELEASED; urgency=low [ Bastian Blank ] * Set ABI to 1. + * Enable Apple PMU battery. (closes: #544264) -- Ben Hutchings Tue, 13 Oct 2009 02:18:40 +0100 diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 2721276b9..94a350010 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -647,6 +647,11 @@ CONFIG_PD6729=m CONFIG_I82092=m CONFIG_TCIC=m +## +## file: drivers/power/Kconfig +## +CONFIG_BATTERY_PMU=m + ## ## file: drivers/rtc/Kconfig ## From 79a64fdbbfebc38de6a7fbd1073359611bde6ac0 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Sat, 24 Oct 2009 17:17:55 +0000 Subject: [PATCH 03/12] debian/changelog: Prepare to release (2.6.31-1). svn path=/dists/sid/linux-2.6/; revision=14444 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccfd3f040..c09f9fff4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -linux-2.6 (2.6.31-1) UNRELEASED; urgency=low +linux-2.6 (2.6.31-1) unstable; urgency=low [ Ben Hutchings ] * Include aufs2, marked as staging (Closes: #541828) @@ -23,7 +23,7 @@ linux-2.6 (2.6.31-1) UNRELEASED; urgency=low * Set ABI to 1. * Enable Apple PMU battery. (closes: #544264) - -- Ben Hutchings Tue, 13 Oct 2009 02:18:40 +0100 + -- Bastian Blank Sat, 24 Oct 2009 19:17:30 +0200 linux-2.6 (2.6.31-1~experimental.2) experimental; urgency=low From b8107af4c8e42a132bc4e03b738d74c7ec7657f9 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 27 Oct 2009 13:19:04 +0000 Subject: [PATCH 04/12] [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). svn path=/dists/sid/linux-2.6/; revision=14467 --- debian/changelog | 7 +++++++ debian/config/armel/config.kirkwood | 5 +++++ 2 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index c09f9fff4..720f58de4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +linux-2.6 (2.6.31-2) UNRELEASED; urgency=low + + [ Martin Michlmayr ] + * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). + + -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 + linux-2.6 (2.6.31-1) unstable; urgency=low [ Ben Hutchings ] diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 20151f111..fb832df4b 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -145,6 +145,11 @@ CONFIG_BT_HCIVHCI=m ## CONFIG_CPU_IDLE=y +## +## file: drivers/crypto/Kconfig +## +CONFIG_CRYPTO_DEV_MV_CESA=m + ## ## file: drivers/dma/Kconfig ## From f74c146281e0197ac0620bd7dd17802f6c76e9a2 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Tue, 27 Oct 2009 13:21:06 +0000 Subject: [PATCH 05/12] add mips build fix svn path=/dists/sid/linux-2.6/; revision=14468 --- debian/changelog | 1 + .../bugfix/mips/fix-build-vmlinuxlds.patch | 93 +++++++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 95 insertions(+) create mode 100644 debian/patches/bugfix/mips/fix-build-vmlinuxlds.patch create mode 100644 debian/patches/series/2 diff --git a/debian/changelog b/debian/changelog index 720f58de4..81f3abc6a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Martin Michlmayr ] * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). + * mips: fix build of vmlinux.lds (Closes: #552422). -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/patches/bugfix/mips/fix-build-vmlinuxlds.patch b/debian/patches/bugfix/mips/fix-build-vmlinuxlds.patch new file mode 100644 index 000000000..16ef3456e --- /dev/null +++ b/debian/patches/bugfix/mips/fix-build-vmlinuxlds.patch @@ -0,0 +1,93 @@ +On Mon, Oct 26, 2009 at 11:03:27AM +0100, Aurelien Jarno wrote: +> Martin Michlmayr a écrit : +> > * Andreas Barth [2009-10-26 07:22]: +> >> Package: linux-2.6 +> >> Version: 2.6.31-1 +> >> Severity: serious +> > +> >> this package FTBFS on mipsel: +> >> MODPOST vmlinux.o +> >> GEN .version +> >> CHK include/linux/compile.h +> >> UPD include/linux/compile.h +> >> CC init/version.o +> >> LD init/built-in.o +> >> LD .tmp_vmlinux1 +> >> ld:arch/mips/kernel/vmlinux.lds:168: syntax error +> > +> > Aurelien, can you take a look at this? +> +> I'll try to have a look, but I don't know when. There are plenty of RC +> bugs on eglibc to fix first. + +Could it be this? I don't have hardware to test. + +commit d71789b6fa37c21ce5eb588d279f57904a62e7e2 +Author: Manuel Lauss +Date: Thu Sep 24 21:44:24 2009 +0200 + + mips: fix build of vmlinux.lds + + Commit 51b563fc93c8cb5bff1d67a0a71c374e4a4ea049 ("arm, cris, mips, + sparc, powerpc, um, xtensa: fix build with bash 4.0") removed a few + CPPFLAGS with vital include paths necessary to build vmlinux.lds + on MIPS, and moved the calculation of the 'jiffies' symbol + directly to vmlinux.lds.S but forgot to change make ifdef/... to + cpp macros. + + Signed-off-by: Manuel Lauss + [sam: moved assignment of CPPFLAGS arch/mips/kernel/Makefile] + Signed-off-by: Sam Ravnborg + Acked-by: Dmitri Vorobiev + +diff --git a/arch/mips/kernel/Makefile b/arch/mips/kernel/Makefile +index e961221..eecd2a9 100644 +--- a/arch/mips/kernel/Makefile ++++ b/arch/mips/kernel/Makefile +@@ -2,6 +2,8 @@ + # Makefile for the Linux/MIPS kernel. + # + ++CPPFLAGS_vmlinux.lds := $(KBUILD_CFLAGS) ++ + extra-y := head.o init_task.o vmlinux.lds + + obj-y += cpu-probe.o branch.o entry.o genex.o irq.o process.o \ +diff --git a/arch/mips/kernel/vmlinux.lds.S b/arch/mips/kernel/vmlinux.lds.S +index 9bf0e3d..162b299 100644 +--- a/arch/mips/kernel/vmlinux.lds.S ++++ b/arch/mips/kernel/vmlinux.lds.S +@@ -11,15 +11,15 @@ PHDRS { + note PT_NOTE FLAGS(4); /* R__ */ + } + +-ifdef CONFIG_32BIT +- ifdef CONFIG_CPU_LITTLE_ENDIAN ++#ifdef CONFIG_32BIT ++ #ifdef CONFIG_CPU_LITTLE_ENDIAN + jiffies = jiffies_64; +- else ++ #else + jiffies = jiffies_64 + 4; +- endif +-else ++ #endif ++#else + jiffies = jiffies_64; +-endif ++#endif + + SECTIONS + { + + + +-- +dann frazier + + + + +-- +To UNSUBSCRIBE, email to debian-kernel-REQUEST@lists.debian.org +with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org diff --git a/debian/patches/series/2 b/debian/patches/series/2 new file mode 100644 index 000000000..7a1c3bdb9 --- /dev/null +++ b/debian/patches/series/2 @@ -0,0 +1 @@ ++ bugfix/mips/fix-build-vmlinuxlds.patch From 1ff1787e5ac43637c0d3590b03baf3961ef4fff4 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 30 Oct 2009 10:18:40 +0000 Subject: [PATCH 06/12] [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG svn path=/dists/sid/linux-2.6/; revision=14518 --- debian/changelog | 2 ++ debian/config/armel/config.kirkwood | 2 +- debian/config/armel/config.orion5x | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 81f3abc6a..06fdfe05c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Martin Michlmayr ] * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). + * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the + name of the config variable changed). * mips: fix build of vmlinux.lds (Closes: #552422). -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index fb832df4b..6e73f6753 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -626,5 +626,5 @@ CONFIG_X25=m ## # CONFIG_ARCH_IMX is not set CONFIG_MACH_OPENRD_CLIENT=y -CONFIG_ORION5X_WATCHDOG=m +CONFIG_ORION_WATCHDOG=m diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 8dabcf911..402a3e7f0 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -612,5 +612,5 @@ CONFIG_X25=m # CONFIG_ARCH_CO285 is not set # CONFIG_ARCH_IMX is not set # CONFIG_ARCH_MSM7X00A is not set -CONFIG_ORION5X_WATCHDOG=m +CONFIG_ORION_WATCHDOG=m From 93d85d700e030586af81caf4ed277bf7dd73c9ac Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 30 Oct 2009 10:37:33 +0000 Subject: [PATCH 07/12] Add OpenRD-Client support again. svn path=/dists/sid/linux-2.6/; revision=14520 --- debian/changelog | 1 + .../patches/features/arm/openrd-client.patch | 141 ++++++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 143 insertions(+) create mode 100644 debian/patches/features/arm/openrd-client.patch diff --git a/debian/changelog b/debian/changelog index 06fdfe05c..2ae3b5614 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,7 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the name of the config variable changed). + * Add OpenRD-Client support again. * mips: fix build of vmlinux.lds (Closes: #552422). -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/patches/features/arm/openrd-client.patch b/debian/patches/features/arm/openrd-client.patch new file mode 100644 index 000000000..61627f1f3 --- /dev/null +++ b/debian/patches/features/arm/openrd-client.patch @@ -0,0 +1,141 @@ +--- a/arch/arm/mach-kirkwood/Kconfig 2009-09-25 19:49:01.000000000 +0000 ++++ b/arch/arm/mach-kirkwood/Kconfig 2009-09-25 19:50:08.000000000 +0000 +@@ -44,6 +44,12 @@ + Say 'Y' here if you want your kernel to support the + Marvell OpenRD Base Board. + ++config MACH_OPENRD_CLIENT ++ bool "Marvell OpenRD Client Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell OpenRD Client Board. ++ + endmenu + + endif +--- a/arch/arm/mach-kirkwood/Makefile 2009-09-25 19:49:07.000000000 +0000 ++++ b/arch/arm/mach-kirkwood/Makefile 2009-09-25 19:49:29.000000000 +0000 +@@ -7,5 +7,6 @@ + obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o + obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o ++obj-$(CONFIG_MACH_OPENRD_CLIENT) += openrd_client-setup.o + + obj-$(CONFIG_CPU_IDLE) += cpuidle.o +--- /dev/null 2008-06-15 07:07:41.000000000 +0000 ++++ b/arch/arm/mach-kirkwood/openrd_client-setup.c 2009-09-25 19:52:36.000000000 +0000 +@@ -0,0 +1,107 @@ ++/* ++ * arch/arm/mach-kirkwood/openrd_client-setup.c ++ * ++ * Marvell OpenRD Base Client Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition openrd_client_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data openrd_client_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(8), ++}; ++ ++static struct mv643xx_eth_platform_data openrd_client_ge01_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(24), ++}; ++ ++static struct mv_sata_platform_data openrd_client_sata_data = { ++ .n_ports = 2, ++}; ++ ++static struct mvsdio_platform_data openrd_client_mvsdio_data = { ++ .gpio_card_detect = 29, /* MPP29 used as SD card detect */ ++}; ++ ++static unsigned int openrd_client_mpp_config[] __initdata = { ++ MPP29_GPIO, ++ 0 ++}; ++ ++static void __init openrd_client_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(openrd_client_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_uart1_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(openrd_client_nand_parts), 25); ++ ++ kirkwood_ehci_init(); ++ ++ /* initialize gbe0 and gbe1 */ ++ kirkwood_ge00_init(&openrd_client_ge00_data); ++ kirkwood_ge01_init(&openrd_client_ge01_data); ++ ++ kirkwood_sata_init(&openrd_client_sata_data); ++ kirkwood_sdio_init(&openrd_client_mvsdio_data); ++ ++ kirkwood_i2c_init(); ++} ++ ++static int __init openrd_client_pci_init(void) ++{ ++if (machine_is_openrd_client()) ++ kirkwood_pcie_init(); ++ ++ return 0; ++} ++subsys_initcall(openrd_client_pci_init); ++ ++ ++ ++ ++MACHINE_START(OPENRD_CLIENT, "Marvell OpenRD Client Board") ++ /* Maintainer: Dhaval Vasa */ ++ .phys_io = KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, ++ .boot_params = 0x00000100, ++ .init_machine = openrd_client_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = &kirkwood_timer, ++MACHINE_END +--- a/arch/arm/tools/mach-types~ 2009-10-30 10:33:43.000000000 +0000 ++++ b/arch/arm/tools/mach-types 2009-10-30 10:33:46.000000000 +0000 +@@ -2281,3 +2281,4 @@ + matrix504 MACH_MATRIX504 MATRIX504 2294 + mrfsa MACH_MRFSA MRFSA 2295 + openrd_base MACH_OPENRD_BASE OPENRD_BASE 2325 ++openrd_client MACH_OPENRD_CLIENT OPENRD_CLIENT 2361 diff --git a/debian/patches/series/2 b/debian/patches/series/2 index 7a1c3bdb9..cd4b192f2 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1 +1,2 @@ + bugfix/mips/fix-build-vmlinuxlds.patch ++ features/arm/openrd-client.patch From 5d798cb23c81ebb20370398e5a3d283488f82a58 Mon Sep 17 00:00:00 2001 From: Martin Michlmayr Date: Fri, 30 Oct 2009 12:10:01 +0000 Subject: [PATCH 08/12] [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled, otherwise the kernel won't boot. svn path=/dists/sid/linux-2.6/; revision=14522 --- debian/changelog | 2 ++ debian/config/armel/config.kirkwood | 5 +++++ debian/config/armel/config.orion5x | 5 +++++ 3 files changed, 12 insertions(+) diff --git a/debian/changelog b/debian/changelog index 2ae3b5614..f016d8654 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,8 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Martin Michlmayr ] + * [armel/orion5x, armel/kirkwood] Make sure VGA_CONSOLE is disabled, + otherwise the kernel won't boot. * [armel/kirkwood] Enable CRYPTO_DEV_MV_CESA (Closes: #552270). * [armel/kirkwood, armel/orion5x] Enable ORION_WATCHDOG (the name of the config variable changed). diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 6e73f6753..ebf6576b1 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -531,6 +531,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y ## CONFIG_FB=m +## +## file: drivers/video/console/Kconfig +## +# CONFIG_VGA_CONSOLE is not set + ## ## file: drivers/watchdog/Kconfig ## diff --git a/debian/config/armel/config.orion5x b/debian/config/armel/config.orion5x index 402a3e7f0..4dc6ebde5 100644 --- a/debian/config/armel/config.orion5x +++ b/debian/config/armel/config.orion5x @@ -511,6 +511,11 @@ CONFIG_USB_STORAGE_JUMPSHOT=y ## CONFIG_FB=m +## +## file: drivers/video/console/Kconfig +## +# CONFIG_VGA_CONSOLE is not set + ## ## file: drivers/watchdog/Kconfig ## From 0ada151cfa7baf3458bdd7fca49bf7deeb5b46dc Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sun, 1 Nov 2009 00:59:02 +0000 Subject: [PATCH 09/12] postinst: Accept absolute paths in modules.dep generated by the lenny version of module-init-tools (Closes: #552610) svn path=/dists/sid/linux-2.6/; revision=14531 --- debian/changelog | 4 ++++ debian/templates/temp.image.plain/postinst | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index f016d8654..244243b3b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,10 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low name of the config variable changed). * Add OpenRD-Client support again. * mips: fix build of vmlinux.lds (Closes: #552422). + + [ Ben Hutchings ] + * postinst: Accept absolute paths in modules.dep generated by the + lenny version of module-init-tools (Closes: #552610) -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/templates/temp.image.plain/postinst b/debian/templates/temp.image.plain/postinst index 5e827de4e..d06e08908 100755 --- a/debian/templates/temp.image.plain/postinst +++ b/debian/templates/temp.image.plain/postinst @@ -806,8 +806,10 @@ if ( -d "$modules_base/$version" ) { my $module_path = $module_paths{$module}; if (defined($module_path)) { my $first = 1; - open(MODINFO, - "modinfo -F firmware '$modules_base/$version/$module_path' |"); + if ($module_path !~ m|^/|) { + $module_path = "$modules_base/$version/$module_path"; + } + open(MODINFO, "modinfo -F firmware '$module_path' |"); while () { chomp; my $firmware = $_; From 19ac3d26c10db9ea13c40f752032ef053922df66 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 3 Nov 2009 02:16:20 +0000 Subject: [PATCH 10/12] [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124). Logged under Bastian's name since the patch is from him. svn path=/dists/sid/linux-2.6/; revision=14534 --- debian/changelog | 3 ++ ...ve-SMP-warning-from-PowerMac-cpufreq.patch | 50 +++++++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 54 insertions(+) create mode 100644 debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch diff --git a/debian/changelog b/debian/changelog index 244243b3b..9a13b13d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,9 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Ben Hutchings ] * postinst: Accept absolute paths in modules.dep generated by the lenny version of module-init-tools (Closes: #552610) + + [ Bastian Blank ] + * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124) -- Martin Michlmayr Tue, 27 Oct 2009 21:18:29 +0800 diff --git a/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch b/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch new file mode 100644 index 000000000..78a23d45e --- /dev/null +++ b/debian/patches/bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch @@ -0,0 +1,50 @@ +From 6fdc31a2b86cf1f98e3eed896578ad9659eeb0f8 Mon Sep 17 00:00:00 2001 +From: Bastian Blank +Date: Wed, 12 Aug 2009 23:30:45 +0000 +Subject: [PATCH] powerpc: Remove SMP warning from PowerMac cpufreq + +On Thu, Aug 13, 2009 at 04:14:58PM +1000, Benjamin Herrenschmidt wrote: +> On Tue, 2009-08-11 at 11:39 +0200, Bastian Blank wrote: +> > This patch just disables this driver on SMP kernels, as it is obviously +> > not supported. +> Why not remove the #error instead ? :-) I don't think it's still +> meaningful, especially since we use the timebase for delays nowadays +> which doesn't depend on the CPU frequency... + +Your call. Take this one: + +The build of a PowerMac 32bit kernel currently fails with + +error: #warning "WARNING, CPUFREQ not recommended on SMP kernels" + +Thie patch removes the not longer applicable SMP warning from the +PowerMac cpufreq code. + +Signed-off-by: Bastian Blank +Signed-off-by: Benjamin Herrenschmidt +--- + arch/powerpc/platforms/powermac/cpufreq_32.c | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/arch/powerpc/platforms/powermac/cpufreq_32.c b/arch/powerpc/platforms/powermac/cpufreq_32.c +index 65c585b..08d94e4 100644 +--- a/arch/powerpc/platforms/powermac/cpufreq_32.c ++++ b/arch/powerpc/platforms/powermac/cpufreq_32.c +@@ -44,14 +44,6 @@ + */ + #undef DEBUG_FREQ + +-/* +- * There is a problem with the core cpufreq code on SMP kernels, +- * it won't recalculate the Bogomips properly +- */ +-#ifdef CONFIG_SMP +-#warning "WARNING, CPUFREQ not recommended on SMP kernels" +-#endif +- + extern void low_choose_7447a_dfs(int dfs); + extern void low_choose_750fx_pll(int pll); + extern void low_sleep_handler(void); +-- +1.6.5.2 + diff --git a/debian/patches/series/2 b/debian/patches/series/2 index cd4b192f2..3171a43a4 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1,2 +1,3 @@ + bugfix/mips/fix-build-vmlinuxlds.patch + features/arm/openrd-client.patch ++ bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch From 4b18a525445cedca1e6335d992b7bb9484409d90 Mon Sep 17 00:00:00 2001 From: Bastian Blank Date: Tue, 3 Nov 2009 23:34:39 +0000 Subject: [PATCH 11/12] debian/templates/image.plain.bug/include-1tainted: Fix missing newline on output. svn path=/dists/sid/linux-2.6/; revision=14535 --- debian/templates/image.plain.bug/include-1tainted | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/templates/image.plain.bug/include-1tainted b/debian/templates/image.plain.bug/include-1tainted index 8ee2f2ddd..e616acfbc 100644 --- a/debian/templates/image.plain.bug/include-1tainted +++ b/debian/templates/image.plain.bug/include-1tainted @@ -36,8 +36,8 @@ add_1tainted() { printf "$result_long" >&3 else echo '** Not tainted' >&3 - echo >&3 fi + echo >&3 } ask_1tainted() { From aac015e39f5d35e9a9d905f93935274c77e5fff2 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Thu, 5 Nov 2009 01:03:16 +0000 Subject: [PATCH 12/12] aufs2: Remove incorrect static assertion (Closes: #554120) svn path=/dists/sid/linux-2.6/; revision=14559 --- debian/changelog | 1 + .../aufs2-remove-incorrect-static-assertion.patch | 15 +++++++++++++++ debian/patches/series/2 | 1 + 3 files changed, 17 insertions(+) create mode 100644 debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch diff --git a/debian/changelog b/debian/changelog index 9a13b13d0..966674684 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ linux-2.6 (2.6.31-2) UNRELEASED; urgency=low [ Ben Hutchings ] * postinst: Accept absolute paths in modules.dep generated by the lenny version of module-init-tools (Closes: #552610) + * aufs2: Remove incorrect static assertion (Closes: #554120) [ Bastian Blank ] * [powerpc] Remove SMP warning from PowerMac cpufreq (Closes: #554124) diff --git a/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch b/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch new file mode 100644 index 000000000..06a9d0e94 --- /dev/null +++ b/debian/patches/bugfix/all/aufs2-remove-incorrect-static-assertion.patch @@ -0,0 +1,15 @@ +From: Ben Hutchings +Subject: [PATCH] aufs2: Remove incorrect static assertion + +This should allow aufs2 to build on alpha. + +--- a/fs/aufs/vdir.c ++++ b/fs/aufs/vdir.c +@@ -25,7 +25,6 @@ + + static unsigned int calc_size(int nlen) + { +- BUILD_BUG_ON(sizeof(ino_t) != sizeof(long)); + return ALIGN(sizeof(struct au_vdir_de) + nlen, sizeof(ino_t)); + } + diff --git a/debian/patches/series/2 b/debian/patches/series/2 index 3171a43a4..371bfafa6 100644 --- a/debian/patches/series/2 +++ b/debian/patches/series/2 @@ -1,3 +1,4 @@ + bugfix/mips/fix-build-vmlinuxlds.patch + features/arm/openrd-client.patch + bugfix/powerpc/Remove-SMP-warning-from-PowerMac-cpufreq.patch ++ bugfix/all/aufs2-remove-incorrect-static-assertion.patch