diff options
Diffstat (limited to 'debian/patches/debian')
| -rw-r--r-- | debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha.patch | 68 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/files-1 | 5 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/firmware-cleanup.patch | 10 | ||||
| -rw-r--r-- | debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch | 68 | ||||
| -rw-r--r-- | debian/patches/debian/kernelvariables.patch | 2 | ||||
| -rw-r--r-- | debian/patches/debian/sysrq-mask.patch | 18 |
6 files changed, 16 insertions, 155 deletions
diff --git a/debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha.patch b/debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha.patch deleted file mode 100644 index f74dc73f9..000000000 --- a/debian/patches/debian/alpha-Do-not-use-Werror-for-arch-alpha.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 42663d4b49617c17c75c347b6927630cfd5a715e Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Fri, 10 Dec 2010 02:34:49 +0000 -Subject: [PATCH 2/4] alpha: Do not use -Werror for arch/alpha - -The alpha headers for I/O currently have illegal combinations of -extern inline and static inline functions calling each other. Make -the warnings non-fatal for now. - -Signed-off-by: Ben Hutchings <ben@decadent.org.uk> ---- - arch/alpha/kernel/Makefile | 2 +- - arch/alpha/lib/Makefile | 1 - - arch/alpha/mm/Makefile | 2 -- - arch/alpha/oprofile/Makefile | 2 +- - 4 files changed, 2 insertions(+), 5 deletions(-) - -diff --git a/arch/alpha/kernel/Makefile b/arch/alpha/kernel/Makefile -index 1ee9b5b..1c77b1c 100644 ---- a/arch/alpha/kernel/Makefile -+++ b/arch/alpha/kernel/Makefile -@@ -4,7 +4,7 @@ - - extra-y := head.o vmlinux.lds - EXTRA_AFLAGS := $(KBUILD_CFLAGS) --EXTRA_CFLAGS := -Werror -Wno-sign-compare -+EXTRA_CFLAGS := -Wno-sign-compare - - obj-y := entry.o traps.o process.o init_task.o osf_sys.o irq.o \ - irq_alpha.o signal.o setup.o ptrace.o time.o \ -diff --git a/arch/alpha/lib/Makefile b/arch/alpha/lib/Makefile -index 9b72c59..a2723cb 100644 ---- a/arch/alpha/lib/Makefile -+++ b/arch/alpha/lib/Makefile -@@ -3,7 +3,6 @@ - # - - EXTRA_AFLAGS := $(KBUILD_CFLAGS) --EXTRA_CFLAGS := -Werror - - # Many of these routines have implementations tuned for ev6. - # Choose them iff we're targeting ev6 specifically. -diff --git a/arch/alpha/mm/Makefile b/arch/alpha/mm/Makefile -index 09399c5..ec693be 100644 ---- a/arch/alpha/mm/Makefile -+++ b/arch/alpha/mm/Makefile -@@ -2,8 +2,6 @@ - # Makefile for the linux alpha-specific parts of the memory manager. - # - --EXTRA_CFLAGS := -Werror -- - obj-y := init.o fault.o extable.o - - obj-$(CONFIG_DISCONTIGMEM) += numa.o -diff --git a/arch/alpha/oprofile/Makefile b/arch/alpha/oprofile/Makefile -index 4aa5624..74cb06e 100644 ---- a/arch/alpha/oprofile/Makefile -+++ b/arch/alpha/oprofile/Makefile -@@ -1,4 +1,4 @@ --EXTRA_CFLAGS := -Werror -Wno-sign-compare -+EXTRA_CFLAGS := -Wno-sign-compare - - obj-$(CONFIG_OPROFILE) += oprofile.o - --- -1.7.2.3 - diff --git a/debian/patches/debian/dfsg/files-1 b/debian/patches/debian/dfsg/files-1 index f5791f402..bb2e4d208 100644 --- a/debian/patches/debian/dfsg/files-1 +++ b/debian/patches/debian/dfsg/files-1 @@ -43,10 +43,7 @@ rm drivers/net/appletalk/cops.h rm drivers/net/appletalk/cops_ffdrv.h rm drivers/net/appletalk/cops_ltdrv.h -unifdef drivers/net/r8169.c -UREMOVE_DFSG - -# For next version -#rm drivers/staging/ft1000/ft1000-pcmcia/boot.h +rm drivers/staging/ft1000/ft1000-pcmcia/boot.h rm drivers/staging/keucr/init.h diff --git a/debian/patches/debian/dfsg/firmware-cleanup.patch b/debian/patches/debian/dfsg/firmware-cleanup.patch index 75c4231a0..7e4e8c67f 100644 --- a/debian/patches/debian/dfsg/firmware-cleanup.patch +++ b/debian/patches/debian/dfsg/firmware-cleanup.patch @@ -18,13 +18,13 @@ index 1c00d05..3bf888d 100644 - adaptec/starfire_tx.bin fw-shipped-$(CONFIG_ATARI_DSP56K) += dsp56k/bootstrap.bin -fw-shipped-$(CONFIG_ATM_AMBASSADOR) += atmsar11.fw --fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.0.34.0.fw \ -- bnx2x/bnx2x-e1h-6.0.34.0.fw \ -- bnx2x/bnx2x-e2-6.0.34.0.fw --fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.0.17.fw \ +-fw-shipped-$(CONFIG_BNX2X) += bnx2x/bnx2x-e1-6.2.5.0.fw \ +- bnx2x/bnx2x-e1h-6.2.5.0.fw \ +- bnx2x/bnx2x-e2-6.2.5.0.fw +-fw-shipped-$(CONFIG_BNX2) += bnx2/bnx2-mips-09-6.2.1.fw \ - bnx2/bnx2-rv2p-09-6.0.17.fw \ - bnx2/bnx2-rv2p-09ax-6.0.17.fw \ -- bnx2/bnx2-mips-06-6.0.15.fw \ +- bnx2/bnx2-mips-06-6.2.1.fw \ - bnx2/bnx2-rv2p-06-6.0.15.fw -fw-shipped-$(CONFIG_CASSINI) += sun/cassini.bin -fw-shipped-$(CONFIG_COMPUTONE) += intelliport2.bin diff --git a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch b/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch deleted file mode 100644 index db3856328..000000000 --- a/debian/patches/debian/dfsg/r8169-rtl8168d-1-2-disable.patch +++ /dev/null @@ -1,68 +0,0 @@ -From 8ee9e3b6b1f41934a67567aaefae986ff517587e Mon Sep 17 00:00:00 2001 -From: Ben Hutchings <ben@decadent.org.uk> -Date: Tue, 3 Nov 2009 23:58:25 +0000 -Subject: [PATCH 21/24] r8169: mark firmware for removal and mark code using it as broken - ---- - drivers/net/r8169.c | 8 ++++++++ - 1 files changed, 8 insertions(+), 0 deletions(-) - -diff --git a/drivers/net/r8169.c b/drivers/net/r8169.c -index fa49356..3495ff6 100644 ---- a/drivers/net/r8169.c -+++ b/drivers/net/r8169.c -@@ -1719,6 +1719,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr) - { 0x05, 0x8332 }, - { 0x06, 0x5561 } - }; -+#ifdef REMOVE_DFSG - static const struct phy_reg phy_reg_init_2[] = { - { 0x1f, 0x0005 }, - { 0x05, 0xffc2 }, -@@ -2074,6 +2075,7 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr) - { 0x0d, 0xf880 }, - { 0x1f, 0x0000 } - }; -+#endif - - rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0)); - -@@ -2131,7 +2133,9 @@ static void rtl8168d_1_hw_phy_config(void __iomem *ioaddr) - mdio_plus_minus(ioaddr, 0x02, 0x0100, 0x0600); - mdio_plus_minus(ioaddr, 0x03, 0x0000, 0xe000); - -+#ifdef CONFIG_BROKEN - rtl_phy_write(ioaddr, phy_reg_init_2, ARRAY_SIZE(phy_reg_init_2)); -+#endif - } - - static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr) -@@ -2161,6 +2165,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr) - { 0x05, 0x8332 }, - { 0x06, 0x5561 } - }; -+#ifdef REMOVE_DFSG - static const struct phy_reg phy_reg_init_1[] = { - { 0x1f, 0x0005 }, - { 0x05, 0xffc2 }, -@@ -2473,6 +2478,7 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr) - { 0x0d, 0xf880 }, - { 0x1f, 0x0000 } - }; -+#endif - - rtl_phy_write(ioaddr, phy_reg_init_0, ARRAY_SIZE(phy_reg_init_0)); - -@@ -2526,7 +2532,9 @@ static void rtl8168d_2_hw_phy_config(void __iomem *ioaddr) - mdio_write(ioaddr, 0x1f, 0x0002); - mdio_patch(ioaddr, 0x0f, 0x0017); - -+#ifdef CONFIG_BROKEN - rtl_phy_write(ioaddr, phy_reg_init_1, ARRAY_SIZE(phy_reg_init_1)); -+#endif - } - - static void rtl8168d_3_hw_phy_config(void __iomem *ioaddr) --- -1.6.5.2 - diff --git a/debian/patches/debian/kernelvariables.patch b/debian/patches/debian/kernelvariables.patch index 4083d8f24..df55d8178 100644 --- a/debian/patches/debian/kernelvariables.patch +++ b/debian/patches/debian/kernelvariables.patch @@ -37,8 +37,8 @@ -endif - KCONFIG_CONFIG ?= .config + export KCONFIG_CONFIG - # SHELL used by kbuild @@ -340,6 +311,36 @@ LDFLAGS_MODULE = AFLAGS_KERNEL = CFLAGS_GCOV = -fprofile-arcs -ftest-coverage diff --git a/debian/patches/debian/sysrq-mask.patch b/debian/patches/debian/sysrq-mask.patch index fc5e3bd48..234caa75c 100644 --- a/debian/patches/debian/sysrq-mask.patch +++ b/debian/patches/debian/sysrq-mask.patch @@ -1,14 +1,14 @@ ---- a/drivers/tty/sysrq.c -+++ b/drivers/tty/sysrq.c -@@ -43,7 +43,7 @@ - #include <asm/irq_regs.h> +--- a/include/linux/sysrq.h ++++ b/include/linux/sysrq.h +@@ -18,7 +18,7 @@ + #include <linux/types.h> - /* Whether we react on sysrq keys or just ignore them */ --static int __read_mostly sysrq_enabled = 1; -+static int __read_mostly sysrq_enabled = CONFIG_MAGIC_SYSRQ_DEFAULT_MASK; - static bool __read_mostly sysrq_always_enabled; + /* Enable/disable SYSRQ support by default (0==no, 1==yes). */ +-#define SYSRQ_DEFAULT_ENABLE 1 ++#define SYSRQ_DEFAULT_ENABLE CONFIG_MAGIC_SYSRQ_DEFAULT_MASK - static bool sysrq_on(void) + /* Possible values of bitmask for enabling sysrq functions */ + /* 0x0001 is reserved for enable everything */ diff --git a/lib/Kconfig.debug b/lib/Kconfig.debug index 234ceb1..415a834 100644 --- a/lib/Kconfig.debug |