ChangeSet 1.1327.1.11, 2005/04/28 16:24:03-06:00, djm@xxxxxxxxxxxxxxx
More code cleanup
b/xen/arch/ia64/Makefile | 2
b/xen/arch/ia64/patch/linux-2.6.11/mm_contig.c | 99 +++++-------------------
b/xen/arch/ia64/patch/linux-2.6.11/unaligned.c | 83 ++------------------
b/xen/arch/ia64/tools/mkbuildtree | 6 -
b/xen/arch/ia64/xenmem.c | 67 ++++++++++++++++
b/xen/arch/ia64/xenmisc.c | 34 ++++++++
xen/arch/ia64/patch/linux-2.6.11/current.h | 21 -----
xen/arch/ia64/patch/linux-2.6.11/hardirq.h | 14 ---
xen/arch/ia64/patch/linux-2.6.11/hpsim_irq.c | 40 ---------
xen/arch/ia64/patch/linux-2.6.11/irq.h | 22 -----
xen/arch/ia64/patch/linux-2.6.11/kernel-time.c | 42 ----------
xen/arch/ia64/patch/linux-2.6.11/linuxextable.c | 15 ---
xen/arch/ia64/patch/linux-2.6.11/linuxtime.h | 35 --------
xen/arch/ia64/patch/linux-2.6.11/mmzone.h | 18 ----
xen/arch/ia64/patch/linux-2.6.11/sal.h | 38 ---------
xen/arch/ia64/patch/linux-2.6.11/slab.h | 18 ----
xen/arch/ia64/patch/linux-2.6.11/wait.h | 34 --------
17 files changed, 139 insertions(+), 449 deletions(-)
diff -Nru a/xen/arch/ia64/Makefile b/xen/arch/ia64/Makefile
--- a/xen/arch/ia64/Makefile 2005-05-03 04:05:09 -04:00
+++ b/xen/arch/ia64/Makefile 2005-05-03 04:05:09 -04:00
@@ -6,7 +6,7 @@
xenmisc.o pdb-stub.o acpi.o hypercall.o \
machvec.o dom0_ops.o domain.o \
idle0_task.o pal.o hpsim.o efi.o efi_stub.o ivt.o mm_contig.o \
- sal.o cmdline.o mm_init.o tlb.o smpboot.o \
+ xenmem.o sal.o cmdline.o mm_init.o tlb.o smpboot.o \
extable.o linuxextable.o \
regionreg.o entry.o unaligned.o privop.o vcpu.o \
irq_ia64.o irq_lsapic.o vhpt.o xenasm.o dom_fw.o
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/current.h
b/xen/arch/ia64/patch/linux-2.6.11/current.h
--- a/xen/arch/ia64/patch/linux-2.6.11/current.h 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,22 +0,0 @@
- current.h | 8 ++++++++
- 1 files changed, 8 insertions(+)
-
-Index: linux-2.6.11/include/asm-ia64/current.h
-===================================================================
---- linux-2.6.11.orig/include/asm-ia64/current.h 2005-03-02
01:38:19.000000000 -0600
-+++ linux-2.6.11/include/asm-ia64/current.h 2005-03-19 12:39:41.410955288
-0600
-@@ -12,6 +12,14 @@
- * In kernel mode, thread pointer (r13) is used to point to the current task
- * structure.
- */
-+#ifdef XEN
-+struct domain;
-+#define get_current() ((struct exec_domain *) ia64_getreg(_IA64_REG_TP))
-+#define current get_current()
-+//#define set_current(d) ia64_setreg(_IA64_REG_TP,(void *)d);
-+#define set_current(d) (ia64_r13 = (void *)d)
-+#else
- #define current ((struct task_struct *) ia64_getreg(_IA64_REG_TP))
-+#endif
-
- #endif /* _ASM_IA64_CURRENT_H */
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/hardirq.h
b/xen/arch/ia64/patch/linux-2.6.11/hardirq.h
--- a/xen/arch/ia64/patch/linux-2.6.11/hardirq.h 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,15 +0,0 @@
- hardirq.h | 1 +
- 1 files changed, 1 insertion(+)
-
-Index: linux-2.6.11-xendiffs/include/asm-ia64/hardirq.h
-===================================================================
---- linux-2.6.11-xendiffs.orig/include/asm-ia64/hardirq.h 2005-03-24
15:59:37.210502749 -0600
-+++ linux-2.6.11-xendiffs/include/asm-ia64/hardirq.h 2005-03-24
16:00:19.439540961 -0600
-@@ -20,6 +20,7 @@
- #define __ARCH_IRQ_STAT 1
-
- #define local_softirq_pending()
(local_cpu_data->softirq_pending)
-+#define softirq_pending(cpu) (cpu_data(cpu)->softirq_pending)
-
- #define HARDIRQ_BITS 14
-
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/hpsim_irq.c
b/xen/arch/ia64/patch/linux-2.6.11/hpsim_irq.c
--- a/xen/arch/ia64/patch/linux-2.6.11/hpsim_irq.c 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,41 +0,0 @@
- hpsim_irq.c | 15 +++++++++++++++
- 1 files changed, 15 insertions(+)
-
-Index: linux-2.6.11/arch/ia64/hp/sim/hpsim_irq.c
-===================================================================
---- linux-2.6.11.orig/arch/ia64/hp/sim/hpsim_irq.c 2005-03-02
01:38:33.000000000 -0600
-+++ linux-2.6.11/arch/ia64/hp/sim/hpsim_irq.c 2005-03-19 13:33:57.312014806
-0600
-@@ -9,7 +9,17 @@
- #include <linux/kernel.h>
- #include <linux/sched.h>
- #include <linux/irq.h>
-+#ifdef XEN
-+#include <asm/hw_irq.h>
-+#endif
-
-+#if 1
-+void __init
-+hpsim_irq_init (void)
-+{
-+ printf("*** hpsim_irq_init called: NOT NEEDED?!?!?\n");
-+}
-+#else
- static unsigned int
- hpsim_irq_startup (unsigned int irq)
- {
-@@ -19,6 +29,10 @@ hpsim_irq_startup (unsigned int irq)
- static void
- hpsim_irq_noop (unsigned int irq)
- {
-+#if 1
-+printf("hpsim_irq_noop: irq=%d\n",irq);
-+while(irq);
-+#endif
- }
-
- static void
-@@ -49,3 +63,4 @@ hpsim_irq_init (void)
- idesc->handler = &irq_type_hp_sim;
- }
- }
-+#endif
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/irq.h
b/xen/arch/ia64/patch/linux-2.6.11/irq.h
--- a/xen/arch/ia64/patch/linux-2.6.11/irq.h 2005-05-03 04:05:09 -04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,23 +0,0 @@
- irq.h | 9 +++++++++
- 1 files changed, 9 insertions(+)
-
-Index: linux-2.6.11/include/asm-ia64/irq.h
-===================================================================
---- linux-2.6.11.orig/include/asm-ia64/irq.h 2005-03-02 01:38:33.000000000
-0600
-+++ linux-2.6.11/include/asm-ia64/irq.h 2005-03-19 13:42:27.957677364
-0600
-@@ -30,6 +30,15 @@ extern void disable_irq_nosync (unsigned
- extern void enable_irq (unsigned int);
- extern void set_irq_affinity_info (unsigned int irq, int dest, int redir);
-
-+#ifdef XEN
-+// dup'ed from signal.h to avoid changes to includes
-+#define SA_NOPROFILE 0x02000000
-+#define SA_SHIRQ 0x04000000
-+#define SA_RESTART 0x10000000
-+#define SA_INTERRUPT 0x20000000
-+#define SA_SAMPLE_RANDOM SA_RESTART
-+#endif
-+
- #ifdef CONFIG_SMP
- extern void move_irq(int irq);
- #else
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/kernel-time.c
b/xen/arch/ia64/patch/linux-2.6.11/kernel-time.c
--- a/xen/arch/ia64/patch/linux-2.6.11/kernel-time.c 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,44 +0,0 @@
- time.c | 7 ++++++-
- 1 files changed, 6 insertions(+), 1 deletion(-)
-
-Index: linux-2.6.11/kernel/time.c
-===================================================================
---- linux-2.6.11.orig/kernel/time.c 2005-03-02 01:37:50.000000000 -0600
-+++ linux-2.6.11/kernel/time.c 2005-03-19 14:56:40.767870674 -0600
-@@ -495,6 +495,7 @@ void getnstimeofday (struct timespec *tv
- tv->tv_nsec = nsec;
- }
-
-+#ifndef XEN
- int do_settimeofday (struct timespec *tv)
- {
- time_t wtm_sec, sec = tv->tv_sec;
-@@ -503,7 +504,9 @@ int do_settimeofday (struct timespec *tv
- if ((unsigned long)tv->tv_nsec >= NSEC_PER_SEC)
- return -EINVAL;
-
-+#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
- write_seqlock_irq(&xtime_lock);
-+#endif
- {
- /*
- * This is revolting. We need to set "xtime" correctly.
However, the value
-@@ -525,7 +528,9 @@ int do_settimeofday (struct timespec *tv
- time_esterror = NTP_PHASE_LIMIT;
- time_interpolator_reset();
- }
-+#ifdef TURN_ME_OFF_FOR_NOW_IA64_XEN
- write_sequnlock_irq(&xtime_lock);
-+#endif
- clock_was_set();
- return 0;
- }
-@@ -552,7 +557,7 @@ void do_gettimeofday (struct timeval *tv
- }
-
- EXPORT_SYMBOL(do_gettimeofday);
--
-+#endif
-
- #else
- /*
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/linuxextable.c
b/xen/arch/ia64/patch/linux-2.6.11/linuxextable.c
--- a/xen/arch/ia64/patch/linux-2.6.11/linuxextable.c 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,16 +0,0 @@
- extable.c | 2 ++
- 1 files changed, 2 insertions(+)
-
-Index: linux-2.6.11-xendiffs/kernel/extable.c
-===================================================================
---- linux-2.6.11-xendiffs.orig/kernel/extable.c 2005-03-02
01:37:54.000000000 -0600
-+++ linux-2.6.11-xendiffs/kernel/extable.c 2005-04-08 14:30:46.283360881
-0500
-@@ -20,6 +20,8 @@
- #include <asm/uaccess.h>
- #include <asm/sections.h>
-
-+#define __module_text_address(addr) (NULL)
-+
- extern struct exception_table_entry __start___ex_table[];
- extern struct exception_table_entry __stop___ex_table[];
-
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/linuxtime.h
b/xen/arch/ia64/patch/linux-2.6.11/linuxtime.h
--- a/xen/arch/ia64/patch/linux-2.6.11/linuxtime.h 2005-05-03 04:05:09
-04:00
+++ /dev/null Wed Dec 31 16:00:00 196900
@@ -1,36 +0,0 @@
- time.h | 9 +++++++++
- 1 files changed, 9 insertions(+)
-
-Index: linux-2.6.11/include/linux/time.h
-===================================================================
---- linux-2.6.11.orig/include/linux/time.h 2005-03-02 01:38:12.000000000
-0600
-+++ linux-2.6.11/include/linux/time.h 2005-03-19 13:46:27.987225234 -0600
-@@ -1,11 +1,18 @@
- #ifndef _LINUX_TIME_H
- #define _LINUX_TIME_H
-
-+#ifdef XEN
-+typedef s64 time_t;
-+typedef s64 suseconds_t;
-+#endif
-+
- #include <linux/types.h>
-
-+#ifndef XEN
- #ifdef __KERNEL__
- #include <linux/seqlock.h>
- #endif
-+#endif
-
- #ifndef _STRUCT_TIMESPEC
- #define _STRUCT_TIMESPEC
-@@ -80,7 +87,9 @@ mktime (unsigned int year, unsigned int
-
- extern struct timespec xtime;
- extern struct timespec wall_to_monotonic;
-+#ifndef XEN
- extern seqlock_t xtime_lock;
-+#endif
-
- static inline unsigned long get_seconds(void)
- {
diff -Nru a/xen/arch/ia64/patch/linux-2.6.11/mm_contig.c
b/xen/arch/ia64/patch/linux-2.6.11/mm_contig.c
--- a/xen/arch/ia64/patch/linux-2.6.11/mm_contig.c 2005-05-03 04:05:09
-04:00
+++ b/xen/arch/ia64/patch/linux-2.6.11/mm_contig.c 2005-05-03 04:05:09
-04:00
@@ -1,220 +1,47 @@
- contig.c | 172
+++++++++++++++++----------------------------------------------
- 1 files changed, 48 insertions(+), 124 deletions(-)
-
-Index: linux-2.6.11-xendiffs/arch/ia64/mm/contig.c
-===================================================================
---- linux-2.6.11-xendiffs.orig/arch/ia64/mm/contig.c 2005-04-07
11:02:50.227598140 -0500
-+++ linux-2.6.11-xendiffs/arch/ia64/mm/contig.c 2005-04-07
11:05:21.724931959 -0500
-@@ -15,11 +15,21 @@
- * memory.
_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog
|
Home