Module Name: src
Committed By: pooka
Date: Fri Jan 15 20:39:46 UTC 2010
Modified Files:
src/sys/rump/librump/rumpkern: rump.c
Log Message:
Accomplish messy stack with slightly less messy code.
To generate a diff of this commit:
cvs rdiff -u -r1.150 -r1.151 src/sys/rump/librump/rumpkern/rump.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/rump/librump/rumpkern/rump.c
diff -u src/sys/rump/librump/rumpkern/rump.c:1.150 src/sys/rump/librump/rumpkern/rump.c:1.151
--- src/sys/rump/librump/rumpkern/rump.c:1.150 Fri Jan 15 19:01:04 2010
+++ src/sys/rump/librump/rumpkern/rump.c Fri Jan 15 20:39:46 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: rump.c,v 1.150 2010/01/15 19:01:04 pooka Exp $ */
+/* $NetBSD: rump.c,v 1.151 2010/01/15 20:39:46 pooka Exp $ */
/*
* Copyright (c) 2007 Antti Kantee. All Rights Reserved.
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.150 2010/01/15 19:01:04 pooka Exp $");
+__KERNEL_RCSID(0, "$NetBSD: rump.c,v 1.151 2010/01/15 20:39:46 pooka Exp $");
#include <sys/param.h>
#include <sys/atomic.h>
@@ -145,18 +145,10 @@
rump_proc_vfs_init_fn rump_proc_vfs_init;
rump_proc_vfs_release_fn rump_proc_vfs_release;
-/*
- * Stir up the stack a bit. These are exported functions to help
- * convince the compiler that we don't want these routines completely
- * optimized out or inlined. Is there an easier way to do this?
- */
-void nullfn(uint32_t *);
-void nullfn(uint32_t *arg){}
-void messthestack(void);
-void
+static void __noinline
messthestack(void)
{
- uint32_t mess[64];
+ volatile uint32_t mess[64];
uint64_t d1, d2;
int i, error;
@@ -164,7 +156,6 @@
rumpuser_gettime(&d1, &d2, &error);
mess[i] = d2;
}
- nullfn(mess);
}
int
