ia64/xen-unstable

changeset 3063:3db48d067bde

bitkeeper revision 1.1159.180.4 (419e1ce3xP6qsH24SA4ybMEapaR_LQ)

g/c empty.c
author cl349@arcadians.cl.cam.ac.uk
date Fri Nov 19 16:18:43 2004 +0000 (2004-11-19)
parents c74e9fdfcab7
children 8651c3cb88d9 d64da6d97856
files .rootkeys linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c
line diff
     1.1 --- a/.rootkeys	Fri Nov 19 11:48:10 2004 +0000
     1.2 +++ b/.rootkeys	Fri Nov 19 16:18:43 2004 +0000
     1.3 @@ -169,7 +169,6 @@ 4107adf1WcCgkhsdLTRGX52cOG1vJg linux-2.6
     1.4  4107adf1s5u6249DNPUViX1YNagbUQ linux-2.6.9-xen-sparse/arch/xen/i386/pci/irq.c
     1.5  40f56239zOksGg_H4XD4ye6iZNtoZA linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile
     1.6  40f56239bvOjuuuViZ0XMlNiREFC0A linux-2.6.9-xen-sparse/arch/xen/kernel/ctrl_if.c
     1.7 -40f56239pYRq5yshPTkv3ujXKc8K6g linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c
     1.8  40f56238xFQe9T7M_U_FItM-bZIpLw linux-2.6.9-xen-sparse/arch/xen/kernel/evtchn.c
     1.9  4110f478aeQWllIN7J4kouAHiAqrPw linux-2.6.9-xen-sparse/arch/xen/kernel/fixup.c
    1.10  412dfae9eA3_6e6bCGUtg1mj8b56fQ linux-2.6.9-xen-sparse/arch/xen/kernel/gnttab.c
     2.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile	Fri Nov 19 11:48:10 2004 +0000
     2.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/Makefile	Fri Nov 19 16:18:43 2004 +0000
     2.3 @@ -9,5 +9,4 @@ XENARCH	:= $(subst ",,$(CONFIG_XENARCH))
     2.4  
     2.5  extra-y += vmlinux.lds
     2.6  
     2.7 -obj-y	:= ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o empty.o \
     2.8 -           gnttab.o skbuff.o
     2.9 +obj-y	:= ctrl_if.o evtchn.o fixup.o reboot.o xen_proc.o gnttab.o skbuff.o
     3.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/empty.c	Fri Nov 19 11:48:10 2004 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,44 +0,0 @@
     3.4 -
     3.5 -#include <linux/string.h>
     3.6 -#include <asm-xen/hypervisor.h>
     3.7 -
     3.8 -#if 0
     3.9 -static __inline__ int HYPERVISOR_console_write(const char *str, int count)
    3.10 -{
    3.11 -	int ret;
    3.12 -	__asm__ __volatile__ (
    3.13 -		TRAP_INSTR
    3.14 -		: "=a" (ret) : "0" (__HYPERVISOR_console_write), 
    3.15 -		"b" (str), "c" (count) : "memory" );
    3.16 -
    3.17 -
    3.18 -	return ret;
    3.19 -}
    3.20 -#endif
    3.21 -
    3.22 -#if 01
    3.23 -void
    3.24 -xen_puts(const char *str)
    3.25 -{
    3.26 -
    3.27 -	(void)HYPERVISOR_console_io(CONSOLEIO_write, strlen(str), (char *)str);
    3.28 -}
    3.29 -
    3.30 -asmlinkage int CLPRINTK(const char *fmt, ...)
    3.31 -{
    3.32 -	va_list args;
    3.33 -	int printk_len;
    3.34 -	static char printk_buf[1024+1];
    3.35 -    
    3.36 -	/* Emit the output into the temporary buffer */
    3.37 -	va_start(args, fmt);
    3.38 -	printk_len = vsnprintf(printk_buf, sizeof(printk_buf)-1, fmt, args);
    3.39 -	va_end(args);
    3.40 -
    3.41 -	printk_buf[printk_len] = 0;
    3.42 -	/* Send the processed output directly to Xen. */
    3.43 -	(void)HYPERVISOR_console_io(CONSOLEIO_write, printk_len, printk_buf);
    3.44 -
    3.45 -	return 0;
    3.46 -}
    3.47 -#endif