diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:33:40 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-01-20 12:33:40 -0500 |
commit | db4fcb45a482a247f7b62fef658d990ed81855f2 (patch) | |
tree | a1bf56f80e0c02f2c971672e2ff45b756dbdfc91 /include/xen | |
parent | 09854dde949d611c6675075cb22927444a28faf6 (diff) | |
parent | d52eefb47d4eb6fe40d4c92bc711dd34a8ce1747 (diff) |
Merge tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux
Pull ia64 Xen removal from Tony Luck:
"Nobody has been maintaining xen in ia64 for a long time. Rip it all
out so people do not waste time making updates to broken/dead code"
* tag 'please-pull-rm_xen' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux:
ia64/xen: Remove Xen support for ia64
Diffstat (limited to 'include/xen')
-rw-r--r-- | include/xen/interface/callback.h | 2 | ||||
-rw-r--r-- | include/xen/interface/io/protocols.h | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/include/xen/interface/callback.h b/include/xen/interface/callback.h index 8c5fa0e20155..dc3193f4b581 100644 --- a/include/xen/interface/callback.h +++ b/include/xen/interface/callback.h | |||
@@ -36,7 +36,7 @@ | |||
36 | * @extra_args == Operation-specific extra arguments (NULL if none). | 36 | * @extra_args == Operation-specific extra arguments (NULL if none). |
37 | */ | 37 | */ |
38 | 38 | ||
39 | /* ia64, x86: Callback for event delivery. */ | 39 | /* x86: Callback for event delivery. */ |
40 | #define CALLBACKTYPE_event 0 | 40 | #define CALLBACKTYPE_event 0 |
41 | 41 | ||
42 | /* x86: Failsafe callback when guest state cannot be restored by Xen. */ | 42 | /* x86: Failsafe callback when guest state cannot be restored by Xen. */ |
diff --git a/include/xen/interface/io/protocols.h b/include/xen/interface/io/protocols.h index 056744b4b05e..545a14ba0bb3 100644 --- a/include/xen/interface/io/protocols.h +++ b/include/xen/interface/io/protocols.h | |||
@@ -3,7 +3,6 @@ | |||
3 | 3 | ||
4 | #define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi" | 4 | #define XEN_IO_PROTO_ABI_X86_32 "x86_32-abi" |
5 | #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" | 5 | #define XEN_IO_PROTO_ABI_X86_64 "x86_64-abi" |
6 | #define XEN_IO_PROTO_ABI_IA64 "ia64-abi" | ||
7 | #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" | 6 | #define XEN_IO_PROTO_ABI_POWERPC64 "powerpc64-abi" |
8 | #define XEN_IO_PROTO_ABI_ARM "arm-abi" | 7 | #define XEN_IO_PROTO_ABI_ARM "arm-abi" |
9 | 8 | ||
@@ -11,8 +10,6 @@ | |||
11 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 | 10 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_32 |
12 | #elif defined(__x86_64__) | 11 | #elif defined(__x86_64__) |
13 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64 | 12 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_X86_64 |
14 | #elif defined(__ia64__) | ||
15 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_IA64 | ||
16 | #elif defined(__powerpc64__) | 13 | #elif defined(__powerpc64__) |
17 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 | 14 | # define XEN_IO_PROTO_ABI_NATIVE XEN_IO_PROTO_ABI_POWERPC64 |
18 | #elif defined(__arm__) || defined(__aarch64__) | 15 | #elif defined(__arm__) || defined(__aarch64__) |