From patchwork Sun May 9 03:21:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dave Kleikamp X-Patchwork-Id: 51982 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from bilbo.ozlabs.org (localhost [127.0.0.1]) by ozlabs.org (Postfix) with ESMTP id C3FC8B7F9C for ; Sun, 9 May 2010 13:21:31 +1000 (EST) Received: by ozlabs.org (Postfix) id 2C1FDB7D65; Sun, 9 May 2010 13:21:24 +1000 (EST) Delivered-To: linuxppc-dev@ozlabs.org Received: from e32.co.us.ibm.com (e32.co.us.ibm.com [32.97.110.150]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "e32.co.us.ibm.com", Issuer "Equifax" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id BC3C8B7D64 for ; Sun, 9 May 2010 13:21:20 +1000 (EST) Received: from d03relay03.boulder.ibm.com (d03relay03.boulder.ibm.com [9.17.195.228]) by e32.co.us.ibm.com (8.14.3/8.13.1) with ESMTP id o493E6Wv015377 for ; Sat, 8 May 2010 21:14:06 -0600 Received: from d03av04.boulder.ibm.com (d03av04.boulder.ibm.com [9.17.195.170]) by d03relay03.boulder.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o493LC5R150564 for ; Sat, 8 May 2010 21:21:12 -0600 Received: from d03av04.boulder.ibm.com (loopback [127.0.0.1]) by d03av04.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVout) with ESMTP id o493LBNW002458 for ; Sat, 8 May 2010 21:21:11 -0600 Received: from [9.65.25.110] (sig-9-65-25-110.mts.ibm.com [9.65.25.110]) by d03av04.boulder.ibm.com (8.14.3/8.13.1/NCO v10.0 AVin) with ESMTP id o493LAeu002429; Sat, 8 May 2010 21:21:10 -0600 Subject: Re: Fix [e]glibc build process From: Dave Kleikamp To: Andrey Volkov In-Reply-To: <4BE5C203.6060509@varma-el.com> References: <4BE5C203.6060509@varma-el.com> Organization: IBM Linux Technology Center Date: Sat, 08 May 2010 22:21:09 -0500 Message-Id: <1273375269.5312.4.camel@norville.austin.ibm.com> Mime-Version: 1.0 X-Mailer: Evolution 2.26.3 Cc: linuxppc-dev list , LKML , David Gibson X-BeenThere: linuxppc-dev@lists.ozlabs.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Linux on PowerPC Developers Mail List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org Errors-To: linuxppc-dev-bounces+patchwork-incoming=ozlabs.org@lists.ozlabs.org On Sat, 2010-05-08 at 23:56 +0400, Andrey Volkov wrote: > This patch fix [e]glibc build process destruction (more precisely _assembler_ > is die when try to compile getcontext.S since stdint.h coldn't be assembled) > intruduced by patch: > > commit: 162d92dfb79a0b5fc03380b8819fa5f870ebf1e > Date: Mon, 8 Feb 2010 11:51:05 +0000 (11:51 +0000) > from: Dave Kleikamp > > Signed-off-by: Andrey Volkov > > --- > > arch/powerpc/include/asm/ptrace.h | 2 ++ > 1 files changed, 2 insertions(+), 0 deletions(-) > > > diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h > index 9e2d84c..025912b 100644 > --- a/arch/powerpc/include/asm/ptrace.h > +++ b/arch/powerpc/include/asm/ptrace.h > @@ -27,8 +27,10 @@ > #ifdef __KERNEL__ > #include > #else > +#ifndef __ASSEMBLY__ > #include > #endif > +#endif > > #ifndef __ASSEMBLY__ Assembly code won't need to pull in linux/types.h either, so this would be simpler: Signed-off-by: Dave Kleikamp diff --git a/arch/powerpc/include/asm/ptrace.h b/arch/powerpc/include/asm/ptrace.h index 9e2d84c..0ed710e 100644 --- a/arch/powerpc/include/asm/ptrace.h +++ b/arch/powerpc/include/asm/ptrace.h @@ -24,14 +24,14 @@ * 2 of the License, or (at your option) any later version. */ +#ifndef __ASSEMBLY__ + #ifdef __KERNEL__ #include #else #include #endif -#ifndef __ASSEMBLY__ - struct pt_regs { unsigned long gpr[32]; unsigned long nip;