[2.6.34-rc6] ARM: build breaks with KPROBES

[Shilimkar, Santosh]

> -----Original Message-----
> From: Russell King - ARM Linux [mailto:linux at arm.linux.org.uk]
> Sent: Friday, April 30, 2010 1:18 PM
> To: Shilimkar, Santosh
> Cc: linux-arm-kernel at lists.infradead.org; Linux-OMAP
> Subject: Re: [2.6.34-rc6] ARM: build breaks with KPROBES
> 
> On Fri, Apr 30, 2010 at 12:51:49PM +0530, Shilimkar, Santosh wrote:
> > Russell,
> >
> > The latest mainline ARM build breaks with KPROBES enabled. Anand
> > Gadiyar did git bisect and figured out that below commit breaks the build.
> > 	commit :4260415f6a3b92c5c986398d96c314df37a4ccbf
> 
> Did you read the comments in the commit message to understand why
> .previous is dangerous?
> 
> > I tried matching the sections but failed to fix the build error. Below
> > is the hack patch to keep build working.
> 
> The previous section is not .text, but:
> 
> #ifdef CONFIG_KPROBES
>         .section        .kprobes.text,"ax",%progbits
> #else
>         .text
> #endif
> 
> Either change the preceding .data to .pushsection .data, and the following
> .text to .popsection, or duplicate the above ifdef; .pushsection/.popsection
> is _far_ safer than using .previous.
OK.
Here is the updated patch based on your suggestion.