ia64/xen-unstable

changeset 4704:4db173f346dd

bitkeeper revision 1.1327.1.12 (4271657dvd6v7i5Y8X39HQ9Fu_LjoQ)

Fix more cleanup oops
author djm@kirby.fc.hp.com
date Thu Apr 28 22:36:45 2005 +0000 (2005-04-28)
parents d061c29af8d7
children a2f72e2d9a86
files .rootkeys xen/arch/ia64/patch/linux-2.6.11/hardirq.h xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h xen/arch/ia64/tools/mkbuildtree
line diff
     1.1 --- a/.rootkeys	Thu Apr 28 22:24:03 2005 +0000
     1.2 +++ b/.rootkeys	Thu Apr 28 22:36:45 2005 +0000
     1.3 @@ -1084,6 +1084,7 @@ 425ae516skiHBZU-Kfwxv2YWXfNRWQ xen/arch/
     1.4  425ae516maKAsHBJVSzs19cdRgt3Nw xen/arch/ia64/patch/linux-2.6.11/cpumask.h
     1.5  425ae516cGqvMzGtihTEsQXAXsuOhQ xen/arch/ia64/patch/linux-2.6.11/efi.c
     1.6  425ae516Y1A4q4_Kfre3qnDj7lbHJg xen/arch/ia64/patch/linux-2.6.11/entry.S
     1.7 +425ae516txAP-owjzpTJ7ThfzWR8nw xen/arch/ia64/patch/linux-2.6.11/hardirq.h
     1.8  425ae516PDO1ESDHXHVeDNvlqUfmdQ xen/arch/ia64/patch/linux-2.6.11/head.S
     1.9  425ae516JR7HWvt1zxJ-wLvEWmJGgg xen/arch/ia64/patch/linux-2.6.11/hpsim_ssc.h
    1.10  425ae516AHRNmaVuZjJY-9YjmKRDqg xen/arch/ia64/patch/linux-2.6.11/interrupt.h
    1.11 @@ -1092,7 +1093,6 @@ 425ae516GGRmXijPBLC5ii6yWOn0rg xen/arch/
    1.12  425ae516qQA5dHuIybqfN3nEzM_Zvg xen/arch/ia64/patch/linux-2.6.11/ivt.S
    1.13  425ae516atiECmpn_6nZDw4kkmbJ6g xen/arch/ia64/patch/linux-2.6.11/kregs.h
    1.14  425ae516lwlYwHG1Jv93kC3tfU5caw xen/arch/ia64/patch/linux-2.6.11/lds.S
    1.15 -425ae516txAP-owjzpTJ7ThfzWR8nw xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h
    1.16  425ae516Je2zI-Iw30_uGhvUYdlCZQ xen/arch/ia64/patch/linux-2.6.11/mca_asm.h
    1.17  425ae5160-9wHxh0tOnIjavEjt6W0A xen/arch/ia64/patch/linux-2.6.11/minstate.h
    1.18  425ae516N7SaORdbodDr90tmtCzYXw xen/arch/ia64/patch/linux-2.6.11/mm_contig.c
     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h	Thu Apr 28 22:36:45 2005 +0000
     2.3 @@ -0,0 +1,14 @@
     2.4 +--- ../../linux-2.6.11/include/linux/hardirq.h	2005-03-02 00:38:00.000000000 -0700
     2.5 ++++ include/asm-ia64/linux/hardirq.h	2005-04-28 16:34:39.000000000 -0600
     2.6 +@@ -60,7 +60,11 @@
     2.7 +  */
     2.8 + #define in_irq()		(hardirq_count())
     2.9 + #define in_softirq()		(softirq_count())
    2.10 ++#ifndef XEN
    2.11 + #define in_interrupt()		(irq_count())
    2.12 ++#else
    2.13 ++#define in_interrupt()		0		// FIXME LATER
    2.14 ++#endif
    2.15 + 
    2.16 + #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
    2.17 + # define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
     3.1 --- a/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h	Thu Apr 28 22:24:03 2005 +0000
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,29 +0,0 @@
     3.4 - hardirq.h |    6 ++++++
     3.5 - 1 files changed, 6 insertions(+)
     3.6 -
     3.7 -Index: linux-2.6.11-xendiffs/include/linux/hardirq.h
     3.8 -===================================================================
     3.9 ---- linux-2.6.11-xendiffs.orig/include/linux/hardirq.h	2005-03-02 01:38:00.000000000 -0600
    3.10 -+++ linux-2.6.11-xendiffs/include/linux/hardirq.h	2005-03-25 08:49:57.301998663 -0600
    3.11 -@@ -2,7 +2,9 @@
    3.12 - #define LINUX_HARDIRQ_H
    3.13 - 
    3.14 - #include <linux/config.h>
    3.15 -+#ifndef XEN
    3.16 - #include <linux/smp_lock.h>
    3.17 -+#endif
    3.18 - #include <asm/hardirq.h>
    3.19 - #include <asm/system.h>
    3.20 - 
    3.21 -@@ -60,7 +62,11 @@
    3.22 -  */
    3.23 - #define in_irq()		(hardirq_count())
    3.24 - #define in_softirq()		(softirq_count())
    3.25 -+#ifndef XEN
    3.26 - #define in_interrupt()		(irq_count())
    3.27 -+#else
    3.28 -+#define in_interrupt()		0		// FIXME LATER
    3.29 -+#endif
    3.30 - 
    3.31 - #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
    3.32 - # define in_atomic()	((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
     4.1 --- a/xen/arch/ia64/tools/mkbuildtree	Thu Apr 28 22:24:03 2005 +0000
     4.2 +++ b/xen/arch/ia64/tools/mkbuildtree	Thu Apr 28 22:36:45 2005 +0000
     4.3 @@ -90,8 +90,7 @@ cp_patch arch/ia64/kernel/ivt.S arch/ia6
     4.4  cp_patch arch/ia64/kernel/setup.c arch/ia64/setup.c setup.c
     4.5  cp_patch arch/ia64/kernel/time.c arch/ia64/time.c time.c
     4.6  cp_patch arch/ia64/kernel/unaligned.c arch/ia64/unaligned.c unaligned.c
     4.7 -#cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S
     4.8 -softlink arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S
     4.9 +cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S
    4.10  
    4.11  #cp_patch mm/bootmem.c arch/ia64/mm_bootmem.c mm_bootmem.c
    4.12  #cp_patch mm/page_alloc.c arch/ia64/page_alloc.c page_alloc.c
    4.13 @@ -174,7 +173,8 @@ cp_patch arch/ia64/hp/sim/hpsim_ssc.h in
    4.14  softlink include/asm-ia64/current.h include/asm-ia64/current.h
    4.15  #cp_patch include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h gcc_intrin.h
    4.16  softlink include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h
    4.17 -cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h
    4.18 +#cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h
    4.19 +softlink include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h
    4.20  #cp_patch include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h hw_irq.h
    4.21  softlink include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h
    4.22  #cp_patch include/asm-ia64/ide.h include/asm-ia64/ide.h ide.h
    4.23 @@ -268,8 +268,7 @@ cp_patch include/linux/cpumask.h include
    4.24  softlink include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h
    4.25  #cp_patch include/linux/efi.h include/asm-ia64/linux/efi.h efi.h
    4.26  softlink include/linux/efi.h include/asm-ia64/linux/efi.h
    4.27 -#cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h linuxhardirq.h
    4.28 -softlink include/linux/hardirq.h include/asm-ia64/linux/hardirq.h
    4.29 +cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h hardirq.h
    4.30  #cp_patch include/linux/init_task.h include/asm-ia64/linux/init_task.h init_task.h
    4.31  cp_patch include/linux/interrupt.h include/asm-ia64/linux/interrupt.h interrupt.h
    4.32  #cp_patch include/linux/mmzone.h include/asm-ia64/linux/mmzone.h mmzone.h