From dba2da8249a8f064372f6843f6b33ac9773c9994 Mon Sep 17 00:00:00 2001 From: drochner Date: Fri, 27 Jul 2012 22:55:29 +0000 Subject: [PATCH] gcc -fno-common fallout --- sys/arch/i386/i386/machdep.c | 6 ++---- sys/fs/udf/udf.h | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index edfe2065fca0..0c908620e6e4 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $NetBSD: machdep.c,v 1.729 2012/06/27 00:37:08 jym Exp $ */ +/* $NetBSD: machdep.c,v 1.730 2012/07/27 22:55:29 drochner Exp $ */ /*- * Copyright (c) 1996, 1997, 1998, 2000, 2004, 2006, 2008, 2009 @@ -67,7 +67,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.729 2012/06/27 00:37:08 jym Exp $"); +__KERNEL_RCSID(0, "$NetBSD: machdep.c,v 1.730 2012/07/27 22:55:29 drochner Exp $"); #include "opt_beep.h" #include "opt_compat_ibcs2.h" @@ -233,8 +233,6 @@ int cpureset_delay = 2000; /* default to 2s */ struct mtrr_funcs *mtrr_funcs; #endif -int physmem; - int cpu_class; int use_pae; int i386_fpu_present; diff --git a/sys/fs/udf/udf.h b/sys/fs/udf/udf.h index aeda96e843ee..6ba91827c19b 100644 --- a/sys/fs/udf/udf.h +++ b/sys/fs/udf/udf.h @@ -1,4 +1,4 @@ -/* $NetBSD: udf.h,v 1.44 2011/09/27 01:13:16 christos Exp $ */ +/* $NetBSD: udf.h,v 1.45 2012/07/27 22:55:30 drochner Exp $ */ /* * Copyright (c) 2006, 2008 Reinoud Zandijk @@ -210,7 +210,7 @@ MALLOC_DECLARE(M_UDFMNT); MALLOC_DECLARE(M_UDFVOLD); MALLOC_DECLARE(M_UDFTEMP); -struct pool udf_node_pool; +extern struct pool udf_node_pool; struct udf_node; struct udf_strategy;