Linux 2.6.34.6

Previous thread: Linux 2.6.32.21 by Greg KH on Thursday, August 26, 2010 - 4:57 pm. (2 messages)

Next thread: Linux 2.6.35.4 by Greg KH on Thursday, August 26, 2010 - 4:58 pm. (1 message)
From: Greg KH
Date: Thursday, August 26, 2010 - 4:58 pm

I'm announcing the release of the 2.6.34.6 kernel.

All users of the 2.6.34 kernel series must upgrade.

As Og noted, this is the last .34 kernel being released, please move to
.35 at this point if you are relying on this kernel series.

The updated 2.6.34.y git tree can be found at:
        git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-2.6.34.y.git
and can be browsed at the normal kernel.org git web browser:
        http://git.kernel.org/?p=linux/kernel/git/stable/linux-2.6.34.y.git;a=summary

thanks,

greg k-h

------------

 Makefile                                    |    2 
 arch/arm/include/asm/ptrace.h               |   17 +++-
 arch/arm/mach-ixp4xx/ixdp425-setup.c        |    1 
 arch/arm/mach-mx3/mach-qong.c               |    1 
 arch/arm/mach-orion5x/ts78xx-setup.c        |    1 
 arch/blackfin/mach-bf537/boards/stamp.c     |    1 
 arch/blackfin/mach-bf561/boards/acvilon.c   |    1 
 arch/powerpc/Makefile                       |    2 
 arch/sparc/include/asm/atomic_64.h          |   10 +-
 arch/sparc/include/asm/parport.h            |    4 
 arch/sparc/include/asm/rwsem-const.h        |    2 
 arch/x86/Kconfig                            |    5 +
 arch/x86/include/asm/cmpxchg_32.h           |   67 ++++------------
 arch/x86/include/asm/cmpxchg_64.h           |    4 
 arch/x86/kernel/apic/apic.c                 |   41 ++++++++--
 arch/x86/kernel/apic/io_apic.c              |    2 
 arch/x86/kernel/smpboot.c                   |   19 ++++
 arch/x86/oprofile/nmi_int.c                 |   17 +++-
 drivers/gpu/drm/drm_drv.c                   |    4 
 drivers/gpu/drm/i915/intel_display.c        |   23 +++--
 drivers/gpu/drm/radeon/radeon_atombios.c    |   16 +++
 drivers/gpu/drm/radeon/radeon_device.c      |    2 
 drivers/gpu/drm/radeon/radeon_i2c.c         |    7 +
 drivers/gpu/drm/radeon/radeon_irq_kms.c     |    5 -
 drivers/gpu/drm/radeon/radeon_legacy_crtc.c |    2 
 drivers/hwmon/pc87360.c                     |   31 ++++---
 ...
From: Greg KH
Date: Thursday, August 26, 2010 - 5:00 pm

diff --git a/Makefile b/Makefile
index 10c5a85..e821f72 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 VERSION = 2
 PATCHLEVEL = 6
 SUBLEVEL = 34
-EXTRAVERSION = .5
+EXTRAVERSION = .6
 NAME = Sheep on Meth
 
 # *DOCUMENTATION*
diff --git a/arch/arm/include/asm/ptrace.h b/arch/arm/include/asm/ptrace.h
index 9dcb11e..bf62c44 100644
--- a/arch/arm/include/asm/ptrace.h
+++ b/arch/arm/include/asm/ptrace.h
@@ -158,15 +158,24 @@ struct pt_regs {
  */
 static inline int valid_user_regs(struct pt_regs *regs)
 {
-	if (user_mode(regs) && (regs->ARM_cpsr & PSR_I_BIT) == 0) {
-		regs->ARM_cpsr &= ~(PSR_F_BIT | PSR_A_BIT);
-		return 1;
+	unsigned long mode = regs->ARM_cpsr & MODE_MASK;
+
+	/*
+	 * Always clear the F (FIQ) and A (delayed abort) bits
+	 */
+	regs->ARM_cpsr &= ~(PSR_F_BIT | PSR_A_BIT);
+
+	if ((regs->ARM_cpsr & PSR_I_BIT) == 0) {
+		if (mode == USR_MODE)
+			return 1;
+		if (elf_hwcap & HWCAP_26BIT && mode == USR26_MODE)
+			return 1;
 	}
 
 	/*
 	 * Force CPSR to something logical...
 	 */
-	regs->ARM_cpsr &= PSR_f | PSR_s | (PSR_x & ~PSR_A_BIT) | PSR_T_BIT | MODE32_BIT;
+	regs->ARM_cpsr &= PSR_f | PSR_s | PSR_x | PSR_T_BIT | MODE32_BIT;
 	if (!(elf_hwcap & HWCAP_26BIT))
 		regs->ARM_cpsr |= USR_MODE;
 
diff --git a/arch/arm/mach-ixp4xx/ixdp425-setup.c b/arch/arm/mach-ixp4xx/ixdp425-setup.c
index 827cbc4..ea9ee4e 100644
--- a/arch/arm/mach-ixp4xx/ixdp425-setup.c
+++ b/arch/arm/mach-ixp4xx/ixdp425-setup.c
@@ -100,6 +100,7 @@ ixdp425_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
 
 static struct platform_nand_data ixdp425_flash_nand_data = {
 	.chip = {
+		.nr_chips		= 1,
 		.chip_delay		= 30,
 		.options		= NAND_NO_AUTOINCR,
 #ifdef CONFIG_MTD_PARTITIONS
diff --git a/arch/arm/mach-mx3/mach-qong.c b/arch/arm/mach-mx3/mach-qong.c
index e5b5b83..1f9363f 100644
--- a/arch/arm/mach-mx3/mach-qong.c
+++ b/arch/arm/mach-mx3/mach-qong.c
@@ -169,6 +169,7 @@ static void qong_nand_select_chip(struct mtd_info *mtd, int chip)
 
 ...
Previous thread: Linux 2.6.32.21 by Greg KH on Thursday, August 26, 2010 - 4:57 pm. (2 messages)

Next thread: Linux 2.6.35.4 by Greg KH on Thursday, August 26, 2010 - 4:58 pm. (1 message)