From 12901d995fe7c99af36148d8d596f967c6ad68a3 Mon Sep 17 00:00:00 2001
From: "greg@kroah.com" <greg@kroah.com>
Date: Wed, 6 Oct 2004 23:40:35 -0700
Subject: [PATCH] [PATCH] enable native tdb spinlocks on i386 platforms.

also clean out some stuff in the makefile that was never getting used.
---
 Makefile       | 18 +++++-------------
 tdb/spinlock.c |  3 ++-
 2 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/Makefile b/Makefile
index 9405b25c..1b7c71c5 100644
--- a/Makefile
+++ b/Makefile
@@ -107,19 +107,11 @@ OPTIMIZATION := ${shell if $(CC) -Os -S -o /dev/null -xc /dev/null >/dev/null 2>
 # add -Wredundant-decls when libsysfs gets cleaned up
 WARNINGS := -Wall 
 
-# Some nice architecture specific optimizations
-ifeq ($(strip $(TARGET_ARCH)),arm)
-	OPTIMIZATION+=-fstrict-aliasing
-endif
-ifeq ($(strip $(TARGET_ARCH)),i386)
-	OPTIMIZATION+=-march=i386
-	OPTIMIZATION += ${shell if $(CC) -mpreferred-stack-boundary=2 -S -o /dev/null -xc \
-		/dev/null >/dev/null 2>&1; then echo "-mpreferred-stack-boundary=2"; fi}
-	OPTIMIZATION += ${shell if $(CC) -malign-functions=0 -malign-jumps=0 -S -o /dev/null -xc \
-		/dev/null >/dev/null 2>&1; then echo "-malign-functions=0 -malign-jumps=0"; fi}
-	CFLAGS+=-pipe -Dasmlinkage=__attribute__((regparm(0)))
-else
-	CFLAGS+=-pipe -Dasmlinkage=
+CFLAGS := -pipe -Dasmlinkage=
+
+# set up the proper tdb spinlock code if we can
+ifeq ($(strip $(ARCH)),i386)
+	CFLAGS += -DUSE_SPINLOCKS -DINTEL_SPINLOCKS
 endif
 
 ifeq ($(strip $(USE_LOG)),true)
diff --git a/tdb/spinlock.c b/tdb/spinlock.c
index 50cd952c..451617fa 100644
--- a/tdb/spinlock.c
+++ b/tdb/spinlock.c
@@ -21,7 +21,6 @@
 #define STANDALONE
 #define TDB_DEBUG
 #define HAVE_MMAP	1
-#include "../udev.h"
 
 #if HAVE_CONFIG_H
 #include <config.h>
@@ -40,6 +39,8 @@
 #include <signal.h>
 #include "tdb.h"
 #include "spinlock.h"
+#include "../udev.h"
+#include "../logging.h"
 
 #else
 #include "includes.h"
-- 
2.39.5