From 3c6441a736bf2a8c784b2355e3d69e150f73ea1d Mon Sep 17 00:00:00 2001
From: Marcel Moolenaar <marcel@FreeBSD.org>
Date: Wed, 29 Oct 2003 07:35:53 +0000
Subject: [PATCH] Fix the alpha tinderbox. The alpha specific bitops used by
 the bitmap code has the typical branch prediction detour, which creates
 cross- section branches. A LINT kernel is apparently large enough nowadays
 that the .text and .text2 sections cannot always be layed-out so that
 branches between them reach. The fix is to stop using the alpha-specific
 bitops and instead use the portable implementation used by all platforms
 other than alpha and i386.

---
 sys/gnu/ext2fs/ext2_linux_balloc.c    | 4 +---
 sys/gnu/ext2fs/ext2_linux_ialloc.c    | 4 +---
 sys/gnu/fs/ext2fs/ext2_linux_balloc.c | 4 +---
 sys/gnu/fs/ext2fs/ext2_linux_ialloc.c | 4 +---
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/sys/gnu/ext2fs/ext2_linux_balloc.c b/sys/gnu/ext2fs/ext2_linux_balloc.c
index ed0259e59805..6ab4c4824e70 100644
--- a/sys/gnu/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_balloc.c
@@ -42,9 +42,7 @@
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
 
-#ifdef __alpha__
-#include <gnu/ext2fs/alpha-bitops.h>
-#elif __i386__
+#ifdef __i386__
 #include <gnu/ext2fs/i386-bitops.h>
 #else
 #include <gnu/ext2fs/ext2_bitops.h>
diff --git a/sys/gnu/ext2fs/ext2_linux_ialloc.c b/sys/gnu/ext2fs/ext2_linux_ialloc.c
index 926fe7c08f87..893302abf9a5 100644
--- a/sys/gnu/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/ext2fs/ext2_linux_ialloc.c
@@ -44,9 +44,7 @@
 #include <gnu/ext2fs/fs.h>
 #include <sys/stat.h>
 
-#ifdef  __alpha__
-#include <gnu/ext2fs/alpha-bitops.h>
-#elif __i386__
+#ifdef __i386__
 #include <gnu/ext2fs/i386-bitops.h>
 #else
 #include <gnu/ext2fs/ext2_bitops.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
index ed0259e59805..6ab4c4824e70 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_balloc.c
@@ -42,9 +42,7 @@
 #include <gnu/ext2fs/ext2_fs_sb.h>
 #include <gnu/ext2fs/fs.h>
 
-#ifdef __alpha__
-#include <gnu/ext2fs/alpha-bitops.h>
-#elif __i386__
+#ifdef __i386__
 #include <gnu/ext2fs/i386-bitops.h>
 #else
 #include <gnu/ext2fs/ext2_bitops.h>
diff --git a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
index 926fe7c08f87..893302abf9a5 100644
--- a/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
+++ b/sys/gnu/fs/ext2fs/ext2_linux_ialloc.c
@@ -44,9 +44,7 @@
 #include <gnu/ext2fs/fs.h>
 #include <sys/stat.h>
 
-#ifdef  __alpha__
-#include <gnu/ext2fs/alpha-bitops.h>
-#elif __i386__
+#ifdef __i386__
 #include <gnu/ext2fs/i386-bitops.h>
 #else
 #include <gnu/ext2fs/ext2_bitops.h>