kernel-snapshot: update to 2.6.38-rc2.
This commit is contained in:
Juan RP
parent
925948ed83
commit
c872e358e2
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# This script builds the required initramfs.
|
||||
#
|
||||
_KVER="2.6.38-rc1"
|
||||
_KVER="2.6.38-rc2"
|
||||
|
||||
case "${ACTION}" in
|
||||
post)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# This script removes the initramfs.
|
||||
#
|
||||
_KVER="2.6.38-rc1"
|
||||
_KVER="2.6.38-rc2"
|
||||
|
||||
case "${ACTION}" in
|
||||
post)
|
||||
|
|
|
|||
|
|
@ -1,7 +1,7 @@
|
|||
#
|
||||
# Automatically generated make config: don't edit
|
||||
# Linux/x86_64 2.6.38-rc1 Kernel Configuration
|
||||
# Wed Jan 19 14:29:01 2011
|
||||
# Linux/x86_64 2.6.38-rc2 Kernel Configuration
|
||||
# Sun Jan 23 02:32:38 2011
|
||||
#
|
||||
CONFIG_64BIT=y
|
||||
# CONFIG_X86_32 is not set
|
||||
|
|
@ -92,7 +92,6 @@ CONFIG_HAVE_GENERIC_HARDIRQS=y
|
|||
# IRQ subsystem
|
||||
#
|
||||
CONFIG_GENERIC_HARDIRQS=y
|
||||
CONFIG_GENERIC_HARDIRQS_NO__DO_IRQ=y
|
||||
# CONFIG_GENERIC_HARDIRQS_NO_DEPRECATED is not set
|
||||
CONFIG_HAVE_SPARSE_IRQ=y
|
||||
CONFIG_GENERIC_IRQ_PROBE=y
|
||||
|
|
@ -148,6 +147,7 @@ CONFIG_RD_LZO=y
|
|||
# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set
|
||||
CONFIG_SYSCTL=y
|
||||
CONFIG_ANON_INODES=y
|
||||
# CONFIG_EXPERT is not set
|
||||
# CONFIG_EMBEDDED is not set
|
||||
CONFIG_UID16=y
|
||||
CONFIG_SYSCTL_SYSCALL=y
|
||||
|
|
@ -378,7 +378,6 @@ CONFIG_MEMORY_HOTPLUG_SPARSE=y
|
|||
CONFIG_MEMORY_HOTREMOVE=y
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
CONFIG_SPLIT_PTLOCK_CPUS=4
|
||||
CONFIG_COMPACTION=y
|
||||
CONFIG_MIGRATION=y
|
||||
CONFIG_PHYS_ADDR_T_64BIT=y
|
||||
CONFIG_ZONE_DMA_FLAG=1
|
||||
|
|
@ -390,8 +389,6 @@ CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
|
|||
CONFIG_ARCH_SUPPORTS_MEMORY_FAILURE=y
|
||||
CONFIG_MEMORY_FAILURE=y
|
||||
# CONFIG_TRANSPARENT_HUGEPAGE is not set
|
||||
# CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS is not set
|
||||
# CONFIG_TRANSPARENT_HUGEPAGE_MADVISE is not set
|
||||
# CONFIG_X86_CHECK_BIOS_CORRUPTION is not set
|
||||
CONFIG_X86_RESERVE_LOW=64
|
||||
CONFIG_MTRR=y
|
||||
|
|
@ -2891,7 +2888,6 @@ CONFIG_VIDEO_IR_I2C=m
|
|||
CONFIG_VIDEO_TVAUDIO=m
|
||||
CONFIG_VIDEO_TDA7432=m
|
||||
CONFIG_VIDEO_TDA9840=m
|
||||
CONFIG_VIDEO_TDA9875=m
|
||||
CONFIG_VIDEO_TEA6415C=m
|
||||
CONFIG_VIDEO_TEA6420=m
|
||||
CONFIG_VIDEO_MSP3400=m
|
||||
|
|
@ -3077,7 +3073,6 @@ CONFIG_USB_S2255=m
|
|||
CONFIG_V4L_MEM2MEM_DRIVERS=y
|
||||
CONFIG_VIDEO_MEM2MEM_TESTDEV=m
|
||||
CONFIG_RADIO_ADAPTERS=y
|
||||
CONFIG_RADIO_GEMTEK_PCI=m
|
||||
CONFIG_RADIO_MAXIRADIO=m
|
||||
CONFIG_RADIO_MAESTRO=m
|
||||
CONFIG_I2C_SI4713=m
|
||||
|
|
|
|||
|
|
@ -1,64 +0,0 @@
|
|||
From 6b35eb9ddcddde7b510726de03fae071178f1ec4 Mon Sep 17 00:00:00 2001
|
||||
From: Ingo Molnar <mingo@elte.hu>
|
||||
Date: Wed, 19 Jan 2011 10:09:42 +0100
|
||||
Subject: [PATCH] Revert "x86: Make relocatable kernel work with new binutils"
|
||||
|
||||
This reverts commit 86b1e8dd83cb ("x86: Make relocatable kernel work with
|
||||
new binutils").
|
||||
|
||||
Markus Trippelsdorf reported a boot failure caused by this patch.
|
||||
|
||||
The real solution to the original patch will likely involve an
|
||||
arch-generic solution to define an overlaid jiffies_64 and jiffies
|
||||
variables.
|
||||
|
||||
Until that's done and tested on all architectures revert this commit to
|
||||
solve the regression.
|
||||
|
||||
Reported-and-bisected-by: Markus Trippelsdorf <markus@trippelsdorf.de>
|
||||
Acked-by: "H. Peter Anvin" <hpa@zytor.com>
|
||||
Cc: Shaohua Li <shaohua.li@intel.com>
|
||||
Cc: "Lu, Hongjiu" <hongjiu.lu@intel.com>
|
||||
Cc: Linus Torvalds <torvalds@linux-foundation.org>,
|
||||
Cc: Sam Ravnborg <sam@ravnborg.org>
|
||||
LKML-Reference: <4D36A759.60704@intel.com>
|
||||
Signed-off-by: Ingo Molnar <mingo@elte.hu>
|
||||
---
|
||||
arch/x86/kernel/vmlinux.lds.S | 11 ++---------
|
||||
1 files changed, 2 insertions(+), 9 deletions(-)
|
||||
|
||||
diff --git a/arch/x86/kernel/vmlinux.lds.S b/arch/x86/kernel/vmlinux.lds.S
|
||||
index b34ab80..bf47007 100644
|
||||
--- a/arch/x86/kernel/vmlinux.lds.S
|
||||
+++ b/arch/x86/kernel/vmlinux.lds.S
|
||||
@@ -34,9 +34,11 @@ OUTPUT_FORMAT(CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT, CONFIG_OUTPUT_FORMAT)
|
||||
#ifdef CONFIG_X86_32
|
||||
OUTPUT_ARCH(i386)
|
||||
ENTRY(phys_startup_32)
|
||||
+jiffies = jiffies_64;
|
||||
#else
|
||||
OUTPUT_ARCH(i386:x86-64)
|
||||
ENTRY(phys_startup_64)
|
||||
+jiffies_64 = jiffies;
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_X86_64) && defined(CONFIG_DEBUG_RODATA)
|
||||
@@ -140,15 +142,6 @@ SECTIONS
|
||||
CACHELINE_ALIGNED_DATA(L1_CACHE_BYTES)
|
||||
|
||||
DATA_DATA
|
||||
- /*
|
||||
- * Workaround a binutils (2.20.51.0.12 to 2.21.51.0.3) bug.
|
||||
- * This makes jiffies relocatable in such binutils
|
||||
- */
|
||||
-#ifdef CONFIG_X86_32
|
||||
- jiffies = jiffies_64;
|
||||
-#else
|
||||
- jiffies_64 = jiffies;
|
||||
-#endif
|
||||
CONSTRUCTORS
|
||||
|
||||
/* rarely changed data like cpu maps */
|
||||
--
|
||||
1.7.3.5
|
||||
|
||||
|
|
@ -1 +0,0 @@
|
|||
-Np1
|
||||
|
|
@ -10,11 +10,11 @@ pkgname=kernel-snapshot
|
|||
#revision=1
|
||||
_kernel_snapshot=yes
|
||||
_kernel_ver=2.6.38
|
||||
_kernel_patch_ver=rc1
|
||||
_kernel_patch_ver=rc2
|
||||
version=${_kernel_ver}${_kernel_patch_ver}
|
||||
wrksrc="linux-${_kernel_ver}-${_kernel_patch_ver}"
|
||||
distfiles="${KERNEL_SITE}/kernel/v2.6/testing/linux-${_kernel_ver}-${_kernel_patch_ver}.tar.bz2"
|
||||
checksum=e1e2450cc38f5dd1e0516dfb7dc271e98905d959b4de5604c5142cb36d4f3397
|
||||
checksum=eecdad74178f17d7a4d79b1ebc80ca14c38a24f20149d0a72060847b20ee32a9
|
||||
subpackages="$pkgname-headers"
|
||||
|
||||
noverifyrdeps=yes
|
||||
|
|
|
|||
Loading…
Reference in New Issue