diff options
| author | Paul Bolle <pebolle@tiscali.nl> | 2014-02-08 17:35:43 -0500 |
|---|---|---|
| committer | Konrad Rzeszutek Wilk <konrad.wilk@oracle.com> | 2014-02-11 10:12:37 -0500 |
| commit | d8320b2d2e7d1cda8216d496c7c685c5fdf74ff0 (patch) | |
| tree | e835dfa89c6edac1f4b1e1d438cbbc18a017f4e2 /include | |
| parent | 564eb714f5f09ac733c26860d5f0831f213fbdf1 (diff) | |
ia64/xen: Remove Xen support for ia64 even more
Commit d52eefb47d4e ("ia64/xen: Remove Xen support for ia64") removed
the Kconfig symbol XEN_XENCOMM. But it didn't remove the code depending
on that symbol. Remove that code now.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
Acked-by: David Vrabel <david.vrabel@citrix.com>
Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/xen/interface/xencomm.h | 41 | ||||
| -rw-r--r-- | include/xen/xencomm.h | 77 |
2 files changed, 0 insertions, 118 deletions
diff --git a/include/xen/interface/xencomm.h b/include/xen/interface/xencomm.h deleted file mode 100644 index ac45e0712afa..000000000000 --- a/include/xen/interface/xencomm.h +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * Permission is hereby granted, free of charge, to any person obtaining a copy | ||
| 3 | * of this software and associated documentation files (the "Software"), to | ||
| 4 | * deal in the Software without restriction, including without limitation the | ||
| 5 | * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or | ||
| 6 | * sell copies of the Software, and to permit persons to whom the Software is | ||
| 7 | * furnished to do so, subject to the following conditions: | ||
| 8 | * | ||
| 9 | * The above copyright notice and this permission notice shall be included in | ||
| 10 | * all copies or substantial portions of the Software. | ||
| 11 | * | ||
| 12 | * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| 13 | * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
| 14 | * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
| 15 | * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
| 16 | * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING | ||
| 17 | * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER | ||
| 18 | * DEALINGS IN THE SOFTWARE. | ||
| 19 | * | ||
| 20 | * Copyright (C) IBM Corp. 2006 | ||
| 21 | */ | ||
| 22 | |||
| 23 | #ifndef _XEN_XENCOMM_H_ | ||
| 24 | #define _XEN_XENCOMM_H_ | ||
| 25 | |||
| 26 | /* A xencomm descriptor is a scatter/gather list containing physical | ||
| 27 | * addresses corresponding to a virtually contiguous memory area. The | ||
| 28 | * hypervisor translates these physical addresses to machine addresses to copy | ||
| 29 | * to and from the virtually contiguous area. | ||
| 30 | */ | ||
| 31 | |||
| 32 | #define XENCOMM_MAGIC 0x58434F4D /* 'XCOM' */ | ||
| 33 | #define XENCOMM_INVALID (~0UL) | ||
| 34 | |||
| 35 | struct xencomm_desc { | ||
| 36 | uint32_t magic; | ||
| 37 | uint32_t nr_addrs; /* the number of entries in address[] */ | ||
| 38 | uint64_t address[0]; | ||
| 39 | }; | ||
| 40 | |||
| 41 | #endif /* _XEN_XENCOMM_H_ */ | ||
diff --git a/include/xen/xencomm.h b/include/xen/xencomm.h deleted file mode 100644 index e43b039be112..000000000000 --- a/include/xen/xencomm.h +++ /dev/null | |||
| @@ -1,77 +0,0 @@ | |||
| 1 | /* | ||
| 2 | * This program is free software; you can redistribute it and/or modify | ||
| 3 | * it under the terms of the GNU General Public License as published by | ||
| 4 | * the Free Software Foundation; either version 2 of the License, or | ||
| 5 | * (at your option) any later version. | ||
| 6 | * | ||
| 7 | * This program is distributed in the hope that it will be useful, | ||
| 8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| 9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| 10 | * GNU General Public License for more details. | ||
| 11 | * | ||
| 12 | * You should have received a copy of the GNU General Public License | ||
| 13 | * along with this program; if not, write to the Free Software | ||
| 14 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
| 15 | * | ||
| 16 | * Copyright (C) IBM Corp. 2006 | ||
| 17 | * | ||
| 18 | * Authors: Hollis Blanchard <hollisb@us.ibm.com> | ||
| 19 | * Jerone Young <jyoung5@us.ibm.com> | ||
| 20 | */ | ||
| 21 | |||
| 22 | #ifndef _LINUX_XENCOMM_H_ | ||
| 23 | #define _LINUX_XENCOMM_H_ | ||
| 24 | |||
| 25 | #include <xen/interface/xencomm.h> | ||
| 26 | |||
| 27 | #define XENCOMM_MINI_ADDRS 3 | ||
| 28 | struct xencomm_mini { | ||
| 29 | struct xencomm_desc _desc; | ||
| 30 | uint64_t address[XENCOMM_MINI_ADDRS]; | ||
| 31 | }; | ||
| 32 | |||
| 33 | /* To avoid additionnal virt to phys conversion, an opaque structure is | ||
| 34 | presented. */ | ||
| 35 | struct xencomm_handle; | ||
| 36 | |||
| 37 | extern void xencomm_free(struct xencomm_handle *desc); | ||
| 38 | extern struct xencomm_handle *xencomm_map(void *ptr, unsigned long bytes); | ||
| 39 | extern struct xencomm_handle *__xencomm_map_no_alloc(void *ptr, | ||
| 40 | unsigned long bytes, struct xencomm_mini *xc_area); | ||
| 41 | |||
| 42 | #if 0 | ||
| 43 | #define XENCOMM_MINI_ALIGNED(xc_desc, n) \ | ||
| 44 | struct xencomm_mini xc_desc ## _base[(n)] \ | ||
| 45 | __attribute__((__aligned__(sizeof(struct xencomm_mini)))); \ | ||
| 46 | struct xencomm_mini *xc_desc = &xc_desc ## _base[0]; | ||
| 47 | #else | ||
| 48 | /* | ||
| 49 | * gcc bug workaround: | ||
| 50 | * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=16660 | ||
| 51 | * gcc doesn't handle properly stack variable with | ||
| 52 | * __attribute__((__align__(sizeof(struct xencomm_mini)))) | ||
| 53 | */ | ||
| 54 | #define XENCOMM_MINI_ALIGNED(xc_desc, n) \ | ||
| 55 | unsigned char xc_desc ## _base[((n) + 1 ) * \ | ||
| 56 | sizeof(struct xencomm_mini)]; \ | ||
| 57 | struct xencomm_mini *xc_desc = (struct xencomm_mini *) \ | ||
| 58 | ((unsigned long)xc_desc ## _base + \ | ||
| 59 | (sizeof(struct xencomm_mini) - \ | ||
| 60 | ((unsigned long)xc_desc ## _base) % \ | ||
| 61 | sizeof(struct xencomm_mini))); | ||
| 62 | #endif | ||
| 63 | #define xencomm_map_no_alloc(ptr, bytes) \ | ||
| 64 | ({ XENCOMM_MINI_ALIGNED(xc_desc, 1); \ | ||
| 65 | __xencomm_map_no_alloc(ptr, bytes, xc_desc); }) | ||
| 66 | |||
| 67 | /* provided by architecture code: */ | ||
| 68 | extern unsigned long xencomm_vtop(unsigned long vaddr); | ||
| 69 | |||
| 70 | static inline void *xencomm_pa(void *ptr) | ||
| 71 | { | ||
| 72 | return (void *)xencomm_vtop((unsigned long)ptr); | ||
| 73 | } | ||
| 74 | |||
| 75 | #define xen_guest_handle(hnd) ((hnd).p) | ||
| 76 | |||
| 77 | #endif /* _LINUX_XENCOMM_H_ */ | ||
