Home Home > GIT Browse
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Kosina <jkosina@suse.cz>2014-12-16 16:40:51 +0100
committerJiri Kosina <jkosina@suse.cz>2014-12-16 17:07:28 +0100
commit1cb95458608a29a36ace7673fc2ac27c1b2592ec (patch)
treea3864798385bf695b739e9d25f419169bf27c9b0
parented639400bf989c94d7a6fadbaed6a4494989309a (diff)
- Refresh
patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch: disable on Xen (bsc#910251) patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch: disable on Xen (bsc#910251)
-rw-r--r--config/i386/ec21
-rw-r--r--config/i386/xen1
-rw-r--r--config/x86_64/ec21
-rw-r--r--config/x86_64/xen1
-rw-r--r--patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch2
-rw-r--r--patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch6
6 files changed, 4 insertions, 8 deletions
diff --git a/config/i386/ec2 b/config/i386/ec2
index 824e3afdad..f3d2b3f262 100644
--- a/config/i386/ec2
+++ b/config/i386/ec2
@@ -326,7 +326,6 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_VM86=y
CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
# CONFIG_TOSHIBA is not set
# CONFIG_I8K is not set
CONFIG_X86_MSR=m
diff --git a/config/i386/xen b/config/i386/xen
index eb7fb980b7..f0c934a090 100644
--- a/config/i386/xen
+++ b/config/i386/xen
@@ -330,7 +330,6 @@ CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_VM86=y
CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX32=y
CONFIG_TOSHIBA=m
CONFIG_I8K=m
CONFIG_X86_MSR=m
diff --git a/config/x86_64/ec2 b/config/x86_64/ec2
index 4306839b80..c96fe89f2b 100644
--- a/config/x86_64/ec2
+++ b/config/x86_64/ec2
@@ -309,7 +309,6 @@ CONFIG_NR_CPUS=32
CONFIG_PREEMPT_NONE=y
# CONFIG_PREEMPT_VOLUNTARY is not set
CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
# CONFIG_I8K is not set
CONFIG_X86_MSR=m
CONFIG_X86_CPUID=m
diff --git a/config/x86_64/xen b/config/x86_64/xen
index 67389dbbc0..bc648ba98d 100644
--- a/config/x86_64/xen
+++ b/config/x86_64/xen
@@ -338,7 +338,6 @@ CONFIG_X86_MCE=y
CONFIG_X86_MCE_INJECT=m
CONFIG_X86_XEN_MCE=y
CONFIG_X86_16BIT=y
-CONFIG_X86_ESPFIX64=y
CONFIG_I8K=m
CONFIG_MICROCODE=m
CONFIG_MICROCODE_OLD_INTERFACE=y
diff --git a/patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch b/patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch
index 48f2fb7ac6..08d0cec8d4 100644
--- a/patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch
+++ b/patches.fixes/x86-espfix-make-espfix64-a-kconfig-option-fix-uml.patch
@@ -37,7 +37,7 @@ Index: kernel/arch/x86/Kconfig
+config X86_ESPFIX64
+ def_bool y
-+ depends on X86_64
++ depends on X86_64 && !XEN
+
config TOSHIBA
tristate "Toshiba Laptop support"
diff --git a/patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch b/patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch
index 2e3f5f1f7b..c09bfac324 100644
--- a/patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch
+++ b/patches.fixes/x86-espfix-make-it-possible-to-disable-16-bit-support.patch
@@ -49,12 +49,12 @@ Index: kernel/arch/x86/Kconfig
+
+config X86_ESPFIX32
+ def_bool y
-+ depends on X86_16BIT && X86_32
++ depends on X86_16BIT && X86_32 && !XEN
config X86_ESPFIX64
def_bool y
-- depends on X86_64
-+ depends on X86_16BIT && X86_64
+- depends on X86_64 && !XEN
++ depends on X86_16BIT && X86_64 && !XEN
config TOSHIBA
tristate "Toshiba Laptop support"