[Xen-changelog] Updates to conform to latest xen-unstable

[Xen patchbot -unstable <patchbot-unstable@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User djm@xxxxxxxxxxxxxxx
# Node ID a4196568095c0551fa41dba7be6a57b008346b4d
# Parent  208a3afc9353b1127d0c6b88e61a1ee07aed4095
Updates to conform to latest xen-unstable
Fix ns16550 to again handle rx2600 console defaults
Signed-off-by Kevin Tian <Kevin.tian@xxxxxxxxx>

diff -r 208a3afc9353 -r a4196568095c xen/arch/ia64/pcdp.c
--- a/xen/arch/ia64/pcdp.c      Thu Jul 28 15:33:34 2005
+++ b/xen/arch/ia64/pcdp.c      Fri Jul 29 18:52:33 2005
@@ -24,11 +24,11 @@
 setup_serial_console(struct pcdp_uart *uart)
 {
 #ifdef XEN
-       extern struct ns16550_defaults ns16550_com;
-       ns16550_com.baud = uart->baud;
-       ns16550_com.io_base = uart->addr.address;
+       extern struct ns16550_defaults ns16550_com1;
+       ns16550_com1.baud = uart->baud;
+       ns16550_com1.io_base = uart->addr.address;
        if (uart->bits)
-               ns16550_com.data_bits = uart->bits;
+               ns16550_com1.data_bits = uart->bits;
        return 0;
 #else
 #ifdef CONFIG_SERIAL_8250_CONSOLE
diff -r 208a3afc9353 -r a4196568095c xen/arch/ia64/xenmisc.c
--- a/xen/arch/ia64/xenmisc.c   Thu Jul 28 15:33:34 2005
+++ b/xen/arch/ia64/xenmisc.c   Fri Jul 29 18:52:33 2005
@@ -175,6 +175,22 @@
 void show_registers(struct pt_regs *regs)
 {
        printf("*** ADD REGISTER DUMP HERE FOR DEBUGGING\n");
+}
+
+int is_kernel_text(unsigned long addr)
+{
+       extern char _stext[], _etext[];
+       if (addr >= (unsigned long) _stext &&
+           addr <= (unsigned long) _etext)
+           return 1;
+
+       return 0;
+}
+
+unsigned long kernel_text_end(void)
+{
+       extern char _etext[];
+       return (unsigned long) _etext;
 }
 
 ///////////////////////////////
diff -r 208a3afc9353 -r a4196568095c xen/arch/ia64/xensetup.c
--- a/xen/arch/ia64/xensetup.c  Thu Jul 28 15:33:34 2005
+++ b/xen/arch/ia64/xensetup.c  Fri Jul 29 18:52:33 2005
@@ -130,7 +130,13 @@
     return;
 }
 
-struct ns16550_defaults ns16550_com = {
+struct ns16550_defaults ns16550_com1 = {
+    .data_bits = 8,
+    .parity    = 'n',
+    .stop_bits = 1
+};
+
+struct ns16550_defaults ns16550_com2 = {
     .data_bits = 8,
     .parity    = 'n',
     .stop_bits = 1
@@ -159,12 +165,11 @@
     /* We initialise the serial devices very early so we can get debugging. */
     if (running_on_sim) hpsim_serial_init();
     else {
-       ns16550_com.io_base = 0x3f8;
-       ns16550_com.irq     = 4;
-       ns16550_init(0, &ns16550_com);
-       ns16550_com.io_base = 0x2f8;
-       ns16550_com.irq     = 3;
-       ns16550_init(1, &ns16550_com);
+       ns16550_init(0, &ns16550_com1);
+       /* Also init com2 for Tiger4. */
+       ns16550_com2.io_base = 0x2f8;
+       ns16550_com2.irq     = 3;
+       ns16550_init(1, &ns16550_com2);
     }
     serial_init_preirq();
 

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