1.1 --- a/xen/include/asm-ia64/linux/asm/README.origin	Fri Feb 24 09:41:27 2006 -0700
     1.2 +++ b/xen/include/asm-ia64/linux/asm/README.origin	Fri Feb 24 10:32:27 2006 -0700
     1.3 @@ -46,8 +46,6 @@ scatterlist.h		-> linux/include/asm-ia64
     1.4  sections.h		-> linux/include/asm-ia64/sections.h
     1.5  semaphore.h		-> linux/include/asm-ia64/semaphore.h
     1.6  setup.h			-> linux/include/asm-ia64/setup.h
     1.7 -sigcontext.h		-> linux/include/asm-ia64/sigcontext.h
     1.8 -signal.h		-> linux/include/asm-ia64/signal.h
     1.9  smp.h			-> linux/include/asm-ia64/smp.h
    1.10  string.h		-> linux/include/asm-ia64/string.h
    1.11  thread_info.h		-> linux/include/asm-ia64/thread_info.h

     2.1 --- a/xen/include/asm-ia64/linux/asm/sigcontext.h	Fri Feb 24 09:41:27 2006 -0700
     2.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.3 @@ -1,70 +0,0 @@
     2.4 -#ifndef _ASM_IA64_SIGCONTEXT_H
     2.5 -#define _ASM_IA64_SIGCONTEXT_H
     2.6 -
     2.7 -/*
     2.8 - * Copyright (C) 1998, 1999, 2001 Hewlett-Packard Co
     2.9 - * Copyright (C) 1998, 1999, 2001 David Mosberger-Tang <davidm@hpl.hp.com>
    2.10 - */
    2.11 -
    2.12 -#include <asm/fpu.h>
    2.13 -
    2.14 -#define IA64_SC_FLAG_ONSTACK_BIT		0	/* is handler running on signal stack? */
    2.15 -#define IA64_SC_FLAG_IN_SYSCALL_BIT		1	/* did signal interrupt a syscall? */
    2.16 -#define IA64_SC_FLAG_FPH_VALID_BIT		2	/* is state in f[32]-f[127] valid? */
    2.17 -
    2.18 -#define IA64_SC_FLAG_ONSTACK		(1 << IA64_SC_FLAG_ONSTACK_BIT)
    2.19 -#define IA64_SC_FLAG_IN_SYSCALL		(1 << IA64_SC_FLAG_IN_SYSCALL_BIT)
    2.20 -#define IA64_SC_FLAG_FPH_VALID		(1 << IA64_SC_FLAG_FPH_VALID_BIT)
    2.21 -
    2.22 -# ifndef __ASSEMBLY__
    2.23 -
    2.24 -/*
    2.25 - * Note on handling of register backing store: sc_ar_bsp contains the address that would
    2.26 - * be found in ar.bsp after executing a "cover" instruction the context in which the
    2.27 - * signal was raised.  If signal delivery required switching to an alternate signal stack
    2.28 - * (sc_rbs_base is not NULL), the "dirty" partition (as it would exist after executing the
    2.29 - * imaginary "cover" instruction) is backed by the *alternate* signal stack, not the
    2.30 - * original one.  In this case, sc_rbs_base contains the base address of the new register
    2.31 - * backing store.  The number of registers in the dirty partition can be calculated as:
    2.32 - *
    2.33 - *   ndirty = ia64_rse_num_regs(sc_rbs_base, sc_rbs_base + (sc_loadrs >> 16))
    2.34 - *
    2.35 - */
    2.36 -
    2.37 -struct sigcontext {
    2.38 -	unsigned long		sc_flags;	/* see manifest constants above */
    2.39 -	unsigned long		sc_nat;		/* bit i == 1 iff scratch reg gr[i] is a NaT */
    2.40 -	stack_t			sc_stack;	/* previously active stack */
    2.41 -
    2.42 -	unsigned long		sc_ip;		/* instruction pointer */
    2.43 -	unsigned long		sc_cfm;		/* current frame marker */
    2.44 -	unsigned long		sc_um;		/* user mask bits */
    2.45 -	unsigned long		sc_ar_rsc;	/* register stack configuration register */
    2.46 -	unsigned long		sc_ar_bsp;	/* backing store pointer */
    2.47 -	unsigned long		sc_ar_rnat;	/* RSE NaT collection register */
    2.48 -	unsigned long		sc_ar_ccv;	/* compare and exchange compare value register */
    2.49 -	unsigned long		sc_ar_unat;	/* ar.unat of interrupted context */
    2.50 -	unsigned long		sc_ar_fpsr;	/* floating-point status register */
    2.51 -	unsigned long		sc_ar_pfs;	/* previous function state */
    2.52 -	unsigned long		sc_ar_lc;	/* loop count register */
    2.53 -	unsigned long		sc_pr;		/* predicate registers */
    2.54 -	unsigned long		sc_br[8];	/* branch registers */
    2.55 -	/* Note: sc_gr[0] is used as the "uc_link" member of ucontext_t */
    2.56 -	unsigned long		sc_gr[32];	/* general registers (static partition) */
    2.57 -	struct ia64_fpreg	sc_fr[128];	/* floating-point registers */
    2.58 -
    2.59 -	unsigned long		sc_rbs_base;	/* NULL or new base of sighandler's rbs */
    2.60 -	unsigned long		sc_loadrs;	/* see description above */
    2.61 -
    2.62 -	unsigned long		sc_ar25;	/* cmp8xchg16 uses this */
    2.63 -	unsigned long		sc_ar26;	/* rsvd for scratch use */
    2.64 -	unsigned long		sc_rsvd[12];	/* reserved for future use */
    2.65 -	/*
    2.66 -	 * The mask must come last so we can increase _NSIG_WORDS
    2.67 -	 * without breaking binary compatibility.
    2.68 -	 */
    2.69 -	sigset_t		sc_mask;	/* signal mask to restore after handler returns */
    2.70 -};
    2.71 -
    2.72 -# endif /* __ASSEMBLY__ */
    2.73 -#endif /* _ASM_IA64_SIGCONTEXT_H */

     3.1 --- a/xen/include/asm-ia64/linux/asm/signal.h	Fri Feb 24 09:41:27 2006 -0700
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,166 +0,0 @@
     3.4 -#ifndef _ASM_IA64_SIGNAL_H
     3.5 -#define _ASM_IA64_SIGNAL_H
     3.6 -
     3.7 -/*
     3.8 - * Modified 1998-2001, 2003
     3.9 - *	David Mosberger-Tang <davidm@hpl.hp.com>, Hewlett-Packard Co
    3.10 - *
    3.11 - * Unfortunately, this file is being included by bits/signal.h in
    3.12 - * glibc-2.x.  Hence the #ifdef __KERNEL__ ugliness.
    3.13 - */
    3.14 -
    3.15 -#define SIGHUP		 1
    3.16 -#define SIGINT		 2
    3.17 -#define SIGQUIT		 3
    3.18 -#define SIGILL		 4
    3.19 -#define SIGTRAP		 5
    3.20 -#define SIGABRT		 6
    3.21 -#define SIGIOT		 6
    3.22 -#define SIGBUS		 7
    3.23 -#define SIGFPE		 8
    3.24 -#define SIGKILL		 9
    3.25 -#define SIGUSR1		10
    3.26 -#define SIGSEGV		11
    3.27 -#define SIGUSR2		12
    3.28 -#define SIGPIPE		13
    3.29 -#define SIGALRM		14
    3.30 -#define SIGTERM		15
    3.31 -#define SIGSTKFLT	16
    3.32 -#define SIGCHLD		17
    3.33 -#define SIGCONT		18
    3.34 -#define SIGSTOP		19
    3.35 -#define SIGTSTP		20
    3.36 -#define SIGTTIN		21
    3.37 -#define SIGTTOU		22
    3.38 -#define SIGURG		23
    3.39 -#define SIGXCPU		24
    3.40 -#define SIGXFSZ		25
    3.41 -#define SIGVTALRM	26
    3.42 -#define SIGPROF		27
    3.43 -#define SIGWINCH	28
    3.44 -#define SIGIO		29
    3.45 -#define SIGPOLL		SIGIO
    3.46 -/*
    3.47 -#define SIGLOST		29
    3.48 -*/
    3.49 -#define SIGPWR		30
    3.50 -#define SIGSYS		31
    3.51 -/* signal 31 is no longer "unused", but the SIGUNUSED macro remains for backwards compatibility */
    3.52 -#define	SIGUNUSED	31
    3.53 -
    3.54 -/* These should not be considered constants from userland.  */
    3.55 -#define SIGRTMIN	32
    3.56 -#define SIGRTMAX	_NSIG
    3.57 -
    3.58 -/*
    3.59 - * SA_FLAGS values:
    3.60 - *
    3.61 - * SA_ONSTACK indicates that a registered stack_t will be used.
    3.62 - * SA_INTERRUPT is a no-op, but left due to historical reasons.
    3.63 - * SA_RESTART flag to get restarting signals (which were the default long ago)
    3.64 - * SA_NOCLDSTOP flag to turn off SIGCHLD when children stop.
    3.65 - * SA_RESETHAND clears the handler when the signal is delivered.
    3.66 - * SA_NOCLDWAIT flag on SIGCHLD to inhibit zombies.
    3.67 - * SA_NODEFER prevents the current signal from being masked in the handler.
    3.68 - *
    3.69 - * SA_ONESHOT and SA_NOMASK are the historical Linux names for the Single
    3.70 - * Unix names RESETHAND and NODEFER respectively.
    3.71 - */
    3.72 -#define SA_NOCLDSTOP	0x00000001
    3.73 -#define SA_NOCLDWAIT	0x00000002
    3.74 -#define SA_SIGINFO	0x00000004
    3.75 -#define SA_ONSTACK	0x08000000
    3.76 -#define SA_RESTART	0x10000000
    3.77 -#define SA_NODEFER	0x40000000
    3.78 -#define SA_RESETHAND	0x80000000
    3.79 -
    3.80 -#define SA_NOMASK	SA_NODEFER
    3.81 -#define SA_ONESHOT	SA_RESETHAND
    3.82 -#define SA_INTERRUPT	0x20000000 /* dummy -- ignored */
    3.83 -
    3.84 -#define SA_RESTORER	0x04000000
    3.85 -
    3.86 -/*
    3.87 - * sigaltstack controls
    3.88 - */
    3.89 -#define SS_ONSTACK	1
    3.90 -#define SS_DISABLE	2
    3.91 -
    3.92 -/*
    3.93 - * The minimum stack size needs to be fairly large because we want to
    3.94 - * be sure that an app compiled for today's CPUs will continue to run
    3.95 - * on all future CPU models.  The CPU model matters because the signal
    3.96 - * frame needs to have space for the complete machine state, including
    3.97 - * all physical stacked registers.  The number of physical stacked
    3.98 - * registers is CPU model dependent, but given that the width of
    3.99 - * ar.rsc.loadrs is 14 bits, we can assume that they'll never take up
   3.100 - * more than 16KB of space.
   3.101 - */
   3.102 -#if 1
   3.103 -  /*
   3.104 -   * This is a stupid typo: the value was _meant_ to be 131072 (0x20000), but I typed it
   3.105 -   * in wrong. ;-(  To preserve backwards compatibility, we leave the kernel at the
   3.106 -   * incorrect value and fix libc only.
   3.107 -   */
   3.108 -# define MINSIGSTKSZ	131027	/* min. stack size for sigaltstack() */
   3.109 -#else
   3.110 -# define MINSIGSTKSZ	131072	/* min. stack size for sigaltstack() */
   3.111 -#endif
   3.112 -#define SIGSTKSZ	262144	/* default stack size for sigaltstack() */
   3.113 -
   3.114 -#ifdef __KERNEL__
   3.115 -
   3.116 -#define _NSIG		64
   3.117 -#define _NSIG_BPW	64
   3.118 -#define _NSIG_WORDS	(_NSIG / _NSIG_BPW)
   3.119 -
   3.120 -#define SA_PERCPU_IRQ		0x02000000
   3.121 -
   3.122 -#endif /* __KERNEL__ */
   3.123 -
   3.124 -#include <asm-generic/signal.h>
   3.125 -
   3.126 -# ifndef __ASSEMBLY__
   3.127 -
   3.128 -#  include <linux/types.h>
   3.129 -
   3.130 -/* Avoid too many header ordering problems.  */
   3.131 -struct siginfo;
   3.132 -
   3.133 -typedef struct sigaltstack {
   3.134 -	void __user *ss_sp;
   3.135 -	int ss_flags;
   3.136 -	size_t ss_size;
   3.137 -} stack_t;
   3.138 -
   3.139 -#ifdef __KERNEL__
   3.140 -
   3.141 -/* Most things should be clean enough to redefine this at will, if care
   3.142 -   is taken to make libc match.  */
   3.143 -
   3.144 -typedef unsigned long old_sigset_t;
   3.145 -
   3.146 -typedef struct {
   3.147 -	unsigned long sig[_NSIG_WORDS];
   3.148 -} sigset_t;
   3.149 -
   3.150 -struct sigaction {
   3.151 -	__sighandler_t sa_handler;
   3.152 -	unsigned long sa_flags;
   3.153 -	sigset_t sa_mask;		/* mask last for extensibility */
   3.154 -};
   3.155 -
   3.156 -struct k_sigaction {
   3.157 -	struct sigaction sa;
   3.158 -};
   3.159 -
   3.160 -#  include <asm/sigcontext.h>
   3.161 -
   3.162 -#define ptrace_signal_deliver(regs, cookie) do { } while (0)
   3.163 -
   3.164 -void set_sigdelayed(pid_t pid, int signo, int code, void __user *addr);
   3.165 -
   3.166 -#endif /* __KERNEL__ */
   3.167 -
   3.168 -# endif /* !__ASSEMBLY__ */
   3.169 -#endif /* _ASM_IA64_SIGNAL_H */