aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPoul-Henning Kamp <phk@FreeBSD.org>2003-06-07 09:06:39 +0000
committerPoul-Henning Kamp <phk@FreeBSD.org>2003-06-07 09:06:39 +0000
commit2d20f433edb67463b66ef1e9a00d4beb36f202a0 (patch)
tree1974a361e6e6db2625561c199baf0f1f5a1bb44e
parentd83e355c40cc06a1e530f4539e6edbf9d778bd83 (diff)
downloadsrc-2d20f433edb67463b66ef1e9a00d4beb36f202a0.tar.gz
src-2d20f433edb67463b66ef1e9a00d4beb36f202a0.zip
Sanitize the LABELSECTOR & LABELOFFSET definitions:
Remove sparc64 definitions. Remove fallback definitions.
Notes
Notes: svn path=/head/; revision=115947
-rw-r--r--sys/sys/disklabel.h20
1 files changed, 1 insertions, 19 deletions
diff --git a/sys/sys/disklabel.h b/sys/sys/disklabel.h
index 96533881accf..c838993b8f14 100644
--- a/sys/sys/disklabel.h
+++ b/sys/sys/disklabel.h
@@ -55,7 +55,7 @@
*/
/* XXX these should be defined per controller (or drive) elsewhere, not here! */
-#if defined(__i386__) || defined(__amd64__)
+#if defined(__i386__) || defined(__amd64__) || defined(__ia64__)
#define LABELSECTOR 1 /* sector containing label */
#define LABELOFFSET 0 /* offset of label in sector */
#endif
@@ -65,24 +65,6 @@
#define LABELOFFSET 64
#endif
-#ifdef __ia64__
-#define LABELSECTOR 1
-#define LABELOFFSET 0
-#endif
-
-#ifdef __sparc64__
-#define LABELSECTOR 0
-#define LABELOFFSET 128
-#endif
-
-#ifndef LABELSECTOR
-#define LABELSECTOR 0
-#endif
-
-#ifndef LABELOFFSET
-#define LABELOFFSET 64
-#endif
-
#define DISKMAGIC ((u_int32_t)0x82564557) /* The disk magic number */
#ifndef MAXPARTITIONS
#define MAXPARTITIONS 8