From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1761599AbYHAWoP (ORCPT ); Fri, 1 Aug 2008 18:44:15 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1757239AbYHAWlu (ORCPT ); Fri, 1 Aug 2008 18:41:50 -0400 Received: from saraswathi.solana.com ([198.99.130.12]:52126 "EHLO saraswathi.solana.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756144AbYHAWlt (ORCPT ); Fri, 1 Aug 2008 18:41:49 -0400 Date: Fri, 1 Aug 2008 18:41:35 -0400 From: Jeff Dike To: stable@kernel.org Cc: LKML , uml-devel Subject: [PATCH 13/14] UML - Fix boot crash Message-ID: <20080801224135.GA13735@c2.user-mode-linux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.18 (2008-05-17) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org >>From 7ca5503f5ee32fb3cd6aa6eca21a8edfe09a7717 Mon Sep 17 00:00:00 2001 My copying of linux/init.h didn't go far enough. The definition of __used singled out gcc minor version 3, but didn't care what the major version was. This broke when unit-at-a-time was added and gcc started throwing out initcalls. This results in an early boot crash when ptrace tries to initialize a process with an empty, uninitialized register set. Signed-off-by: Jeff Dike Signed-off-by: Linus Torvalds --- arch/um/include/init.h | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/arch/um/include/init.h b/arch/um/include/init.h index b00a957..37dd097 100644 --- a/arch/um/include/init.h +++ b/arch/um/include/init.h @@ -45,6 +45,8 @@ typedef void (*exitcall_t)(void); # define __section(S) __attribute__ ((__section__(#S))) #endif +#if __GNUC__ == 3 + #if __GNUC_MINOR__ >= 3 # define __used __attribute__((__used__)) #else @@ -52,6 +54,12 @@ typedef void (*exitcall_t)(void); #endif #else +#if __GNUC__ == 4 +# define __used __attribute__((__used__)) +#endif +#endif + +#else #include #endif /* These are for everybody (although not all archs will actually -- 1.5.5.1