ia64/xen-unstable

view xen/arch/ia64/patch/linux-2.6.7/system.h @ 4146:f2d61710e4d9

bitkeeper revision 1.1236.25.24 (42366e9aQ71LQ8uCB-Y1IwVNqx5eqA)

Merge djm@kirby.fc.hp.com://home/djm/src/xen/xeno-unstable-ia64.bk
into sportsman.spdomain:/home/djm/xeno-unstable-ia64.bk
author djm@sportsman.spdomain
date Tue Mar 15 05:11:54 2005 +0000 (2005-03-15)
parents 73f9c9685211 0c846e77cca4
children 48ddf32dad5b
line source
1 --- ../../linux-2.6.7/include/asm-ia64/system.h 2005-01-31 11:15:23.000000000 -0700
2 +++ include/asm-ia64/system.h 2005-03-14 11:31:12.000000000 -0700
3 @@ -24,8 +24,16 @@
4 * 0xa000000000000000+2*PERCPU_PAGE_SIZE
5 * - 0xa000000000000000+3*PERCPU_PAGE_SIZE remain unmapped (guard page)
6 */
7 +#ifdef XEN
8 +//#define KERNEL_START 0xfffc000100000000
9 +#define KERNEL_START 0xfffc000004000000
10 +#define PERCPU_ADDR 0xfffd000000000000-PERCPU_PAGE_SIZE
11 +#define SHAREDINFO_ADDR 0xfffd000000000000
12 +#define VHPT_ADDR 0xfffe000000000000
13 +#else
14 #define KERNEL_START 0xa000000100000000
15 #define PERCPU_ADDR (-PERCPU_PAGE_SIZE)
16 +#endif
18 #ifndef __ASSEMBLY__
20 @@ -218,9 +226,13 @@
21 # define PERFMON_IS_SYSWIDE() (0)
22 #endif
24 +#ifdef XEN
25 +#define IA64_HAS_EXTRA_STATE(t) 0
26 +#else
27 #define IA64_HAS_EXTRA_STATE(t) \
28 ((t)->thread.flags & (IA64_THREAD_DBG_VALID|IA64_THREAD_PM_VALID) \
29 || IS_IA32_PROCESS(ia64_task_regs(t)) || PERFMON_IS_SYSWIDE())
30 +#endif
32 #define __switch_to(prev,next,last) do { \
33 if (IA64_HAS_EXTRA_STATE(prev)) \
34 @@ -249,6 +261,9 @@
35 #else
36 # define switch_to(prev,next,last) __switch_to(prev, next, last)
37 #endif
38 +//#ifdef XEN
39 +//#undef switch_to
40 +//#endif
42 /*
43 * On IA-64, we don't want to hold the runqueue's lock during the low-level context-switch,