mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
bitkeeper revision 1.1091 (40f58ac6eLKaEJtnDFS9xLtppLW3OA)
Merge freefall.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk into freefall.cl.cam.ac.uk:/local/scratch/cl349/xeno.bk-prist
This commit is contained in:
commit
92de14c2c2
4 files changed
+243
-4
No files matched your search
@@ -155,7 +155,7 @@
|
||||
40f56237utH41NPukqHksuNf29IC9A linux-2.6.7-xen-sparse/arch/xen/Kconfig.drivers
|
||||
40f56237penAAlWVBVDpeQZNFIg8CA linux-2.6.7-xen-sparse/arch/xen/Makefile
|
||||
40f56237JTc60m1FRlUxkUaGSQKrNw linux-2.6.7-xen-sparse/arch/xen/boot/Makefile
|
||||
40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.7-xen-sparse/arch/xen/defconfig
|
||||
40f56237wubfjJKlfIzZlI3ZM2VgGA linux-2.6.7-xen-sparse/arch/xen/defconfig-xenU
|
||||
40f56237Mta0yHNaMS_qtM2rge0qYA linux-2.6.7-xen-sparse/arch/xen/i386/Kconfig
|
||||
40f56238u2CJdXNpjsZgHBxeVyY-2g linux-2.6.7-xen-sparse/arch/xen/i386/Makefile
|
||||
40f56238eczveJ86k_4hNxCLRQIF-g linux-2.6.7-xen-sparse/arch/xen/i386/kernel/Makefile
|
||||
@@ -164,6 +164,7 @@
|
||||
40f56238XDtHSijkAFlbv1PT8Bhw_Q linux-2.6.7-xen-sparse/arch/xen/i386/kernel/entry.S
|
||||
40f56238xFQe9T7M_U_FItM-bZIpLw linux-2.6.7-xen-sparse/arch/xen/i386/kernel/evtchn.c
|
||||
40f56238bnvciAuyzAiMkdzGErYt1A linux-2.6.7-xen-sparse/arch/xen/i386/kernel/head.S
|
||||
40f58a0d31M2EkuPbG94ns_nOi0PVA linux-2.6.7-xen-sparse/arch/xen/i386/kernel/i386_ksyms.c
|
||||
40f562382aC3_Gt4RG-4ZsfvDRUg3Q linux-2.6.7-xen-sparse/arch/xen/i386/kernel/irq.c
|
||||
40f56238ue3YRsK52HG7iccNzP1AwQ linux-2.6.7-xen-sparse/arch/xen/i386/kernel/ldt.c
|
||||
40f56238a8iOVDEoostsbun_sy2i4g linux-2.6.7-xen-sparse/arch/xen/i386/kernel/process.c
|
||||
|
||||
@@ -25,8 +25,9 @@ dist: all
|
||||
$(MAKE) linux-xenU
|
||||
$(MAKE) linux-xen0
|
||||
|
||||
LINUX_VER ?= $(shell ( /bin/ls -ld linux-*-xen-sparse ) 2>/dev/null | \
|
||||
sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
|
||||
LINUX_RELEASE ?= 2.4
|
||||
LINUX_VER ?= $(shell ( /bin/ls -ld linux-$(LINUX_RELEASE).*-xen-sparse ) 2>/dev/null | \
|
||||
sed -e 's!^.*linux-\(.\+\)-xen-sparse!\1!' )
|
||||
LINUX_CONFIG_DIR ?= $(INSTALL_DIR)/boot
|
||||
LINUX_SRC_PATH ?= .:..
|
||||
LINUX_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(LINUX_SRC_PATH)),\
|
||||
@@ -36,7 +37,7 @@ LINUX_SRC ?= $(firstword $(foreach dir,$(subst :, ,$(LINUX_SRC_PATH)),\
|
||||
pristine-linux-src:
|
||||
ifeq ($(LINUX_SRC),)
|
||||
@echo "Cannot find linux-$(LINUX_VER).tar.gz in path $(LINUX_SRC_PATH)"
|
||||
@wget http://www.kernel.org/pub/linux/kernel/v2.4/linux-$(LINUX_VER).tar.bz2 -O./linux-$(LINUX_VER).tar.bz2
|
||||
@wget http://www.kernel.org/pub/linux/kernel/v$(LINUX_RELEASE)/linux-$(LINUX_VER).tar.bz2 -O./linux-$(LINUX_VER).tar.bz2
|
||||
LINUX_SRC := ./linux-$(LINUX_VER).tar.bz2
|
||||
endif
|
||||
|
||||
@@ -48,6 +49,7 @@ patches/ebtables-brnf-5_vs_2.4.25.diff:
|
||||
LINUX_TREES := linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
|
||||
|
||||
# make a linux-xen build tree from a pristine kernel plus sparse tree
|
||||
ifeq ($(LINUX_RELEASE),2.4)
|
||||
mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src
|
||||
$(RM) -rf $(LINUX_TREES)
|
||||
echo $(LINUX_SRC) | grep -q bz2 && \
|
||||
@@ -58,9 +60,19 @@ mk-linux-trees: patches/ebtables-brnf-5_vs_2.4.25.diff pristine-linux-src
|
||||
cp -al linux-$(LINUX_VER)-xen0 linux-$(LINUX_VER)-xenU
|
||||
( cd linux-$(LINUX_VER)-xen0 ; \
|
||||
patch -p1 -F3 < ../patches/ebtables-brnf-5_vs_2.4.25.diff )
|
||||
else
|
||||
mk-linux-trees: pristine-linux-src
|
||||
$(RM) -rf $(LINUX_TREES)
|
||||
echo $(LINUX_SRC) | grep -q bz2 && \
|
||||
tar -jxf $(LINUX_SRC) || tar -zxf $(LINUX_SRC)
|
||||
mv linux-$(LINUX_VER) linux-$(LINUX_VER)-xenU
|
||||
( cd linux-$(LINUX_VER)-xen-sparse ; \
|
||||
./mkbuildtree ../linux-$(LINUX_VER)-xenU )
|
||||
endif
|
||||
|
||||
# configure the specified linux tree
|
||||
CDIR = $(subst config-,linux-$(LINUX_VER)-,$@)
|
||||
ifeq ($(LINUX_RELEASE),2.4)
|
||||
config-xen%:
|
||||
$(MAKE) -C $(CDIR) ARCH=xen mrproper
|
||||
cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
|
||||
@@ -68,6 +80,17 @@ config-xen%:
|
||||
$(MAKE) -C $(CDIR) ARCH=xen $(subst config-,,$@)_config
|
||||
$(MAKE) -C $(CDIR) ARCH=xen oldconfig
|
||||
$(MAKE) -C $(CDIR) ARCH=xen dep
|
||||
else
|
||||
config-xen%:
|
||||
$(MAKE) -C $(CDIR) ARCH=xen mrproper
|
||||
@[ -e $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) ] \
|
||||
&& cp $(LINUX_CONFIG_DIR)/config-$(LINUX_VER)-$(subst config-,,$@) \
|
||||
$(CDIR)/.config || true
|
||||
@[ -e $(CDIR)/arch/xen/defconfig ] || cp \
|
||||
$(CDIR)/arch/xen/defconfig-$(subst config-,,$@) \
|
||||
$(CDIR)/arch/xen/defconfig
|
||||
$(MAKE) -C $(CDIR) ARCH=xen oldconfig
|
||||
endif
|
||||
|
||||
# build the specified linux tree
|
||||
BDIR = $(subst linux-,linux-$(LINUX_VER)-,$@)
|
||||
@@ -89,6 +112,11 @@ world:
|
||||
$(MAKE) config-xen0
|
||||
$(MAKE) linux-xen0
|
||||
|
||||
linux26:
|
||||
$(MAKE) LINUX_RELEASE=2.6 mk-linux-trees
|
||||
$(MAKE) LINUX_RELEASE=2.6 config-xenU
|
||||
$(MAKE) LINUX_RELEASE=2.6 linux-xenU
|
||||
|
||||
|
||||
clean: delete-symlinks
|
||||
$(MAKE) -C xen clean
|
||||
|
||||
File renamed without changes.
@@ -0,0 +1,210 @@
|
||||
#include <linux/config.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/smp.h>
|
||||
#include <linux/user.h>
|
||||
#include <linux/elfcore.h>
|
||||
#include <linux/mca.h>
|
||||
#include <linux/sched.h>
|
||||
#include <linux/in6.h>
|
||||
#include <linux/interrupt.h>
|
||||
#include <linux/smp_lock.h>
|
||||
#include <linux/pm.h>
|
||||
#include <linux/pci.h>
|
||||
#include <linux/apm_bios.h>
|
||||
#include <linux/kernel.h>
|
||||
#include <linux/string.h>
|
||||
#include <linux/tty.h>
|
||||
#include <linux/highmem.h>
|
||||
#include <linux/time.h>
|
||||
|
||||
#include <asm/semaphore.h>
|
||||
#include <asm/processor.h>
|
||||
#include <asm/i387.h>
|
||||
#include <asm/uaccess.h>
|
||||
#include <asm/checksum.h>
|
||||
#include <asm/io.h>
|
||||
#include <asm/hardirq.h>
|
||||
#include <asm/delay.h>
|
||||
#include <asm/irq.h>
|
||||
#include <asm/mmx.h>
|
||||
#include <asm/desc.h>
|
||||
#include <asm/pgtable.h>
|
||||
#include <asm/pgalloc.h>
|
||||
#include <asm/tlbflush.h>
|
||||
#include <asm/nmi.h>
|
||||
#include <asm/ist.h>
|
||||
|
||||
extern void dump_thread(struct pt_regs *, struct user *);
|
||||
extern spinlock_t rtc_lock;
|
||||
|
||||
/* This is definitely a GPL-only symbol */
|
||||
EXPORT_SYMBOL_GPL(cpu_gdt_table);
|
||||
|
||||
#if defined(CONFIG_APM_MODULE)
|
||||
extern void machine_real_restart(unsigned char *, int);
|
||||
EXPORT_SYMBOL(machine_real_restart);
|
||||
extern void default_idle(void);
|
||||
EXPORT_SYMBOL(default_idle);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
extern void FASTCALL( __write_lock_failed(rwlock_t *rw));
|
||||
extern void FASTCALL( __read_lock_failed(rwlock_t *rw));
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_BLK_DEV_IDE) || defined(CONFIG_BLK_DEV_HD) || defined(CONFIG_BLK_DEV_IDE_MODULE) || defined(CONFIG_BLK_DEV_HD_MODULE)
|
||||
extern struct drive_info_struct drive_info;
|
||||
EXPORT_SYMBOL(drive_info);
|
||||
#endif
|
||||
|
||||
extern unsigned long cpu_khz;
|
||||
extern unsigned long get_cmos_time(void);
|
||||
|
||||
/* platform dependent support */
|
||||
EXPORT_SYMBOL(boot_cpu_data);
|
||||
EXPORT_SYMBOL(MCA_bus);
|
||||
#ifdef CONFIG_DISCONTIGMEM
|
||||
EXPORT_SYMBOL(node_data);
|
||||
EXPORT_SYMBOL(physnode_map);
|
||||
#endif
|
||||
#ifdef CONFIG_X86_NUMAQ
|
||||
EXPORT_SYMBOL(xquad_portio);
|
||||
#endif
|
||||
EXPORT_SYMBOL(dump_thread);
|
||||
EXPORT_SYMBOL(dump_fpu);
|
||||
EXPORT_SYMBOL(dump_extended_fpu);
|
||||
EXPORT_SYMBOL_GPL(kernel_fpu_begin);
|
||||
EXPORT_SYMBOL(__ioremap);
|
||||
EXPORT_SYMBOL(ioremap_nocache);
|
||||
EXPORT_SYMBOL(iounmap);
|
||||
EXPORT_SYMBOL(enable_irq);
|
||||
EXPORT_SYMBOL(disable_irq);
|
||||
EXPORT_SYMBOL(disable_irq_nosync);
|
||||
EXPORT_SYMBOL(probe_irq_mask);
|
||||
EXPORT_SYMBOL(kernel_thread);
|
||||
EXPORT_SYMBOL(pm_idle);
|
||||
#ifdef CONFIG_APM
|
||||
EXPORT_SYMBOL(pm_power_off);
|
||||
#endif
|
||||
EXPORT_SYMBOL(get_cmos_time);
|
||||
EXPORT_SYMBOL(cpu_khz);
|
||||
EXPORT_SYMBOL(apm_info);
|
||||
|
||||
EXPORT_SYMBOL_NOVERS(__down_failed);
|
||||
EXPORT_SYMBOL_NOVERS(__down_failed_interruptible);
|
||||
EXPORT_SYMBOL_NOVERS(__down_failed_trylock);
|
||||
EXPORT_SYMBOL_NOVERS(__up_wakeup);
|
||||
/* Networking helper routines. */
|
||||
EXPORT_SYMBOL(csum_partial_copy_generic);
|
||||
/* Delay loops */
|
||||
EXPORT_SYMBOL(__ndelay);
|
||||
EXPORT_SYMBOL(__udelay);
|
||||
EXPORT_SYMBOL(__delay);
|
||||
EXPORT_SYMBOL(__const_udelay);
|
||||
|
||||
EXPORT_SYMBOL_NOVERS(__get_user_1);
|
||||
EXPORT_SYMBOL_NOVERS(__get_user_2);
|
||||
EXPORT_SYMBOL_NOVERS(__get_user_4);
|
||||
|
||||
EXPORT_SYMBOL(strpbrk);
|
||||
EXPORT_SYMBOL(strstr);
|
||||
|
||||
EXPORT_SYMBOL(strncpy_from_user);
|
||||
EXPORT_SYMBOL(__strncpy_from_user);
|
||||
EXPORT_SYMBOL(clear_user);
|
||||
EXPORT_SYMBOL(__clear_user);
|
||||
EXPORT_SYMBOL(__copy_from_user_ll);
|
||||
EXPORT_SYMBOL(__copy_to_user_ll);
|
||||
EXPORT_SYMBOL(strnlen_user);
|
||||
|
||||
EXPORT_SYMBOL(dma_alloc_coherent);
|
||||
EXPORT_SYMBOL(dma_free_coherent);
|
||||
|
||||
#ifdef CONFIG_PCI
|
||||
EXPORT_SYMBOL(pcibios_penalize_isa_irq);
|
||||
EXPORT_SYMBOL(pci_mem_start);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_PCI_BIOS
|
||||
EXPORT_SYMBOL(pcibios_set_irq_routing);
|
||||
EXPORT_SYMBOL(pcibios_get_irq_routing_table);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_X86_USE_3DNOW
|
||||
EXPORT_SYMBOL(_mmx_memcpy);
|
||||
EXPORT_SYMBOL(mmx_clear_page);
|
||||
EXPORT_SYMBOL(mmx_copy_page);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_X86_HT
|
||||
EXPORT_SYMBOL(smp_num_siblings);
|
||||
EXPORT_SYMBOL(cpu_sibling_map);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_SMP
|
||||
EXPORT_SYMBOL(cpu_data);
|
||||
EXPORT_SYMBOL(cpu_online_map);
|
||||
EXPORT_SYMBOL(cpu_callout_map);
|
||||
EXPORT_SYMBOL_NOVERS(__write_lock_failed);
|
||||
EXPORT_SYMBOL_NOVERS(__read_lock_failed);
|
||||
|
||||
/* Global SMP stuff */
|
||||
EXPORT_SYMBOL(synchronize_irq);
|
||||
EXPORT_SYMBOL(smp_call_function);
|
||||
|
||||
/* TLB flushing */
|
||||
EXPORT_SYMBOL(flush_tlb_page);
|
||||
EXPORT_SYMBOL_GPL(flush_tlb_all);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_X86_IO_APIC
|
||||
EXPORT_SYMBOL(IO_APIC_get_PCI_irq_vector);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_MCA
|
||||
EXPORT_SYMBOL(machine_id);
|
||||
#endif
|
||||
|
||||
#ifdef CONFIG_VT
|
||||
EXPORT_SYMBOL(screen_info);
|
||||
#endif
|
||||
|
||||
EXPORT_SYMBOL(get_wchan);
|
||||
|
||||
EXPORT_SYMBOL(rtc_lock);
|
||||
|
||||
EXPORT_SYMBOL_GPL(set_nmi_callback);
|
||||
EXPORT_SYMBOL_GPL(unset_nmi_callback);
|
||||
|
||||
#undef memcpy
|
||||
#undef memset
|
||||
#undef memcmp
|
||||
extern void * memset(void *,int,__kernel_size_t);
|
||||
extern void * memcpy(void *,const void *,__kernel_size_t);
|
||||
extern int memcmp(const void *,const void *,__kernel_size_t);
|
||||
EXPORT_SYMBOL_NOVERS(memcpy);
|
||||
EXPORT_SYMBOL_NOVERS(memset);
|
||||
EXPORT_SYMBOL_NOVERS(memcmp);
|
||||
|
||||
#ifdef CONFIG_HAVE_DEC_LOCK
|
||||
EXPORT_SYMBOL(atomic_dec_and_lock);
|
||||
#endif
|
||||
|
||||
extern int is_sony_vaio_laptop;
|
||||
EXPORT_SYMBOL(is_sony_vaio_laptop);
|
||||
|
||||
EXPORT_SYMBOL(__PAGE_KERNEL);
|
||||
|
||||
#ifdef CONFIG_HIGHMEM
|
||||
EXPORT_SYMBOL(kmap);
|
||||
EXPORT_SYMBOL(kunmap);
|
||||
EXPORT_SYMBOL(kmap_atomic);
|
||||
EXPORT_SYMBOL(kunmap_atomic);
|
||||
EXPORT_SYMBOL(kmap_atomic_to_page);
|
||||
#endif
|
||||
|
||||
#if defined(CONFIG_X86_SPEEDSTEP_SMI) || defined(CONFIG_X86_SPEEDSTEP_SMI_MODULE)
|
||||
EXPORT_SYMBOL(ist_info);
|
||||
#endif
|
||||
|
||||
EXPORT_SYMBOL(csum_partial);
|
||||