ia64/xen-unstable

changeset 7847:2e0700008a87

Correctly export xencons functions to avoid ugly 'extern'
declarations.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>
author kaf24@firebug.cl.cam.ac.uk
date Wed Nov 16 11:32:19 2005 +0100 (2005-11-16)
parents 022818ea3914
children 592d8f74d23d
files linux-2.6-xen-sparse/arch/xen/kernel/reboot.c linux-2.6-xen-sparse/drivers/xen/console/console.c linux-2.6-xen-sparse/include/asm-xen/xencons.h
line diff
     1.1 --- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Wed Nov 16 11:30:32 2005 +0100
     1.2 +++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c	Wed Nov 16 11:32:19 2005 +0100
     1.3 @@ -15,6 +15,7 @@
     1.4  #include <asm-xen/xenbus.h>
     1.5  #include <linux/cpu.h>
     1.6  #include <linux/kthread.h>
     1.7 +#include <asm-xen/xencons.h>
     1.8  
     1.9  #define SHUTDOWN_INVALID  -1
    1.10  #define SHUTDOWN_POWEROFF  0
    1.11 @@ -29,7 +30,6 @@
    1.12  void machine_restart(char * __unused)
    1.13  {
    1.14  	/* We really want to get pending console data out before we die. */
    1.15 -	extern void xencons_force_flush(void);
    1.16  	xencons_force_flush();
    1.17  	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot);
    1.18  }
    1.19 @@ -42,7 +42,6 @@ void machine_halt(void)
    1.20  void machine_power_off(void)
    1.21  {
    1.22  	/* We really want to get pending console data out before we die. */
    1.23 -	extern void xencons_force_flush(void);
    1.24  	xencons_force_flush();
    1.25  	HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_poweroff);
    1.26  }
    1.27 @@ -85,8 +84,6 @@ static int __do_suspend(void *ignore)
    1.28  	int vcpu_prepare(int vcpu);
    1.29  #endif
    1.30  
    1.31 -	extern void xencons_resume(void);
    1.32 -
    1.33  	int err = 0;
    1.34  
    1.35  	BUG_ON(smp_processor_id() != 0);
     2.1 --- a/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Nov 16 11:30:32 2005 +0100
     2.2 +++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c	Wed Nov 16 11:32:19 2005 +0100
     2.3 @@ -53,6 +53,7 @@
     2.4  #include <asm-xen/xen-public/event_channel.h>
     2.5  #include <asm/hypervisor.h>
     2.6  #include <asm-xen/evtchn.h>
     2.7 +#include <asm-xen/xencons.h>
     2.8  
     2.9  #include "xencons_ring.h"
    2.10  /*
     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/linux-2.6-xen-sparse/include/asm-xen/xencons.h	Wed Nov 16 11:32:19 2005 +0100
     3.3 @@ -0,0 +1,7 @@
     3.4 +#ifndef __ASM_XENCONS_H__
     3.5 +#define __ASM_XENCONS_H__
     3.6 +
     3.7 +void xencons_force_flush(void);
     3.8 +void xencons_resume(void);
     3.9 +
    3.10 +#endif /* __ASM_XENCONS_H__ */