[packages/kernel/LINUX_4_1] - drop duplications
arekm
arekm at pld-linux.org
Thu Nov 12 23:36:25 CET 2015
commit 3164c4e4fe6add18b56476eec6ead8791d7e0c34
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Nov 12 23:36:02 2015 +0100
- drop duplications
kernel-multiarch.config | 1 -
kernel-x86.config | 3 +--
2 files changed, 1 insertion(+), 3 deletions(-)
---
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index 704068d..a98e582 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -15,7 +15,6 @@ KEXEC_FILE all=y
KEXEC_VERIFY_SIG all=n
KVM_DEBUG_FS all=n
KVM_DEVICE_ASSIGNMENT all=y
-PHYSICAL_ALIGN all=0x1000000
X86_AMD_PLATFORM_DEVICE all=y
X86_DEBUG_STATIC_CPU_HAS all=n
X86_SYSFB all=y
diff --git a/kernel-x86.config b/kernel-x86.config
index 7d2a9a2..cd56898 100644
--- a/kernel-x86.config
+++ b/kernel-x86.config
@@ -7,7 +7,6 @@ OPROFILE_EVENT_MULTIPLEX x86=y
KPROBES x86=y
JUMP_LABEL x86=y
OPTPROBES x86=y
-CC_STACKPROTECTOR x86=y x86_64=y
#- file kernel/gcov/Kconfig goes here
#-
@@ -103,7 +102,7 @@ KEXEC_JUMP x86=y
PHYSICAL_START x86=0x1000000
RELOCATABLE i386=y x86_64=y
RANDOMIZE_BASE i386=y x86_64=y
-PHYSICAL_ALIGN i386=0x100000
+PHYSICAL_ALIGN i386=0x100000 x86_64=0x1000000
HOTPLUG_CPU x86=y
BOOTPARAM_HOTPLUG_CPU0 all=n
DEBUG_HOTPLUG_CPU0 all=n
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/3164c4e4fe6add18b56476eec6ead8791d7e0c34
More information about the pld-cvs-commit
mailing list