Re: [Xen-devel] [PATCH] arm: use symbolic constants for initial page table attributes

[Ian Campbell <Ian.Campbell@xxxxxxxxxx>]

On Thu, 2012-03-15 at 17:29 +0000, Ian Campbell wrote:
> On Thu, 2012-03-15 at 17:27 +0000, Tim Deegan wrote:
> > At 15:40 +0000 on 15 Mar (1331826008), Ian Campbell wrote:
> > > Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
> > > ---
> > >  xen/arch/arm/head.S |   22 ++++++++++++++--------
> > >  1 files changed, 14 insertions(+), 8 deletions(-)
> > > 
> > > diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S
> > > index eabb403..6fb7214 100644
> > > --- a/xen/arch/arm/head.S
> > > +++ b/xen/arch/arm/head.S
> > > @@ -21,6 +21,12 @@
> > >  #include <asm/page.h>
> > >  #include <asm/asm_defns.h>
> > >  
> > > +#define XEN_PT_PT  0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, 
> > > T=1, P=1 */
> > > +#define XEN_PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, 
> > > T=0, P=1 */
> > > +#define XEN_PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, 
> > > T=0, P=1 */
> > > +
> > 
> > Since these are file-local, maybe drop the XEN_ prefix to avoid the long
> > lines?
> 
> Hmm. My Emacs appears to have stopped highlighting the 80th column. How
> odd.

I managed to mess this up and push the un-edited version (specifically I
aborted the rebase -i for a different reason and forgot to do these
again). I'll apply the following fixup.

Also managed to drop your Ack on this and the tab cleanup in the same
error, sorry.

Ian.

diff --git a/xen/arch/arm/head.S b/xen/arch/arm/head.S
index 6fb7214..1858eb3 100644
--- a/xen/arch/arm/head.S
+++ b/xen/arch/arm/head.S
@@ -21,12 +21,12 @@
 #include <asm/page.h>
 #include <asm/asm_defns.h>
 
-#define XEN_PT_PT  0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 
*/
-#define XEN_PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, P=1 
*/
-#define XEN_PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, P=1 
*/
+#define PT_PT  0xe7f /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=1, P=1 */
+#define PT_MEM 0xe7d /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=111, T=0, P=1 */
+#define PT_DEV 0xe71 /* nG=1, AF=1, SH=10, AP=01, NS=1, ATTR=100, T=0, P=1 */
 
-#define PT_UPPER(x) (XEN_PT_##x & 0xf00)
-#define PT_LOWER(x) (XEN_PT_##x & 0x0ff)
+#define PT_UPPER(x) (PT_##x & 0xf00)
+#define PT_LOWER(x) (PT_##x & 0x0ff)
 
 /* Macro to print a string to the UART, if there is one.
  * Clobbers r0-r3. */




_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel