ia64/xen-unstable
changeset 3235:554487247cb1
bitkeeper revision 1.1159.183.41 (41aededcmCUYLYfyBEnMv0OLICJzVg)
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
Merge scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-2.0-testing.bk
into scramble.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xen-unstable.bk
author | kaf24@scramble.cl.cam.ac.uk |
---|---|
date | Thu Dec 02 09:22:36 2004 +0000 (2004-12-02) |
parents | f2e12f9f7cc8 e48a7b2e78e8 |
children | 5c16d6acb085 |
files | Makefile linux-2.4.28-xen-sparse/arch/xen/kernel/Makefile linux-2.6.9-xen-sparse/arch/xen/kernel/ctrl_if.c |
line diff
1.1 --- a/Makefile Wed Dec 01 13:26:07 2004 +0000 1.2 +++ b/Makefile Thu Dec 02 09:22:36 2004 +0000 1.3 @@ -19,10 +19,30 @@ export INSTALL_DIR 1.4 include buildconfigs/Rules.mk 1.5 1.6 .PHONY: all dist install xen tools kernels docs world clean mkpatches mrproper 1.7 -.PHONY: kbuild kdelete kclean 1.8 +.PHONY: kbuild kdelete kclean install_tools install_xen install_docs 1.9 +.PHONY: install_kernel 1.10 1.11 all: dist 1.12 1.13 +# install everything into the standard system directories 1.14 +# NB: install explicitly does not check that everything is up to date! 1.15 +install: install_tools install_xen install_kernels install_docs 1.16 + 1.17 +install_xen: 1.18 + $(MAKE) -C xen install 1.19 + 1.20 +install_tools: 1.21 + $(MAKE) -C tools install 1.22 + 1.23 +install_kernels: 1.24 + $(shell cp -a $(INSTALL_DIR)/boot/* /boot/) 1.25 + $(shell cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/) 1.26 + $(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/) 1.27 + $(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/) 1.28 + 1.29 +install_docs: 1.30 + sh ./docs/check_pkgs && $(MAKE) -C docs install || true 1.31 + 1.32 # build and install everything into local dist directory 1.33 dist: xen tools kernels docs 1.34 install -m0644 ./COPYING $(DIST_DIR) 1.35 @@ -31,17 +51,6 @@ dist: xen tools kernels docs 1.36 mkdir -p $(DIST_DIR)/check 1.37 install -m0755 tools/check/chk tools/check/check_* $(DIST_DIR)/check 1.38 1.39 -# install everything into the standard system directories 1.40 -# NB: install explicitly does not check that everything is up to date! 1.41 -install: 1.42 - $(MAKE) -C xen install 1.43 - $(MAKE) -C tools install 1.44 - $(shell cp -a $(INSTALL_DIR)/boot/* /boot/) 1.45 - $(shell cp -a $(INSTALL_DIR)/lib/modules/* /lib/modules/) 1.46 - sh ./docs/check_pkgs && $(MAKE) -C docs install || true 1.47 - $(shell cp -dR $(INSTALL_DIR)/boot/*$(LINUX_VER)* $(prefix)/boot/) 1.48 - $(shell cp -dR $(INSTALL_DIR)/lib/modules/* $(prefix)/lib/modules/) 1.49 - 1.50 xen: 1.51 $(MAKE) prefix=$(INSTALL_DIR) dist=yes -C xen install 1.52
2.1 --- a/linux-2.4.28-xen-sparse/arch/xen/kernel/Makefile Wed Dec 01 13:26:07 2004 +0000 2.2 +++ b/linux-2.4.28-xen-sparse/arch/xen/kernel/Makefile Thu Dec 02 09:22:36 2004 +0000 2.3 @@ -6,7 +6,7 @@ all: kernel.o head.o init_task.o 2.4 2.5 O_TARGET := kernel.o 2.6 2.7 -export-objs := i386_ksyms.o gnttab.o skbuff.o 2.8 +export-objs := i386_ksyms.o gnttab.o skbuff.o ctrl_if.o 2.9 2.10 obj-y := process.o semaphore.o signal.o entry.o traps.o irq.o \ 2.11 ptrace.o ioport.o ldt.o setup.o time.o sys_i386.o \
3.1 --- a/linux-2.6.9-xen-sparse/arch/xen/kernel/ctrl_if.c Wed Dec 01 13:26:07 2004 +0000 3.2 +++ b/linux-2.6.9-xen-sparse/arch/xen/kernel/ctrl_if.c Thu Dec 02 09:22:36 2004 +0000 3.3 @@ -35,6 +35,7 @@ 3.4 #include <linux/errno.h> 3.5 #include <linux/irq.h> 3.6 #include <linux/interrupt.h> 3.7 +#include <linux/module.h> 3.8 #include <asm-xen/ctrl_if.h> 3.9 #include <asm-xen/evtchn.h> 3.10 3.11 @@ -541,3 +542,10 @@ void ctrl_if_discard_responses(void) 3.12 ctrl_if_tx_resp_cons = get_ctrl_if()->tx_resp_prod; 3.13 } 3.14 3.15 +EXPORT_SYMBOL(ctrl_if_send_message_noblock); 3.16 +EXPORT_SYMBOL(ctrl_if_send_message_block); 3.17 +EXPORT_SYMBOL(ctrl_if_send_message_and_get_response); 3.18 +EXPORT_SYMBOL(ctrl_if_enqueue_space_callback); 3.19 +EXPORT_SYMBOL(ctrl_if_send_response); 3.20 +EXPORT_SYMBOL(ctrl_if_register_receiver); 3.21 +EXPORT_SYMBOL(ctrl_if_unregister_receiver);