direct-io.hg

changeset 5636:88a7a299d927

Manual merge.
author cl349@firebug.cl.cam.ac.uk
date Fri Jul 01 14:32:22 2005 +0000 (2005-07-01)
parents cb3da7250118 43e2d33fc5d9
children f5aaeb5688cf
files linux-2.6.11-xen-sparse/drivers/xen/xenbus/xenbus_probe.c xen/Makefile xen/drivers/char/Makefile
line diff
     2.1 --- a/xen/Makefile	Fri Jul 01 14:31:22 2005 +0000
     2.2 +++ b/xen/Makefile	Fri Jul 01 14:32:22 2005 +0000
     2.3 @@ -67,9 +67,12 @@ endif
     2.4  	$(MAKE) -C arch/$(TARGET_ARCH)
     2.5  
     2.6  # drivers/char/console.o contains static banner/compile info. Blow it away.
     2.7 +# Don't refresh these files during e.g., 'sudo make install'
     2.8  delete-unfresh-files:
     2.9 -	rm -f include/xen/banner.h include/xen/compile.h drivers/char/console.o
    2.10 -	$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files
    2.11 +	@if [ ! -r include/xen/compile.h -o -O include/xen/compile.h ]; then \
    2.12 +		rm -f include/xen/{banner,compile}.h; \
    2.13 +		$(MAKE) -C arch/$(TARGET_ARCH) delete-unfresh-files; \
    2.14 +	fi
    2.15  
    2.16  # acm_policy.h contains security policy for Xen
    2.17  include/xen/acm_policy.h:
     3.1 --- a/xen/drivers/char/Makefile	Fri Jul 01 14:31:22 2005 +0000
     3.2 +++ b/xen/drivers/char/Makefile	Fri Jul 01 14:32:22 2005 +0000
     3.3 @@ -7,3 +7,5 @@ driver.o: $(OBJS)
     3.4  
     3.5  clean:
     3.6  	rm -f *.o *~ core
     3.7 +
     3.8 +console.o: $(BASEDIR)/include/xen/compile.h