| Message ID | 1244628674-23822-1-git-send-email-konrad@gaisler.com |
|---|---|
| State | Superseded |
| Delegated to: | David Miller |
| Headers | show |
On Wed, Jun 10, 2009 at 20:11, <konrad@gaisler.com> wrote: > From: Konrad Eisele <konrad@gaisler.com> > >> Would it not be better to put the ifdefs around the original >> definition of ASI_M_MMUREGS? > > Done > > > is defined > --- > arch/sparc/include/asm/asi.h | 4 ++++ > 1 files changed, 4 insertions(+), 0 deletions(-) > > diff --git a/arch/sparc/include/asm/asi.h b/arch/sparc/include/asm/asi.h > index 74703c5..b2e3db6 100644 > --- a/arch/sparc/include/asm/asi.h > +++ b/arch/sparc/include/asm/asi.h > @@ -40,7 +40,11 @@ #define ASI_M_RES00 0x00 /* Do > #define ASI_M_UNA01 0x01 /* Same here... */ > #define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ > #define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ > +#ifndef CONFIG_SPARC_LEON > #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ > +#else > +#define ASI_M_MMUREGS 0x19 > +#endif /* CONFIG_SPARC_LEON */ If you do another round of changes to these patches, you may want to write it as: #ifdef CONFIG_SPARC_LEON #define ASI_M_MMUREGS 0x19 #else #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ #endif /* CONFIG_SPARC_LEON */ and put some whitespace around it so it stands out. You could also comment it similarly to the other entries in this file. > #define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ > #define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ > #define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */ Thanks,
diff --git a/arch/sparc/include/asm/asi.h b/arch/sparc/include/asm/asi.h index 74703c5..b2e3db6 100644 --- a/arch/sparc/include/asm/asi.h +++ b/arch/sparc/include/asm/asi.h @@ -40,7 +40,11 @@ #define ASI_M_RES00 0x00 /* Do #define ASI_M_UNA01 0x01 /* Same here... */ #define ASI_M_MXCC 0x02 /* Access to TI VIKING MXCC registers */ #define ASI_M_FLUSH_PROBE 0x03 /* Reference MMU Flush/Probe; rw, ss */ +#ifndef CONFIG_SPARC_LEON #define ASI_M_MMUREGS 0x04 /* MMU Registers; rw, ss */ +#else +#define ASI_M_MMUREGS 0x19 +#endif /* CONFIG_SPARC_LEON */ #define ASI_M_TLBDIAG 0x05 /* MMU TLB only Diagnostics */ #define ASI_M_DIAGS 0x06 /* Reference MMU Diagnostics */ #define ASI_M_IODIAG 0x07 /* MMU I/O TLB only Diagnostics */