[Xen-changelog] Fix more cleanup oops

[BitKeeper Bot <riel@xxxxxxxxxxx>]

ChangeSet 1.1327.1.12, 2005/04/28 16:36:45-06:00, djm@xxxxxxxxxxxxxxx

        Fix more cleanup oops



 b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h    |    9 +++++++
 b/xen/arch/ia64/tools/mkbuildtree               |    9 +++----
 xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h |   28 ------------------------
 3 files changed, 13 insertions(+), 33 deletions(-)


diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/hardirq.h 
b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h
--- /dev/null   Wed Dec 31 16:00:00 196900
+++ b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h        2005-05-03 04:05:28 
-04:00
@@ -0,0 +1,14 @@
+--- ../../linux-2.6.11/include/linux/hardirq.h 2005-03-02 00:38:00.000000000 
-0700
++++ include/asm-ia64/linux/hardirq.h   2005-04-28 16:34:39.000000000 -0600
+@@ -60,7 +60,11 @@
+  */
+ #define in_irq()              (hardirq_count())
+ #define in_softirq()          (softirq_count())
++#ifndef XEN
+ #define in_interrupt()                (irq_count())
++#else
++#define in_interrupt()                0               // FIXME LATER
++#endif
+ 
+ #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
+ # define in_atomic()  ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h 
b/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h
--- a/xen/arch/ia64/patch/linux-2.6.11/linuxhardirq.h   2005-05-03 04:05:28 
-04:00
+++ /dev/null   Wed Dec 31 16:00:00 196900
@@ -1,29 +0,0 @@
- hardirq.h |    6 ++++++
- 1 files changed, 6 insertions(+)
-
-Index: linux-2.6.11-xendiffs/include/linux/hardirq.h
-===================================================================
---- linux-2.6.11-xendiffs.orig/include/linux/hardirq.h 2005-03-02 
01:38:00.000000000 -0600
-+++ linux-2.6.11-xendiffs/include/linux/hardirq.h      2005-03-25 
08:49:57.301998663 -0600
-@@ -2,7 +2,9 @@
- #define LINUX_HARDIRQ_H
- 
- #include <linux/config.h>
-+#ifndef XEN
- #include <linux/smp_lock.h>
-+#endif
- #include <asm/hardirq.h>
- #include <asm/system.h>
- 
-@@ -60,7 +62,11 @@
-  */
- #define in_irq()              (hardirq_count())
- #define in_softirq()          (softirq_count())
-+#ifndef XEN
- #define in_interrupt()                (irq_count())
-+#else
-+#define in_interrupt()                0               // FIXME LATER
-+#endif
- 
- #if defined(CONFIG_PREEMPT) && !defined(CONFIG_PREEMPT_BKL)
- # define in_atomic()  ((preempt_count() & ~PREEMPT_ACTIVE) != kernel_locked())
diff -Nru a/xen/arch/ia64/tools/mkbuildtree b/xen/arch/ia64/tools/mkbuildtree
--- a/xen/arch/ia64/tools/mkbuildtree   2005-05-03 04:05:28 -04:00
+++ b/xen/arch/ia64/tools/mkbuildtree   2005-05-03 04:05:28 -04:00
@@ -90,8 +90,7 @@
 cp_patch arch/ia64/kernel/setup.c arch/ia64/setup.c setup.c
 cp_patch arch/ia64/kernel/time.c arch/ia64/time.c time.c
 cp_patch arch/ia64/kernel/unaligned.c arch/ia64/unaligned.c unaligned.c
-#cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S
-softlink arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S
+cp_patch arch/ia64/kernel/vmlinux.lds.S arch/ia64/xen.lds.S lds.S
 
 #cp_patch mm/bootmem.c arch/ia64/mm_bootmem.c mm_bootmem.c
 #cp_patch mm/page_alloc.c arch/ia64/page_alloc.c page_alloc.c
@@ -174,7 +173,8 @@
 softlink include/asm-ia64/current.h include/asm-ia64/current.h
 #cp_patch include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h 
gcc_intrin.h
 softlink include/asm-ia64/gcc_intrin.h include/asm-ia64/gcc_intrin.h
-cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h
+#cp_patch include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h hardirq.h
+softlink include/asm-ia64/hardirq.h include/asm-ia64/hardirq.h
 #cp_patch include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h hw_irq.h
 softlink include/asm-ia64/hw_irq.h include/asm-ia64/hw_irq.h
 #cp_patch include/asm-ia64/ide.h include/asm-ia64/ide.h ide.h
@@ -268,8 +268,7 @@
 softlink include/linux/dma-mapping.h include/asm-ia64/linux/dma-mapping.h
 #cp_patch include/linux/efi.h include/asm-ia64/linux/efi.h efi.h
 softlink include/linux/efi.h include/asm-ia64/linux/efi.h
-#cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h 
linuxhardirq.h
-softlink include/linux/hardirq.h include/asm-ia64/linux/hardirq.h
+cp_patch include/linux/hardirq.h include/asm-ia64/linux/hardirq.h hardirq.h
 #cp_patch include/linux/init_task.h include/asm-ia64/linux/init_task.h 
init_task.h
 cp_patch include/linux/interrupt.h include/asm-ia64/linux/interrupt.h 
interrupt.h
 #cp_patch include/linux/mmzone.h include/asm-ia64/linux/mmzone.h mmzone.h

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog