Re: [PATCH v7 11/16] ARM: LPAE: Add fault handling support

[Catalin Marinas <catalin.marinas@arm.com>]

On Sun, Oct 23, 2011 at 12:57:56PM +0100, Russell King - ARM Linux wrote:
> On Wed, Aug 10, 2011 at 04:03:34PM +0100, Catalin Marinas wrote:
> > @@ -494,6 +508,72 @@ static struct fsr_info {
> >  	int	code;
> >  	const char *name;
> >  } fsr_info[] = {
> > +#ifdef CONFIG_ARM_LPAE
...
> > +#else	/* !CONFIG_ARM_LPAE */
> >  	/*
> >  	 * The following are the standard ARMv3 and ARMv4 aborts.  ARMv5
> >  	 * defines these to be "precise" aborts.
> > @@ -535,6 +615,7 @@ static struct fsr_info {
> >  	{ do_bad,		SIGBUS,  0,		"unknown 29"			   },
> >  	{ do_bad,		SIGBUS,  0,		"unknown 30"			   },
> >  	{ do_bad,		SIGBUS,  0,		"unknown 31"			   }
> > +#endif	/* CONFIG_ARM_LPAE */
> 
> Can't we do better than this?

The first thought was defining the fsr_info array in a different file
but that would mean exposing functions from the fault.c which are
currently defined as static.

The other variant is including a C file directly in fault.c. It's not
very nice but at least we remove the big #ifdef.

-- 
Catalin