Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys If cpu_disklabel includes struct dkbad, define __HAVE_DI...
details: https://anonhg.NetBSD.org/src/rev/b6542fff7cf0
branches: trunk
changeset: 749258:b6542fff7cf0
user: pooka <pooka%NetBSD.org@localhost>
date: Mon Nov 23 13:40:08 2009 +0000
description:
If cpu_disklabel includes struct dkbad, define __HAVE_DISKLABEL_DKBAD.
This allows use of subr_disk_mbr on all archs. Default to it for
the rump disk component. No functional change for regular kernels.
(The other option would've been to include dkbad in disklabels
everywhere, but arguably this approach has less possible side-effects,
especially given that wedges and related magic will take over the
world any second now).
diffstat:
sys/arch/algor/include/disklabel.h | 3 ++-
sys/arch/alpha/include/disklabel.h | 3 ++-
sys/arch/amd64/include/disklabel.h | 3 ++-
sys/arch/arc/include/disklabel.h | 3 ++-
sys/arch/arm/include/disklabel.h | 3 ++-
sys/arch/bebox/include/disklabel.h | 3 ++-
sys/arch/cobalt/include/disklabel.h | 3 ++-
sys/arch/evbmips/include/disklabel.h | 3 ++-
sys/arch/evbppc/include/disklabel.h | 3 ++-
sys/arch/hp700/include/disklabel.h | 3 ++-
sys/arch/hpcarm/include/disklabel.h | 3 ++-
sys/arch/hpcmips/include/disklabel.h | 3 ++-
sys/arch/i386/include/disklabel.h | 3 ++-
sys/arch/ia64/include/disklabel.h | 3 ++-
sys/arch/ibmnws/include/disklabel.h | 3 ++-
sys/arch/landisk/include/disklabel.h | 3 ++-
sys/arch/mvmeppc/include/disklabel.h | 3 ++-
sys/arch/ofppc/include/disklabel.h | 3 ++-
sys/arch/playstation2/include/disklabel.h | 3 ++-
sys/arch/prep/include/disklabel.h | 3 ++-
sys/arch/rs6000/include/disklabel.h | 3 ++-
sys/arch/sandpoint/include/disklabel.h | 3 ++-
sys/arch/sbmips/include/disklabel.h | 3 ++-
sys/arch/sh3/include/disklabel.h | 3 ++-
sys/arch/x68k/include/disklabel.h | 3 ++-
sys/arch/zaurus/include/disklabel.h | 3 ++-
sys/kern/subr_disk_mbr.c | 10 ++++++----
sys/rump/dev/lib/libdisk/Makefile | 16 +++++++---------
28 files changed, 65 insertions(+), 39 deletions(-)
diffs (truncated from 529 to 300 lines):
diff -r a78419317594 -r b6542fff7cf0 sys/arch/algor/include/disklabel.h
--- a/sys/arch/algor/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/algor/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2005/12/11 12:16:08 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2009/11/23 13:40:08 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -46,6 +46,7 @@
/* Just a dummy */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* must have one element. */
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/alpha/include/disklabel.h
--- a/sys/arch/alpha/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/alpha/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.9 2005/12/11 12:16:16 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994, 1999 Christopher G. Demetriou
@@ -47,6 +47,7 @@
/* Just a dummy */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* bad-sector information */
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/amd64/include/disklabel.h
--- a/sys/arch/amd64/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/amd64/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2008/10/28 02:19:27 mrg Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -59,6 +59,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/arc/include/disklabel.h
--- a/sys/arch/arc/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/arc/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.9 2005/12/11 12:16:39 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2009/11/23 13:40:09 pooka Exp $ */
/* $OpenBSD: disklabel.h,v 1.14 1999/03/23 16:36:17 millert Exp $ */
/* NetBSD: disklabel.h,v 1.3 1996/03/09 20:52:54 ghudson Exp */
@@ -56,6 +56,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/arm/include/disklabel.h
--- a/sys/arch/arm/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/arm/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2009/03/14 14:45:55 dsl Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Mark Brinicombe.
@@ -63,6 +63,7 @@
struct cpu_disklabel {
struct mbr_partition mbrparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/bebox/include/disklabel.h
--- a/sys/arch/bebox/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/bebox/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2005/12/11 12:17:03 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -52,6 +52,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/cobalt/include/disklabel.h
--- a/sys/arch/cobalt/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/cobalt/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.9 2005/12/11 12:17:06 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.10 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -53,6 +53,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/evbmips/include/disklabel.h
--- a/sys/arch/evbmips/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/evbmips/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2005/12/11 12:17:11 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -46,6 +46,7 @@
/* Just a dummy */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* must have one element. */
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/evbppc/include/disklabel.h
--- a/sys/arch/evbppc/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/evbppc/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.5 2005/12/11 12:17:12 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.6 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -60,6 +60,7 @@
#ifdef EVBPPC_HAS_MBR
struct mbr_partition dosparts[MBR_PART_COUNT];
#endif
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* bad-sector information */
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/hp700/include/disklabel.h
--- a/sys/arch/hp700/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/hp700/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2005/12/11 12:17:24 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2009/11/23 13:40:09 pooka Exp $ */
/* $OpenBSD: disklabel.h,v 1.5 2000/07/05 22:37:22 mickey Exp $ */
@@ -55,6 +55,7 @@
struct cpu_disklabel {
struct hp700_lifvol lifvol;
struct hp700_lifdir lifdir[HP700_LIF_NUMDIR];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad; /* To make wd(4) happy */
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/hpcarm/include/disklabel.h
--- a/sys/arch/hpcarm/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/hpcarm/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.6 2005/12/11 12:17:33 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.7 2009/11/23 13:40:09 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -53,6 +53,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/hpcmips/include/disklabel.h
--- a/sys/arch/hpcmips/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/hpcmips/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.8 2005/12/11 12:17:33 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.9 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -67,6 +67,7 @@
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/i386/include/disklabel.h
--- a/sys/arch/i386/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/i386/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.14 2008/10/26 06:57:30 mrg Exp $ */
+/* $NetBSD: disklabel.h,v 1.15 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -66,6 +66,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/ia64/include/disklabel.h
--- a/sys/arch/ia64/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/ia64/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2006/04/07 14:21:18 cherry Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -66,6 +66,7 @@
#include <sys/dkbad.h>
#endif /* HAVE_NBTOOL_CONFIG_H */
struct cpu_disklabel {
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif
diff -r a78419317594 -r b6542fff7cf0 sys/arch/ibmnws/include/disklabel.h
--- a/sys/arch/ibmnws/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/ibmnws/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.3 2005/12/11 12:17:50 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.4 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,6 +49,7 @@
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/landisk/include/disklabel.h
--- a/sys/arch/landisk/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/landisk/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.1 2006/09/01 21:26:18 uwe Exp $ */
+/* $NetBSD: disklabel.h,v 1.2 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -54,6 +54,7 @@
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
#endif /* __ASSEMBLER__ */
diff -r a78419317594 -r b6542fff7cf0 sys/arch/mvmeppc/include/disklabel.h
--- a/sys/arch/mvmeppc/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/mvmeppc/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.6 2005/12/11 12:18:19 christos Exp $ */
+/* $NetBSD: disklabel.h,v 1.7 2009/11/23 13:40:10 pooka Exp $ */
/*
* Copyright (c) 1994 Christopher G. Demetriou
@@ -49,6 +49,7 @@
struct cpu_disklabel {
struct mbr_partition dosparts[MBR_PART_COUNT];
+#define __HAVE_DISKLABEL_DKBAD
struct dkbad bad;
};
diff -r a78419317594 -r b6542fff7cf0 sys/arch/ofppc/include/disklabel.h
--- a/sys/arch/ofppc/include/disklabel.h Mon Nov 23 13:25:02 2009 +0000
+++ b/sys/arch/ofppc/include/disklabel.h Mon Nov 23 13:40:08 2009 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: disklabel.h,v 1.7 2007/10/17 19:56:07 garbled Exp $ */
+/* $NetBSD: disklabel.h,v 1.8 2009/11/23 13:40:10 pooka Exp $ */
/*-
* Copyright (C) 1995, 1996 Wolfgang Solfrank.
@@ -49,6 +49,7 @@
Home |
Main Index |
Thread Index |
Old Index