From: Chris Wright <chrisw@osdl.org>
Date: Wed, 9 Nov 2005 16:34:08 +0000 (-0800)
Subject: Alpha compile fix fwd from Norbert Tretkowski
X-Git-Tag: v2.6.14.2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4d14e4ffc6e9829174b703eba00ceaf367a03282;p=thirdparty%2Fkernel%2Fstable-queue.git

Alpha compile fix fwd from Norbert Tretkowski
---

diff --git a/queue/fix-alpha-breakage.patch b/queue/fix-alpha-breakage.patch
new file mode 100644
index 00000000000..2c92f911a61
--- /dev/null
+++ b/queue/fix-alpha-breakage.patch
@@ -0,0 +1,29 @@
+From nobody Mon Sep 17 00:00:00 2001
+Subject: [PATCH] fix alpha breakage
+From: Ivan Kokshaysky <ink@jurassic.park.msu.ru>
+Date: 1130634943 -0700
+
+barrier.h uses barrier() in non-SMP case.  And doesn't include compiler.h.
+
+Cc: Al Viro <viro@ftp.linux.org.uk>
+Signed-off-by: Andrew Morton <akpm@osdl.org>
+Signed-off-by: Linus Torvalds <torvalds@osdl.org>
+Signed-off-by: Chris Wright <chrisw@osdl.org>
+---
+
+ include/asm-alpha/barrier.h |    2 ++
+ 1 files changed, 2 insertions(+)
+
+Index: linux-2.6.14.y/include/asm-alpha/barrier.h
+===================================================================
+--- linux-2.6.14.y.orig/include/asm-alpha/barrier.h
++++ linux-2.6.14.y/include/asm-alpha/barrier.h
+@@ -1,6 +1,8 @@
+ #ifndef __BARRIER_H
+ #define __BARRIER_H
+ 
++#include <asm/compiler.h>
++
+ #define mb() \
+ __asm__ __volatile__("mb": : :"memory")
+ 
diff --git a/queue/series b/queue/series
index 5af260a5755..7f17388a419 100644
--- a/queue/series
+++ b/queue/series
@@ -8,3 +8,4 @@ fix-zero-size-datagram-reception.patch
 fix-signal-live-leak-in-copy_process.patch
 fix-de_thread-vs-send_group_sendqueue-race.patch
 ipvs-fix-connection-leak.patch
+fix-alpha-breakage.patch