[arch-commits] Commit in linux-lts/trunk (5 files)
Tobias Powalowski
tpowa at archlinux.org
Tue Dec 4 11:01:13 UTC 2012
Date: Tuesday, December 4, 2012 @ 06:01:13
Author: tpowa
Revision: 172501
upgpkg: linux-lts 3.0.54-1
bump to latest version, disabled IDE subsystem
Added:
linux-lts/trunk/3.0.54-ptrace-i686-build.patch
Modified:
linux-lts/trunk/PKGBUILD
linux-lts/trunk/config
linux-lts/trunk/config.x86_64
linux-lts/trunk/linux-lts.install
--------------------------------+
3.0.54-ptrace-i686-build.patch | 41 ++++++++++++++++++
PKGBUILD | 18 +++++--
config | 88 +--------------------------------------
config.x86_64 | 71 +------------------------------
linux-lts.install | 2
5 files changed, 60 insertions(+), 160 deletions(-)
Added: 3.0.54-ptrace-i686-build.patch
===================================================================
--- 3.0.54-ptrace-i686-build.patch (rev 0)
+++ 3.0.54-ptrace-i686-build.patch 2012-12-04 11:01:13 UTC (rev 172501)
@@ -0,0 +1,41 @@
+From: H. Peter Anvin <hpa at linux.intel.com>
+Date: Wed, 21 Nov 2012 06:21:02 +0000 (-0800)
+Subject: x86-32: Export kernel_stack_pointer() for modules
+X-Git-Tag: v3.6.9~50
+X-Git-Url: https://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Fstable%2Flinux-stable.git;a=commitdiff_plain;h=051d62f6f239a9427fcab244a310610ed8bedb43
+
+x86-32: Export kernel_stack_pointer() for modules
+
+commit cb57a2b4cff7edf2a4e32c0163200e9434807e0a upstream.
+
+Modules, in particular oprofile (and possibly other similar tools)
+need kernel_stack_pointer(), so export it using EXPORT_SYMBOL_GPL().
+
+Link: http://lkml.kernel.org/r/20120912135059.GZ8285@erda.amd.com
+Cc: Yang Wei <wei.yang at windriver.com>
+Cc: Robert Richter <robert.richter at amd.com>
+Cc: Jun Zhang <jun.zhang at intel.com>
+Signed-off-by: H. Peter Anvin <hpa at linux.intel.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh at linuxfoundation.org>
+---
+
+diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
+index 947cf90..9ee1787 100644
+--- a/arch/x86/kernel/ptrace.c
++++ b/arch/x86/kernel/ptrace.c
+@@ -21,6 +21,7 @@
+ #include <linux/signal.h>
+ #include <linux/perf_event.h>
+ #include <linux/hw_breakpoint.h>
++#include <linux/module.h>
+
+ #include <asm/uaccess.h>
+ #include <asm/pgtable.h>
+@@ -192,6 +193,7 @@ unsigned long kernel_stack_pointer(struct pt_regs *regs)
+
+ return (unsigned long)regs;
+ }
++EXPORT_SYMBOL_GPL(kernel_stack_pointer);
+
+ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)
+ {
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2012-12-04 10:49:41 UTC (rev 172500)
+++ PKGBUILD 2012-12-04 11:01:13 UTC (rev 172501)
@@ -5,7 +5,7 @@
pkgbase=linux-lts # Build stock -lts kernel
#pkgbase=linux-custom # Build kernel with a different name
_srcname=linux-3.0
-pkgver=3.0.53
+pkgver=3.0.54
pkgrel=1
arch=('i686' 'x86_64')
url="http://www.kernel.org/"
@@ -22,17 +22,19 @@
'i915-fix-ghost-tv-output.patch'
'ext4-options.patch'
'module-symbol-waiting-3.0.patch'
- 'module-init-wait-3.0.patch')
+ 'module-init-wait-3.0.patch'
+ '3.0.54-ptrace-i686-build.patch')
md5sums=('ecf932280e2441bdd992423ef3d55f8f'
- '3205185e2806019e0d236a14e96ab83a'
- 'edc668eef98c6795fbdbc7efd755d9bb'
- '6ec56de185c2a3a24e234ddc0915049a'
+ '27d8d645091a979988ee4eba100dedd8'
+ 'af692c789cae37d98a8927cc8f5842bf'
+ '5307498e3164b48ce7ed2ae70c6e80f3'
'232b52576a62c7a333e9fe7a1e1ca359'
'9d3c56a4b999c8bfbd4018089a62f662'
'263725f20c0b9eb9c353040792d644e5'
'c8299cf750a84e12d60b372c8ca7e1e8'
'670931649c60fcb3ef2e0119ed532bd4'
- '8a71abc4224f575008f974a099b5cf6f')
+ '8a71abc4224f575008f974a099b5cf6f'
+ '80889d526d86e516757b52fc99dca64d')
_kernelname=${pkgbase#linux}
@@ -68,6 +70,10 @@
patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+ # fix building on i686 platform
+ # https://git.kernel.org/?p=linux/kernel/git/stable/linux-stable.git;a=commitdiff;h=051d62f6f239a9427fcab244a310610ed8bedb43
+ patch -Np1 -i "${srcdir}/3.0.54-ptrace-i686-build.patch"
+
if [ "${CARCH}" = "x86_64" ]; then
cat "${srcdir}/config.x86_64" > ./.config
else
Modified: config
===================================================================
--- config 2012-12-04 10:49:41 UTC (rev 172500)
+++ config 2012-12-04 11:01:13 UTC (rev 172501)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/i386 3.0.43-1 Kernel Configuration
+# Linux/i386 3.0.54-1 Kernel Configuration
#
# CONFIG_64BIT is not set
CONFIG_X86_32=y
@@ -431,6 +431,7 @@
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1533,91 +1534,9 @@
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
+# CONFIG_IDE is not set
#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-CONFIG_IDE_LEGACY=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_CS5535=m
-CONFIG_BLK_DEV_CS5536=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-
-#
-# Other IDE chipsets support
-#
-
-#
-# Note: most of these also require special kernel boot parameters
-#
-CONFIG_BLK_DEV_4DRIVES=m
-CONFIG_BLK_DEV_ALI14XX=m
-CONFIG_BLK_DEV_DTC2278=m
-CONFIG_BLK_DEV_HT6560B=m
-CONFIG_BLK_DEV_QD65XX=m
-CONFIG_BLK_DEV_UMC8672=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
# SCSI device support
#
CONFIG_SCSI_MOD=m
@@ -4523,7 +4442,6 @@
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
Modified: config.x86_64
===================================================================
--- config.x86_64 2012-12-04 10:49:41 UTC (rev 172500)
+++ config.x86_64 2012-12-04 11:01:13 UTC (rev 172501)
@@ -1,6 +1,6 @@
#
# Automatically generated make config: don't edit
-# Linux/x86_64 3.0.43-1 Kernel Configuration
+# Linux/x86_64 3.0.54-1 Kernel Configuration
#
CONFIG_64BIT=y
# CONFIG_X86_32 is not set
@@ -417,6 +417,7 @@
CONFIG_MTRR_SANITIZER_SPARE_REG_NR_DEFAULT=1
CONFIG_X86_PAT=y
CONFIG_ARCH_USES_PG_UNCACHED=y
+CONFIG_ARCH_RANDOM=y
CONFIG_EFI=y
CONFIG_SECCOMP=y
CONFIG_CC_STACKPROTECTOR=y
@@ -1475,74 +1476,9 @@
CONFIG_TI_ST=m
CONFIG_SENSORS_LIS3_I2C=m
CONFIG_HAVE_IDE=y
-CONFIG_IDE=m
+# CONFIG_IDE is not set
#
-# Please see Documentation/ide/ide.txt for help/info on IDE drives
-#
-CONFIG_IDE_XFER_MODE=y
-CONFIG_IDE_TIMINGS=y
-CONFIG_IDE_ATAPI=y
-# CONFIG_BLK_DEV_IDE_SATA is not set
-CONFIG_IDE_GD=m
-CONFIG_IDE_GD_ATA=y
-CONFIG_IDE_GD_ATAPI=y
-CONFIG_BLK_DEV_IDECS=m
-CONFIG_BLK_DEV_DELKIN=m
-CONFIG_BLK_DEV_IDECD=m
-CONFIG_BLK_DEV_IDECD_VERBOSE_ERRORS=y
-CONFIG_BLK_DEV_IDETAPE=m
-CONFIG_BLK_DEV_IDEACPI=y
-# CONFIG_IDE_TASK_IOCTL is not set
-CONFIG_IDE_PROC_FS=y
-
-#
-# IDE chipset support/bugfixes
-#
-CONFIG_IDE_GENERIC=m
-CONFIG_BLK_DEV_PLATFORM=m
-CONFIG_BLK_DEV_CMD640=m
-# CONFIG_BLK_DEV_CMD640_ENHANCED is not set
-CONFIG_BLK_DEV_IDEPNP=m
-CONFIG_BLK_DEV_IDEDMA_SFF=y
-
-#
-# PCI IDE chipsets support
-#
-CONFIG_BLK_DEV_IDEPCI=y
-# CONFIG_BLK_DEV_OFFBOARD is not set
-CONFIG_BLK_DEV_GENERIC=m
-CONFIG_BLK_DEV_OPTI621=m
-CONFIG_BLK_DEV_RZ1000=m
-CONFIG_BLK_DEV_IDEDMA_PCI=y
-CONFIG_BLK_DEV_AEC62XX=m
-CONFIG_BLK_DEV_ALI15X3=m
-CONFIG_BLK_DEV_AMD74XX=m
-CONFIG_BLK_DEV_ATIIXP=m
-CONFIG_BLK_DEV_CMD64X=m
-CONFIG_BLK_DEV_TRIFLEX=m
-CONFIG_BLK_DEV_CS5520=m
-CONFIG_BLK_DEV_CS5530=m
-CONFIG_BLK_DEV_HPT366=m
-CONFIG_BLK_DEV_JMICRON=m
-CONFIG_BLK_DEV_SC1200=m
-CONFIG_BLK_DEV_PIIX=m
-CONFIG_BLK_DEV_IT8172=m
-CONFIG_BLK_DEV_IT8213=m
-CONFIG_BLK_DEV_IT821X=m
-CONFIG_BLK_DEV_NS87415=m
-CONFIG_BLK_DEV_PDC202XX_OLD=m
-CONFIG_BLK_DEV_PDC202XX_NEW=m
-CONFIG_BLK_DEV_SVWKS=m
-CONFIG_BLK_DEV_SIIMAGE=m
-CONFIG_BLK_DEV_SIS5513=m
-CONFIG_BLK_DEV_SLC90E66=m
-CONFIG_BLK_DEV_TRM290=m
-CONFIG_BLK_DEV_VIA82CXXX=m
-CONFIG_BLK_DEV_TC86C001=m
-CONFIG_BLK_DEV_IDEDMA=y
-
-#
# SCSI device support
#
CONFIG_SCSI_MOD=m
@@ -4298,7 +4234,6 @@
# LED Triggers
#
CONFIG_LEDS_TRIGGER_TIMER=m
-CONFIG_LEDS_TRIGGER_IDE_DISK=y
CONFIG_LEDS_TRIGGER_HEARTBEAT=m
CONFIG_LEDS_TRIGGER_BACKLIGHT=m
CONFIG_LEDS_TRIGGER_GPIO=m
Modified: linux-lts.install
===================================================================
--- linux-lts.install 2012-12-04 10:49:41 UTC (rev 172500)
+++ linux-lts.install 2012-12-04 11:01:13 UTC (rev 172501)
@@ -2,7 +2,7 @@
# arg 2: the old package version
KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.53-1-lts
+KERNEL_VERSION=3.0.54-1-lts
# set a sane PATH to ensure that critical utils like depmod will be found
export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
More information about the arch-commits
mailing list