debuggers.hg

view xen/arch/ia64/patch/linux-2.6.11/system.h @ 4619:5b9e241131fb

bitkeeper revision 1.1329 (42661815u5WPq8d5f4_axi2xWheybA)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xeno-unstable-ia64.bk
author kaf24@firebug.cl.cam.ac.uk
date Wed Apr 20 08:51:33 2005 +0000 (2005-04-20)
parents 58efb3448933
children ba75d06d25c5 79b7835ac75d
line source
1 system.h | 15 +++++++++++++++
2 1 files changed, 15 insertions(+)
4 Index: linux-2.6.11-xendiffs/include/asm-ia64/system.h
5 ===================================================================
6 --- linux-2.6.11-xendiffs.orig/include/asm-ia64/system.h 2005-04-07 10:39:11.066701457 -0500
7 +++ linux-2.6.11-xendiffs/include/asm-ia64/system.h 2005-04-07 10:40:19.540544127 -0500
8 @@ -24,8 +24,16 @@
9 * 0xa000000000000000+2*PERCPU_PAGE_SIZE
10 * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page)
11 */
12 +#ifdef XEN
13 +//#define KERNEL_START 0xf000000100000000
14 +#define KERNEL_START 0xf000000004000000
15 +#define PERCPU_ADDR 0xf100000000000000-PERCPU_PAGE_SIZE
16 +#define SHAREDINFO_ADDR 0xf100000000000000
17 +#define VHPT_ADDR 0xf200000000000000
18 +#else
19 #define KERNEL_START __IA64_UL_CONST(0xa000000100000000)
20 #define PERCPU_ADDR (-PERCPU_PAGE_SIZE)
21 +#endif
23 #ifndef __ASSEMBLY__
25 @@ -218,9 +226,13 @@ extern void ia64_load_extra (struct task
26 # define PERFMON_IS_SYSWIDE() (0)
27 #endif
29 +#ifdef XEN
30 +#define IA64_HAS_EXTRA_STATE(t) 0
31 +#else
32 #define IA64_HAS_EXTRA_STATE(t) \
33 ((t)->thread.flags & (IA64_THREAD_DBG_VALID|IA64_THREAD_PM_VALID) \
34 || IS_IA32_PROCESS(ia64_task_regs(t)) || PERFMON_IS_SYSWIDE())
35 +#endif
37 #define __switch_to(prev,next,last) do { \
38 if (IA64_HAS_EXTRA_STATE(prev)) \
39 @@ -249,6 +261,9 @@ extern void ia64_load_extra (struct task
40 #else
41 # define switch_to(prev,next,last) __switch_to(prev, next, last)
42 #endif
43 +//#ifdef XEN
44 +//#undef switch_to
45 +//#endif
47 /*
48 * On IA-64, we don't want to hold the runqueue's lock during the low-level context-switch,