Home Home > GIT Browse

Tools

Branches

openSUSE

Upstream

SLE

SLE AddOns

Other

summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Marek <mmarek@suse.cz>2013-05-07 10:14:56 +0200
committerMichal Marek <mmarek@suse.cz>2013-05-07 10:14:56 +0200
commitd6e99fd50706d06fa96319e528b75295dacbfb4c (patch)
treecd627d2111d6870265f888baa8c117a7c7fa42a7
parent6fc0bd5c1cf540e8662c266433ab651f040b9584 (diff)
parent5e6ccae479c68983b9fa8c1f46c43fc9bb5d65c2 (diff)
Merge branch 'master' of kerncvs.suse.de:/home/git/kernel-sourcerpm-3.9.0-1--openSUSE-13.1-Milestone1rpm-3.9.0-1
Diffstat
-rw-r--r--config.conf20
-rw-r--r--config/armv5tel/versatile2
-rw-r--r--config/armv7hl/cubox2
-rw-r--r--config/armv7hl/default2
-rw-r--r--config/armv7hl/exynos2
-rw-r--r--config/armv7hl/lpae2
-rw-r--r--config/i386/default2
-rw-r--r--config/i386/desktop2
-rw-r--r--config/i386/ec22
-rw-r--r--config/i386/pae2
-rw-r--r--config/i386/trace2
-rw-r--r--config/i386/vanilla2
-rw-r--r--config/i386/xen2
-rw-r--r--config/s390/s39024
-rw-r--r--config/s390/trace24
-rw-r--r--config/s390/vanilla24
-rw-r--r--config/x86_64/default2
-rw-r--r--config/x86_64/desktop2
-rw-r--r--config/x86_64/ec22
-rw-r--r--config/x86_64/trace2
-rw-r--r--config/x86_64/vanilla2
-rw-r--r--config/x86_64/xen2
-rw-r--r--doc/config-options.changes10
-rw-r--r--patches.suse/ida-remove-warning-dump-stack.patch27
-rw-r--r--series.conf1
25 files changed, 69 insertions, 97 deletions
diff --git a/config.conf b/config.conf
index 78412093f0..238fcb2a31 100644
--- a/config.conf
+++ b/config.conf
@@ -17,10 +17,10 @@
+i386 i386/vanilla
+i386 -syms i386/trace
-+ia64 ia64/default
-+ia64 -syms ia64/debug
-+ia64 ia64/vanilla
-+ia64 -syms ia64/trace
+#+ia64 ia64/default
+#+ia64 -syms ia64/debug
+#+ia64 ia64/vanilla
+#+ia64 -syms ia64/trace
+x86_64 x86_64/default
+x86_64 x86_64/desktop
@@ -45,12 +45,12 @@
+armv7hl armv7hl/exynos
+arm64 arm64/default
-+s390 s390/s390
-+s390 -syms s390/trace
-+s390 s390/vanilla
-+s390x s390x/default
-+s390x -syms s390x/trace
-+s390x s390x/vanilla
+#+s390 s390/s390
+#+s390 -syms s390/trace
+#+s390 s390/vanilla
+#+s390x s390x/default
+#+s390x -syms s390x/trace
+#+s390x s390x/vanilla
# Maintained by jengelh
# +sparc64 sparc64/default
diff --git a/config/armv5tel/versatile b/config/armv5tel/versatile
index 9cfd31b829..288d60d665 100644
--- a/config/armv5tel/versatile
+++ b/config/armv5tel/versatile
@@ -410,7 +410,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
#
# Boot options
diff --git a/config/armv7hl/cubox b/config/armv7hl/cubox
index 106a25cf43..010865ca46 100644
--- a/config/armv7hl/cubox
+++ b/config/armv7hl/cubox
@@ -432,7 +432,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_PARAVIRT_XEN is not set
#
diff --git a/config/armv7hl/default b/config/armv7hl/default
index 61d683125e..a1a9fe9c00 100644
--- a/config/armv7hl/default
+++ b/config/armv7hl/default
@@ -597,7 +597,7 @@ CONFIG_FORCE_MAX_ZONEORDER=12
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
CONFIG_XEN_DOM0=y
CONFIG_PARAVIRT_XEN=y
diff --git a/config/armv7hl/exynos b/config/armv7hl/exynos
index c58415b10c..e32d477e45 100644
--- a/config/armv7hl/exynos
+++ b/config/armv7hl/exynos
@@ -570,7 +570,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
# CONFIG_UACCESS_WITH_MEMCPY is not set
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_PARAVIRT_XEN is not set
#
diff --git a/config/armv7hl/lpae b/config/armv7hl/lpae
index 8ce1df75ea..a49363bc61 100644
--- a/config/armv7hl/lpae
+++ b/config/armv7hl/lpae
@@ -534,7 +534,7 @@ CONFIG_FORCE_MAX_ZONEORDER=11
CONFIG_ALIGNMENT_TRAP=y
CONFIG_UACCESS_WITH_MEMCPY=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
CONFIG_XEN_DOM0=y
CONFIG_PARAVIRT_XEN=y
diff --git a/config/i386/default b/config/i386/default
index 44773a9400..a1f345d2e8 100644
--- a/config/i386/default
+++ b/config/i386/default
@@ -484,7 +484,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/i386/desktop b/config/i386/desktop
index 4a0f700bbe..d94e2b9df8 100644
--- a/config/i386/desktop
+++ b/config/i386/desktop
@@ -501,7 +501,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
diff --git a/config/i386/ec2 b/config/i386/ec2
index d164a40ae0..cef5055992 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -372,7 +372,7 @@ CONFIG_FRONTSWAP=y
# CONFIG_HIGHPTE is not set
CONFIG_ARCH_RANDOM=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/i386/pae b/config/i386/pae
index e9fb66dffc..79c1ff430f 100644
--- a/config/i386/pae
+++ b/config/i386/pae
@@ -502,7 +502,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/i386/trace b/config/i386/trace
index e440f9191e..fe2450f2c1 100644
--- a/config/i386/trace
+++ b/config/i386/trace
@@ -503,7 +503,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/i386/vanilla b/config/i386/vanilla
index 3a7d0464f3..6002780ddd 100644
--- a/config/i386/vanilla
+++ b/config/i386/vanilla
@@ -483,7 +483,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/i386/xen b/config/i386/xen
index e7ebbcdaf7..52f1655950 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -410,7 +410,7 @@ CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/s390/s390 b/config/s390/s390
index 65b5578037..7f657fb5e5 100644
--- a/config/s390/s390
+++ b/config/s390/s390
@@ -1139,29 +1139,7 @@ CONFIG_NET_VENDOR_MARVELL=y
# CONFIG_MVMDIO is not set
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_8390=y
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
+# CONFIG_PHYLIB is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
diff --git a/config/s390/trace b/config/s390/trace
index a45bded6c5..4f4ee43ccc 100644
--- a/config/s390/trace
+++ b/config/s390/trace
@@ -1139,29 +1139,7 @@ CONFIG_NET_VENDOR_MARVELL=y
# CONFIG_MVMDIO is not set
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_8390=y
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
+# CONFIG_PHYLIB is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
diff --git a/config/s390/vanilla b/config/s390/vanilla
index 8823001f6f..2e469b843e 100644
--- a/config/s390/vanilla
+++ b/config/s390/vanilla
@@ -1133,29 +1133,7 @@ CONFIG_NET_VENDOR_MARVELL=y
# CONFIG_MVMDIO is not set
CONFIG_NET_VENDOR_NATSEMI=y
CONFIG_NET_VENDOR_8390=y
-CONFIG_PHYLIB=m
-
-#
-# MII PHY device drivers
-#
-CONFIG_AT803X_PHY=m
-CONFIG_AMD_PHY=m
-CONFIG_MARVELL_PHY=m
-CONFIG_DAVICOM_PHY=m
-CONFIG_QSEMI_PHY=m
-CONFIG_LXT_PHY=m
-CONFIG_CICADA_PHY=m
-CONFIG_VITESSE_PHY=m
-CONFIG_SMSC_PHY=m
-CONFIG_BROADCOM_PHY=m
-CONFIG_BCM87XX_PHY=m
-CONFIG_ICPLUS_PHY=m
-CONFIG_REALTEK_PHY=m
-CONFIG_NATIONAL_PHY=m
-CONFIG_STE10XP=m
-CONFIG_LSI_ET1011C_PHY=m
-CONFIG_MICREL_PHY=m
-CONFIG_MDIO_BITBANG=m
+# CONFIG_PHYLIB is not set
# CONFIG_PPP is not set
# CONFIG_SLIP is not set
diff --git a/config/x86_64/default b/config/x86_64/default
index 5616465c05..f91a2efa62 100644
--- a/config/x86_64/default
+++ b/config/x86_64/default
@@ -474,7 +474,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/x86_64/desktop b/config/x86_64/desktop
index 40617d784f..17b292c174 100644
--- a/config/x86_64/desktop
+++ b/config/x86_64/desktop
@@ -473,7 +473,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
# CONFIG_HZ_250 is not set
# CONFIG_HZ_300 is not set
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 62f314758b..2f62b3fc2e 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -355,7 +355,7 @@ CONFIG_CLEANCACHE=y
CONFIG_FRONTSWAP=y
CONFIG_ARCH_RANDOM=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/x86_64/trace b/config/x86_64/trace
index 7b3431e222..47500ac562 100644
--- a/config/x86_64/trace
+++ b/config/x86_64/trace
@@ -475,7 +475,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/x86_64/vanilla b/config/x86_64/vanilla
index 1910d027b5..127533055a 100644
--- a/config/x86_64/vanilla
+++ b/config/x86_64/vanilla
@@ -473,7 +473,7 @@ CONFIG_X86_SMAP=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 144a7d22f0..72fd573227 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -392,7 +392,7 @@ CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_EFI_STUB=y
CONFIG_SECCOMP=y
-# CONFIG_CC_STACKPROTECTOR is not set
+CONFIG_CC_STACKPROTECTOR=y
# CONFIG_HZ_100 is not set
CONFIG_HZ_250=y
# CONFIG_HZ_300 is not set
diff --git a/doc/config-options.changes b/doc/config-options.changes
index 5026e4ee4e..f74b263c5a 100644
--- a/doc/config-options.changes
+++ b/doc/config-options.changes
@@ -1,4 +1,14 @@
-------------------------------------------------------------------
+Sun May 5 09:53:46 CEST 2013 - jdelvare@suse.de
+
+- All other major Linux distributions are building their kernel
+ with -fstack-protector, so do the same. See the discussion at:
+ http://lists.opensuse.org/opensuse-kernel/2012-06/msg00088.html
+ http://lists.opensuse.org/opensuse-kernel/2012-07/msg00000.html
+ http://lists.opensuse.org/opensuse-kernel/2013-05/msg00013.html
+ - CONFIG_CC_STACKPROTECTOR=y
+
+-------------------------------------------------------------------
Fri Apr 5 13:50:12 CEST 2013 - jdelvare@suse.de
- All kernels which include core (MFD) support for the ViperBoard
diff --git a/patches.suse/ida-remove-warning-dump-stack.patch b/patches.suse/ida-remove-warning-dump-stack.patch
new file mode 100644
index 0000000000..f0317a44c5
--- /dev/null
+++ b/patches.suse/ida-remove-warning-dump-stack.patch
@@ -0,0 +1,27 @@
+From: Jean Delvare <jdelvare@suse.de>
+Subject: idr: Print a stack dump after ida_remove warning
+Patch-mainline: submitted 2013-04-05, http://marc.info/?l=linux-kernel&m=136774642223606&w=2
+References: http://lists.opensuse.org/opensuse-kernel/2013-04/msg00102.html
+
+We print a stack dump after idr_remove warning. This is useful to find
+the faulty piece of code. Let's do the same for ida_remove, as it
+would be equally useful there.
+
+Signed-off-by: Jean Delvare <jdelvare@suse.de>
+Cc: Tejun Heo <tj@kernel.org>
+Cc: Andrew Morton <akpm@linux-foundation.org>
+Cc: Takashi Iwai <tiwai@suse.de>
+---
+ lib/idr.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/lib/idr.c
++++ b/lib/idr.c
+@@ -1039,6 +1039,7 @@ void ida_remove(struct ida *ida, int id)
+ err:
+ printk(KERN_WARNING
+ "ida_remove called for id=%d which is not allocated.\n", id);
++ dump_stack();
+ }
+ EXPORT_SYMBOL(ida_remove);
+
diff --git a/series.conf b/series.conf
index 890ae7b578..c46335334f 100644
--- a/series.conf
+++ b/series.conf
@@ -196,6 +196,7 @@
########################################################
patches.suse/connector-read-mostly
patches.suse/kbd-ignore-gfx.patch
+ patches.suse/ida-remove-warning-dump-stack.patch
########################################################
#