Browse Source

kernel:
- disable drm update patches
- update x86 config
- disable CONFIG_KEXEC, CONFIG_RELOCATABLE



git-svn-id: http://trac.vinelinux.org/repos/projects/specs@3428 ec354946-7b23-47d6-9f5a-488ba84defc7

daisuke 13 years ago
parent
commit
298e871170

+ 3 - 3
k/kernel/kernel-2.6.35-i586.config

@@ -413,11 +413,11 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_START=0x100000
+# CONFIG_RELOCATABLE is not set
 CONFIG_X86_NEED_RELOCS=y
 CONFIG_PHYSICAL_ALIGN=0x100000
 CONFIG_HOTPLUG_CPU=y

+ 4 - 4
k/kernel/kernel-2.6.35-i686-pae.config

@@ -420,13 +420,13 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_START=0x400000
+# CONFIG_RELOCATABLE is not set
 CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_ALIGN=0x400000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CMDLINE_BOOL is not set

+ 4 - 4
k/kernel/kernel-2.6.35-i686.config

@@ -417,13 +417,13 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 # CONFIG_KEXEC_JUMP is not set
-CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+CONFIG_PHYSICAL_START=0x400000
+# CONFIG_RELOCATABLE is not set
 CONFIG_X86_NEED_RELOCS=y
-CONFIG_PHYSICAL_ALIGN=0x100000
+CONFIG_PHYSICAL_ALIGN=0x400000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y
 # CONFIG_CMDLINE_BOOL is not set

+ 1 - 1
k/kernel/kernel-2.6.35-ppc.config

@@ -331,7 +331,7 @@ CONFIG_ARCH_CPU_PROBE_RELEASE=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTPLUG=y
 CONFIG_ARCH_HAS_WALK_MEMORY=y
 CONFIG_ARCH_ENABLE_MEMORY_HOTREMOVE=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_IRQ_ALL_CPUS=y
 CONFIG_SPARSE_IRQ=y

+ 2 - 2
k/kernel/kernel-2.6.35-x86_64.config

@@ -418,11 +418,11 @@ CONFIG_SECCOMP=y
 CONFIG_HZ_1000=y
 CONFIG_HZ=1000
 CONFIG_SCHED_HRTICK=y
-CONFIG_KEXEC=y
+# CONFIG_KEXEC is not set
 # CONFIG_CRASH_DUMP is not set
 CONFIG_KEXEC_JUMP=y
 CONFIG_PHYSICAL_START=0x1000000
-CONFIG_RELOCATABLE=y
+# CONFIG_RELOCATABLE is not set
 CONFIG_PHYSICAL_ALIGN=0x1000000
 CONFIG_HOTPLUG_CPU=y
 CONFIG_COMPAT_VDSO=y

+ 7 - 2
k/kernel/kernel-vl.spec

@@ -1,6 +1,6 @@
 %define _noVersionedDependencies 1
 %define _minimum_patches 0
-%define _apply_drm_patches 1
+%define _apply_drm_patches 0
 
 Summary: The Linux kernel (the core of the Linux operating system)
 Summary(ja): Linux カーネル (Linux オペレーティングシステムの心臓部分)
@@ -28,7 +28,7 @@ Summary(ja): Linux カーネル (Linux オペレーティングシステムの
 %define patchlevel 12
 %define kversion 2.6.%{sublevel}
 %define rpmversion 2.6.%{sublevel}
-%define release 9%{?_dist_release}
+%define release 10%{?_dist_release}
 
 %define make_target bzImage
 %define hdrarch %_target_cpu
@@ -1154,6 +1154,11 @@ fi
 
 
 %changelog
+* Wed Apr 13 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-10
+- disable drm update patches
+- update x86 config
+  - disable CONFIG_KEXEC, CONFIG_RELOCATABLE
+
 * Tue Apr 12 2011 Daisuke SUZUKI <daisuke@linux.or.jp> 2.6.35-9
 - update to 2.6.35.12
 - update x86 configs