[Xen-changelog] unnecessary difference between vanilla and xen

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1443.2.1, 2005/04/05 10:07:08+01:00, vh249@xxxxxxxxxxxxxxxxxxxxxx

        unnecessary difference between vanilla and xen
        
        Signed-off-by: Vincent Hanquez <vincent@xxxxxxxxxxxxx>



 arch/xen/i386/kernel/process.c     |    2 +-
 arch/xen/i386/mm/init.c            |    2 +-
 include/asm-xen/asm-i386/pgalloc.h |    7 +++----
 3 files changed, 5 insertions(+), 6 deletions(-)


diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c    2005-04-05 
09:03:17 -04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/kernel/process.c    2005-04-05 
09:03:17 -04:00
@@ -167,7 +167,7 @@
        if (regs->xcs & 2)
                printk(" ESP: %04x:%08lx",0xffff & regs->xss,regs->esp);
        printk(" EFLAGS: %08lx    %s  (%s)\n",
-              regs->eflags, print_tainted(),UTS_RELEASE);
+              regs->eflags, print_tainted(), system_utsname.release);
        printk("EAX: %08lx EBX: %08lx ECX: %08lx EDX: %08lx\n",
                regs->eax,regs->ebx,regs->ecx,regs->edx);
        printk("ESI: %08lx EDI: %08lx EBP: %08lx",
diff -Nru a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c 
b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c
--- a/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c   2005-04-05 09:03:17 
-04:00
+++ b/linux-2.6.11-xen-sparse/arch/xen/i386/mm/init.c   2005-04-05 09:03:17 
-04:00
@@ -194,7 +194,7 @@
                        }
                }
                pmd_idx = 0;
-       }       
+       }
 }
 
 static inline int page_kills_ppro(unsigned long pagenr)
diff -Nru a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h 
b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h
--- a/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h        
2005-04-05 09:03:17 -04:00
+++ b/linux-2.6.11-xen-sparse/include/asm-xen/asm-i386/pgalloc.h        
2005-04-05 09:03:17 -04:00
@@ -9,13 +9,12 @@
 #include <asm/io.h>            /* for phys_to_virt and page_to_pseudophys */
 
 #define pmd_populate_kernel(mm, pmd, pte) \
-       set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
+               set_pmd(pmd, __pmd(_PAGE_TABLE + __pa(pte)))
 
-#define pmd_populate(mm, pmd, pte) do {                                \
+#define pmd_populate(mm, pmd, pte)                             \
        set_pmd(pmd, __pmd(_PAGE_TABLE +                        \
                ((unsigned long long)page_to_pfn(pte) <<        \
-                       (unsigned long long) PAGE_SHIFT)));     \
-} while (0)
+                       (unsigned long long) PAGE_SHIFT)))
 /*
  * Allocate and free page tables.
  */

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog