Thu Jan 1 16:50:30 2009 UTC ()
Rename i386 and amd64 {cpu,spl}.c to rump{cpu,spl}.c to avoid
name collisions with other source files in the kernel tree.
(pooka)
diff -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc
diff -r1.1 -r0 src/sys/rump/librump/rumpkern/arch/i386/cpu.c
diff -r1.1 -r0 src/sys/rump/librump/rumpkern/arch/i386/spl.c
diff -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/i386/rumpcpu.c
diff -r0 -r1.1 src/sys/rump/librump/rumpkern/arch/i386/rumpspl.c
diff -r1.1 -r1.2 src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc
--- src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc 2008/12/29 22:16:15 1.1
+++ src/sys/rump/librump/rumpkern/arch/i386/Makefile.inc 2009/01/01 16:50:30 1.2
| @@ -1,4 +1,4 @@ | | | @@ -1,4 +1,4 @@ |
1 | # $NetBSD: Makefile.inc,v 1.1 2008/12/29 22:16:15 pooka Exp $ | | 1 | # $NetBSD: Makefile.inc,v 1.2 2009/01/01 16:50:30 pooka Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | SRCS+= cpu.c spl.c | | 4 | SRCS+= rumpcpu.c rumpspl.c |
/* $NetBSD: rumpcpu.c,v 1.1 2009/01/01 16:50:30 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
*
* Development of this software was supported by the
* Finnish Cultural Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rumpcpu.c,v 1.1 2009/01/01 16:50:30 pooka Exp $");
#include <sys/param.h>
#include <machine/cpu.h>
#include "rump_private.h"
struct cpu_info *cpu_info_list = &rump_cpu;
struct cpu_info *
x86_curcpu()
{
return &rump_cpu;
}
struct lwp *
x86_curlwp()
{
return rump_get_curlwp();
}
/* $NetBSD: rumpspl.c,v 1.1 2009/01/01 16:50:30 pooka Exp $ */
/*
* Copyright (c) 2008 Antti Kantee. All Rights Reserved.
*
* Development of this software was supported by the
* Finnish Cultural Foundation.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: rumpspl.c,v 1.1 2009/01/01 16:50:30 pooka Exp $");
#include <sys/param.h>
#include <machine/intr.h>
#include "rump_private.h"
void
spllower(int s)
{
rump_splx(s);
}
int
splraise(int s)
{
return rump_splfoo();
}
--- src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc 2008/12/30 19:05:40 1.1
+++ src/sys/rump/librump/rumpkern/arch/x86_64/Makefile.inc 2009/01/01 16:50:30 1.2
| @@ -1,5 +1,5 @@ | | | @@ -1,5 +1,5 @@ |
1 | # $NetBSD: Makefile.inc,v 1.1 2008/12/30 19:05:40 pooka Exp $ | | 1 | # $NetBSD: Makefile.inc,v 1.2 2009/01/01 16:50:30 pooka Exp $ |
2 | # | | 2 | # |
3 | | | 3 | |
4 | .PATH: ${ARCHDIR}/../i386 | | 4 | .PATH: ${ARCHDIR}/../i386 |
5 | SRCS+= cpu.c spl.c | | 5 | SRCS+= rumpcpu.c rumpspl.c |