From d47201cc4f2bc9cbaae0bfab32cf8a1b917f153d Mon Sep 17 00:00:00 2001 From: "kaf24@scramble.cl.cam.ac.uk" Date: Wed, 15 Oct 2003 09:31:04 +0000 Subject: bitkeeper revision 1.520 (3f8d13d8qVVqxcYD--4cXYs5egqNyg) Many files: Fix the minos license so that it is usable for XP and BSD ports. minios.lds: Rename: extras/mini-os/vmlinux.lds -> extras/mini-os/minios.lds .del-list.h~d612a8726e8d42e: Delete: extras/mini-os/h/list.h .del-COPYING~1f9753354580bd13: Delete: extras/mini-os/COPYING --- extras/mini-os/hypervisor.c | 39 ++++++++++++++++----------------------- 1 file changed, 16 insertions(+), 23 deletions(-) (limited to 'extras/mini-os/hypervisor.c') diff --git a/extras/mini-os/hypervisor.c b/extras/mini-os/hypervisor.c index 219c547e3f..ee7d475b1c 100644 --- a/extras/mini-os/hypervisor.c +++ b/extras/mini-os/hypervisor.c @@ -2,24 +2,26 @@ * hypervisor.c * * Communication to/from hypervisor. - * - * Copied from XenoLinux and adjusted by Rolf.Neugebauer@intel.com * - * Copyright (c) 2002, K A Fraser + * Copyright (c) 2002-2003, K A Fraser * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. + * Permission is hereby granted, free of charge, to any person obtaining a copy + * of this software and associated documentation files (the "Software"), to + * deal in the Software without restriction, including without limitation the + * rights to use, copy, modify, merge, publish, distribute, sublicense, and/or + * sell copies of the Software, and to permit persons to whom the Software is + * furnished to do so, subject to the following conditions: * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. + * The above copyright notice and this permission notice shall be included in + * all copies or substantial portions of the Software. * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING + * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER + * DEALINGS IN THE SOFTWARE. */ #include @@ -65,12 +67,6 @@ void do_hypervisor_callback(struct pt_regs *regs) while ( shared->events ); } - - -/* - * Define interface to generic handling in irq.c - */ - void enable_hypervisor_event(unsigned int ev) { set_bit(ev, &event_mask); @@ -89,9 +85,6 @@ void disable_hypervisor_event(unsigned int ev) void ack_hypervisor_event(unsigned int ev) { if ( !(event_mask & (1<events_mask); } -- cgit v1.2.3