direct-io.hg

changeset 1798:385beaa7e2db

bitkeeper revision 1.1092 (40f58b91EPi_jnua2Uu_mG3PqibC8w)

more parts of:
- Include Linux 2.6 in top-level Makefile
- Enable module support in 2.6
author cl349@freefall.cl.cam.ac.uk
date Wed Jul 14 19:37:53 2004 +0000 (2004-07-14)
parents 7935be64296b
children d649c3c63b9c
files linux-2.6.7-xen-sparse/arch/xen/Makefile linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile
line diff
     1.1 --- a/linux-2.6.7-xen-sparse/arch/xen/Makefile	Wed Jul 14 19:34:30 2004 +0000
     1.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/Makefile	Wed Jul 14 19:37:53 2004 +0000
     1.3 @@ -52,12 +52,20 @@ all: vmlinuz
     1.4  vmlinuz: vmlinux
     1.5  	$(Q)$(MAKE) $(build)=arch/xen/boot vmlinuz
     1.6  
     1.7 +INSTALL_NAME ?= $(KERNELRELEASE)
     1.8 +install: vmlinuz
     1.9 +	mkdir -p $(INSTALL_PATH)/boot
    1.10 +	install -m0644 vmlinuz $(INSTALL_PATH)/boot/vmlinuz-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    1.11 +	install -m0644 vmlinux $(INSTALL_PATH)/boot/vmlinux-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    1.12 +	install -m0664 .config $(INSTALL_PATH)/boot/config-$(INSTALL_NAME)$(INSTALL_SUFFIX)
    1.13 +
    1.14  archclean:
    1.15  	@if [ -e arch/xen/arch ]; then $(MAKE) $(clean)=arch/xen/arch; fi;
    1.16  	@rm -f arch/xen/arch include/.asm-ignore include/asm-xen/asm
    1.17  
    1.18  define archhelp
    1.19    echo  '* vmlinuz	- Compressed kernel image'
    1.20 +  echo  '  install	- Install kernel image and config file'
    1.21  endef
    1.22  
    1.23  ifneq ($(XENARCH),)
     2.1 --- a/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU	Wed Jul 14 19:34:30 2004 +0000
     2.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU	Wed Jul 14 19:37:53 2004 +0000
     2.3 @@ -37,7 +37,12 @@ CONFIG_IOSCHED_CFQ=y
     2.4  #
     2.5  # Loadable module support
     2.6  #
     2.7 -# CONFIG_MODULES is not set
     2.8 +CONFIG_MODULES=y
     2.9 +CONFIG_MODULE_UNLOAD=y
    2.10 +# CONFIG_MODULE_FORCE_UNLOAD is not set
    2.11 +CONFIG_OBSOLETE_MODPARM=y
    2.12 +# CONFIG_MODVERSIONS is not set
    2.13 +CONFIG_KMOD=y
    2.14  CONFIG_X86=y
    2.15  # CONFIG_X86_64 is not set
    2.16  
     3.1 --- a/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile	Wed Jul 14 19:34:30 2004 +0000
     3.2 +++ b/linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile	Wed Jul 14 19:37:53 2004 +0000
     3.3 @@ -8,11 +8,12 @@ CFLAGS	+= -Iarch/$(XENARCH)/kernel
     3.4  
     3.5  extra-y := head.o init_task.o vmlinux.lds.s
     3.6  
     3.7 -obj-y	:= traps.o irq.o ldt.o setup.o entry.o time.o process.o signal.o
     3.8 +obj-y	:= traps.o irq.o ldt.o setup.o entry.o time.o process.o signal.o \
     3.9 +		i386_ksyms.o
    3.10  
    3.11  c-obj-y	:= semaphore.o vm86.o \
    3.12  		ptrace.o ioport.o sys_i386.o \
    3.13 -		pci-dma.o i386_ksyms.o i387.o dmi_scan.o bootflag.o \
    3.14 +		pci-dma.o i387.o dmi_scan.o bootflag.o \
    3.15  		doublefault.o
    3.16  s-obj-y	:=
    3.17