Module Name: src
Committed By: matt
Date: Wed Sep 16 03:44:59 UTC 2009
Modified Files:
src/sys/arch/algor/algor [matt-nb5-mips64]: machdep.c
Log Message:
Deal with argv on LP64
To generate a diff of this commit:
cvs rdiff -u -r1.38.10.2 -r1.38.10.3 src/sys/arch/algor/algor/machdep.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/arch/algor/algor/machdep.c
diff -u src/sys/arch/algor/algor/machdep.c:1.38.10.2 src/sys/arch/algor/algor/machdep.c:1.38.10.3
--- src/sys/arch/algor/algor/machdep.c:1.38.10.2 Wed Sep 16 03:39:03 2009
+++ src/sys/arch/algor/algor/machdep.c Wed Sep 16 03:44:59 2009
@@ -1,4 +1,4 @@
-/* $NetBSD: machdep.c,v 1.38.10.2 2009/09/16 03:39:03 matt Exp $ */
+/* $NetBSD: machdep.c,v 1.38.10.3 2009/09/16 03:44:59 matt Exp $ */
/*-
* Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -106,7 +106,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.2 2009/09/16 03:39:03 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.38.10.3 2009/09/16 03:44:59 matt Exp $");
#include "opt_algor_p4032.h"
#include "opt_algor_p5064.h"
@@ -404,7 +404,12 @@
led_display('b', 'o', 'p', 't');
boothowto = 0;
if (argc > 1) {
- for (cp = argv[1]; cp != NULL && *cp != '\0'; cp++) {
+#ifdef _LP64
+ cp = (void *)(intptr_t)((int32_t *)argv)[1];
+#else
+ cp = argv[1];
+#endif
+ for (; cp != NULL && *cp != '\0'; cp++) {
switch (*cp) {
#if defined(KGDB) || defined(DDB)
case 'd': /* break into kernel debugger */
